Fix up legacy code to use new interfaces

This took way more time than it was worth.
Converted line endings to Unix, some other trivial crap.
Thanks to Phoenix616 for already having a multi-version pom, it would have taken me much longer to figure out without a functional example.

The only legacy code which is not supported is that of the pre-versioned package era. I compiled a copy of Craftbukkit about 15 commits prior to the introduction of versioned packages, and NMS had already been fiddled with. Anyone who needs support for builds in that range can use an older OpenInv build instead, it's not like UUIDs are a big concern.

.gitignore

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

1_4_5/pom.xml

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

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

@@ -1,168 +0,0 @@
-/*
- * 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;
-    }
-
-}

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

@@ -1,79 +0,0 @@
-/*
- * 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;
-    }
-
-}

1_4_6/pom.xml

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

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

@@ -1,168 +0,0 @@
-/*
- * 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;
-    }
-
-}

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

@@ -1,79 +0,0 @@
-/*
- * 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;
-    }
-
-}

README.MD

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

assembly/pom.xml

@@ -1,208 +0,0 @@
-<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>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>openinvassembly</artifactId>
-  <name>OpenInvAssembly</name>
-
-  <profiles>
-
-    <profile>
-      <id>latest</id>
-      <dependencies>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_11_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <profile>
-      <id>modern</id>
-      <dependencies>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_8_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_8_R2</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_8_R3</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_9_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_9_R2</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_10_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_11_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <profile>
-      <id>all</id>
-      <dependencies>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_4_5</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_4_6</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_4_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_5_R2</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_5_R3</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_6_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_6_R2</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_6_R3</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_7_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_7_R2</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_7_R3</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_7_R4</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_8_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_8_R2</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_8_R3</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_9_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_9_R2</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_10_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>com.lishid</groupId>
-          <artifactId>openinvadapter1_11_R1</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-      </dependencies>
-    </profile>
-
-  </profiles>
-
-  <build>
-    <directory>../target</directory>
-    <finalName>OpenInv</finalName>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.4.3</version>
-        <configuration>
-          <!--
-            ~ This keeps the final file clean, but may cause issues for people not familiar with the setup.
-            ~ If you're having trouble with the final product missing files, remove or tweak this configuration.
-           -->
-          <minimizeJar>true</minimizeJar>
-          <filters>
-            <filter>
-              <artifact>com.lishid:*</artifact>
-              <includes>
-                <include>com/lishid/openinv/**/*</include>
-                <include>plugin.yml</include>
-              </includes>
-            </filter>
-          </filters>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

internal/pom.xml

@@ -1,23 +0,0 @@
-<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>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>openinvinternal</artifactId>
-  <name>OpenInvInternal</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.4.5-R1.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-</project>

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

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

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

@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2011-2014 lishid.  All rights reserved.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation,  version 3.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal;
-
-import org.bukkit.inventory.Inventory;
-
-public interface IInventoryAccess {
-
-    /**
-     * Check if an Inventory is an ISpecialPlayerInventory implementation.
-     * 
-     * @param inventory the Inventory
-     * @return true if the Inventory is backed by an ISpecialPlayerInventory
-     */
-    public boolean isSpecialPlayerInventory(Inventory inventory);
-
-    /**
-     * Gets an ISpecialPlayerInventory from an Inventory or null if the Inventory is not backed by
-     * an ISpecialPlayerInventory.
-     * 
-     * @param inventory the Inventory
-     * @return the ISpecialPlayerInventory or null
-     */
-    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory);
-
-    /**
-     * Check if an Inventory is an ISpecialEnderChest implementation.
-     * 
-     * @param inventory the Inventory
-     * @return true if the Inventory is backed by an ISpecialEnderChest
-     */
-    public boolean isSpecialEnderChest(Inventory inventory);
-
-    /**
-     * Gets an ISpecialEnderChest from an Inventory or null if the Inventory is not backed by an
-     * ISpecialEnderChest.
-     * 
-     * @param inventory the Inventory
-     * @return the ISpecialEnderChest or null
-     */
-    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory);
-
-}

internal/src/main/java/com/lishid/openinv/internal/InternalAccessor.java

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

plugin/pom.xml

@@ -1,38 +0,0 @@
-<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>openinv</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>openinvplugin</artifactId>
-  <name>OpenInvPlugin</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <!-- Really should use 1.4.5-R1.0, but the InventoryDragEvent doesn't exist. TODO separate module? -->
-      <version>1.11-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvinternal</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-  </build>
-
-</project>

plugin/src/main/java/com/lishid/openinv/ConfigUpdater.java

@@ -1,137 +0,0 @@
-package com.lishid.openinv;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.bukkit.Material;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.configuration.ConfigurationSection;
-
-public class ConfigUpdater {
-
-    private static final int CONFIG_VERSION = 3;
-
-    private final OpenInv plugin;
-
-    public ConfigUpdater(OpenInv plugin) {
-        this.plugin = plugin;
-    }
-
-    private int getConfigVersion() {
-        return plugin.getConfig().getInt("config-version", 1);
-    }
-
-    private boolean isConfigOutdated() {
-        return getConfigVersion() < CONFIG_VERSION;
-    }
-
-    public void checkForUpdates() {
-        if (isConfigOutdated()) {
-            plugin.getLogger().info("Configuration update found! Performing update...");
-            performUpdate();
-            plugin.getLogger().info("Configuration update complete!");
-        }
-    }
-
-    private void performUpdate() {
-        // Update according to the right version
-        switch (getConfigVersion()) {
-            case 1:
-                updateConfig1To2();
-            case 2:
-                updateConfig2To3();
-                break;
-        }
-    }
-
-    private void updateConfig2To3() {
-        plugin.getConfig().set("config-version", 3);
-        plugin.getConfig().set("items.open-inv", null);
-        plugin.getConfig().set("toggles.items.open-inv", null);
-        plugin.getConfig().set("settings.disable-saving", plugin.getConfig().getBoolean("DisableSaving", false));
-        plugin.getConfig().set("DisableSaving", null);
-        // Save the new config
-        plugin.saveConfig();
-    }
-
-    private void updateConfig1To2() {
-        // Backup the old config file
-        try {
-            plugin.getConfig().save(new File(plugin.getDataFolder(), "config_old.yml"));
-            plugin.getLogger().info("Backed up config.yml to config_old.yml before updating.");
-        } catch (IOException e) {
-            plugin.getLogger().warning("Could not back up config.yml before updating!");
-        }
-
-        // Get the old config settings
-        int itemOpenInvItemId = plugin.getConfig().getInt("ItemOpenInvItemID", 280);
-        plugin.getConfig().set("ItemOpenInvItemID", null);
-        boolean notifySilentChest = plugin.getConfig().getBoolean("NotifySilentChest", true);
-        plugin.getConfig().set("NotifySilentChest", null);
-        boolean notifyAnyChest = plugin.getConfig().getBoolean("NotifyAnyChest", true);
-        plugin.getConfig().set("NotifyAnyChest", null);
-
-        updateToggles("AnyChest", ".toggle", "toggles.any-chest");
-        updateToggles("ItemOpenInv", ".toggle", "toggles.items.open-inv");
-        updateToggles("SilentChest", ".toggle", "toggles.silent-chest");
-
-        plugin.getConfig().set("config-version", 2);
-        plugin.getConfig().set("items.open-inv", getMaterialById(itemOpenInvItemId).toString());
-        plugin.getConfig().set("notify.any-chest", notifyAnyChest);
-        plugin.getConfig().set("notify.silent-chest", notifySilentChest);
-
-        // Save the new config
-        plugin.saveConfig();
-    }
-
-    private void updateToggles(String sectionName, String suffix, String newSectionName) {
-        // Ensure section exists
-        if (!plugin.getConfig().isConfigurationSection(sectionName)) {
-            return;
-        }
-
-        ConfigurationSection section = plugin.getConfig().getConfigurationSection(sectionName);
-        Set<String> keys = section.getKeys(false);
-
-        // Ensure section has content
-        if (keys == null || keys.isEmpty()) {
-            return;
-        }
-
-        Map<String, Boolean> toggles = new HashMap<String, Boolean>();
-
-        for (String playerName : keys) {
-            OfflinePlayer player = plugin.matchPlayer(playerName);
-            String dataID = plugin.getPlayerID(player);
-            toggles.put(dataID, section.getBoolean(playerName + suffix, false));
-        }
-
-        // Wipe old ConfigurationSection
-        plugin.getConfig().set(sectionName, null);
-        // Prepare new ConfigurationSection
-        if (plugin.getConfig().isConfigurationSection(newSectionName)) {
-            section = plugin.getConfig().getConfigurationSection(newSectionName);
-        } else {
-            section = plugin.getConfig().createSection(newSectionName);
-        }
-
-        // Set new values
-        for (Map.Entry<String, Boolean> entry : toggles.entrySet()) {
-            section.set(entry.getKey(), entry.getValue());
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    private Material getMaterialById(int id) {
-        Material material = Material.getMaterial(id);
-
-        if (material == null) {
-            material = Material.STICK;
-        }
-
-        return material;
-    }
-}

plugin/src/main/java/com/lishid/openinv/OpenInv.java

@@ -1,583 +0,0 @@
-/*
- * 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;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-import com.lishid.openinv.commands.AnyChestPluginCommand;
-import com.lishid.openinv.commands.OpenEnderPluginCommand;
-import com.lishid.openinv.commands.OpenInvPluginCommand;
-import com.lishid.openinv.commands.SearchInvPluginCommand;
-import com.lishid.openinv.commands.SilentChestPluginCommand;
-import com.lishid.openinv.internal.IAnySilentContainer;
-import com.lishid.openinv.internal.IInventoryAccess;
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.internal.InternalAccessor;
-import com.lishid.openinv.util.Cache;
-import com.lishid.openinv.util.Function;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scheduler.BukkitRunnable;
-
-/**
- * Open other player's inventory
- * 
- * @author lishid
- */
-public class OpenInv extends JavaPlugin {
-
-    private final Map<String, ISpecialPlayerInventory> inventories = new HashMap<String, ISpecialPlayerInventory>();
-    private final Map<String, ISpecialEnderChest> enderChests = new HashMap<String, ISpecialEnderChest>();
-    private final Cache<String, Player> playerCache = new Cache<String, Player>(300000L,
-            new Function<Player>() {
-                @Override
-                public boolean run(Player value) {
-                    String key = playerLoader.getPlayerDataID(value);
-                    return inventories.containsKey(key) && inventories.get(key).isInUse()
-                            || enderChests.containsKey(key) && enderChests.get(key).isInUse();
-                }
-            },
-            new Function<Player>() {
-                @Override
-                public boolean run(Player value) {
-                    String key = playerLoader.getPlayerDataID(value);
-
-                    // Check if inventory is stored, and if it is, remove it and eject all viewers
-                    if (inventories.containsKey(key)) {
-                        Inventory inv = inventories.remove(key).getBukkitInventory();
-                        for (HumanEntity entity : inv.getViewers()) {
-                            entity.closeInventory();
-                        }
-                    }
-
-                    // Check if ender chest is stored, and if it is, remove it and eject all viewers
-                    if (enderChests.containsKey(key)) {
-                        Inventory inv = enderChests.remove(key).getBukkitInventory();
-                        for (HumanEntity entity : inv.getViewers()) {
-                            entity.closeInventory();
-                        }
-                    }
-
-                    if (!OpenInv.this.disableSaving() && !value.isOnline()) {
-                        value.saveData();
-                    }
-                    return true;
-                }
-            });
-
-    private InternalAccessor accessor;
-    private IPlayerDataManager playerLoader;
-    private IInventoryAccess inventoryAccess;
-    private IAnySilentContainer anySilentContainer;
-
-    @Override
-    public void onEnable() {
-        // Get plugin manager
-        PluginManager pm = getServer().getPluginManager();
-
-        accessor = new InternalAccessor(this);
-        // Version check
-        if (!accessor.isSupported()) {
-            getLogger().info("Your version of CraftBukkit (" + accessor.getVersion() + ") is not supported.");
-            getLogger().info("Please look for an updated version of OpenInv.");
-            pm.disablePlugin(this);
-            return;
-        }
-
-        playerLoader = accessor.newPlayerDataManager();
-        inventoryAccess = accessor.newInventoryAccess();
-        anySilentContainer = accessor.newAnySilentContainer();
-
-        new ConfigUpdater(this).checkForUpdates();
-
-        pm.registerEvents(new OpenInvPlayerListener(this), this);
-        pm.registerEvents(new OpenInvInventoryListener(this), this);
-
-        getCommand("openinv").setExecutor(new OpenInvPluginCommand(this));
-        SearchInvPluginCommand searchInv = new SearchInvPluginCommand();
-        getCommand("searchinv").setExecutor(searchInv);
-        getCommand("searchender").setExecutor(searchInv);
-        getCommand("silentchest").setExecutor(new SilentChestPluginCommand(this));
-        getCommand("anychest").setExecutor(new AnyChestPluginCommand(this));
-        getCommand("openender").setExecutor(new OpenEnderPluginCommand(this));
-
-    }
-
-    @Override
-    public void onDisable() {
-
-        if (this.disableSaving()) {
-            return;
-        }
-
-        this.playerCache.invalidateAll();
-    }
-
-    /**
-     * Checks if the server version is supported by OpenInv.
-     * 
-     * @return true if the server version is supported
-     */
-    public boolean isSupportedVersion() {
-        return this.accessor.isSupported();
-    }
-
-    /**
-     * Gets the active IInventoryAccess implementation. May return null if the server version is
-     * unsupported.
-     * 
-     * @return the IInventoryAccess
-     */
-    public IInventoryAccess getInventoryAccess() {
-        return this.inventoryAccess;
-    }
-
-    /**
-     * Gets the active ISilentContainer implementation. May return null if the server version is
-     * unsupported.
-     * 
-     * @return the ISilentContainer
-     */
-    public IAnySilentContainer getAnySilentContainer() {
-        return this.anySilentContainer;
-    }
-
-    /**
-     * Gets an ISpecialPlayerInventory for the given Player.
-     * 
-     * @param player the Player
-     * @param online true if the Player is currently online
-     * @return the ISpecialPlayerInventory
-     */
-    public ISpecialPlayerInventory getInventory(Player player, boolean online) {
-        String id = playerLoader.getPlayerDataID(player);
-        if (inventories.containsKey(id)) {
-            return inventories.get(id);
-        }
-        ISpecialPlayerInventory inv = accessor.newSpecialPlayerInventory(player, online);
-        inventories.put(id, inv);
-        playerCache.put(id, player);
-        return inv;
-    }
-
-    /**
-     * Gets an ISpecialEnderChest for the given Player.
-     * 
-     * @param player the Player
-     * @param online true if the Player is currently online
-     * @return the ISpecialEnderChest
-     */
-    public ISpecialEnderChest getEnderChest(Player player, boolean online) {
-        String id = playerLoader.getPlayerDataID(player);
-        if (enderChests.containsKey(id)) {
-            return enderChests.get(id);
-        }
-        ISpecialEnderChest inv = accessor.newSpecialEnderChest(player, online);
-        enderChests.put(id, inv);
-        playerCache.put(id, player);
-        return inv;
-    }
-
-    /**
-     * Forcibly unload a cached Player's data.
-     * 
-     * @param player the OfflinePlayer to unload
-     */
-    public void unload(OfflinePlayer player) {
-        this.playerCache.invalidate(this.playerLoader.getPlayerDataID(player));
-    }
-
-    /**
-     * Check the configuration value for whether or not OpenInv saves player data when unloading
-     * players. This is exclusively for users who do not allow editing of inventories, only viewing,
-     * and wish to prevent any possibility of bugs such as lishid#40. If true, OpenInv will not ever
-     * save any edits made to players.
-     * 
-     * @return false unless configured otherwise
-     */
-    public boolean disableSaving() {
-        return getConfig().getBoolean("settings.disable-saving", false);
-    }
-
-    /**
-     * Check the configuration value for whether or not OpenInv displays a notification to the user
-     * when a container is activated with SilentChest.
-     * 
-     * @return true unless configured otherwise
-     */
-    public boolean notifySilentChest() {
-        return getConfig().getBoolean("notify.silent-chest", true);
-    }
-
-    /**
-     * Check the configuration value for whether or not OpenInv displays a notification to the user
-     * when a container is activated with AnyChest.
-     * 
-     * @return true unless configured otherwise
-     */
-    public boolean notifyAnyChest() {
-        return getConfig().getBoolean("notify.any-chest", true);
-    }
-
-    /**
-     * Gets a player's SilentChest setting.
-     * 
-     * @param player the OfflinePlayer
-     * @return true if SilentChest is enabled
-     */
-    public boolean getPlayerSilentChestStatus(OfflinePlayer player) {
-        return getConfig().getBoolean("toggles.silent-chest." + playerLoader.getPlayerDataID(player), false);
-    }
-
-    /**
-     * Sets a player's SilentChest setting.
-     * 
-     * @param player the OfflinePlayer
-     * @param status the status
-     */
-    public void setPlayerSilentChestStatus(OfflinePlayer player, boolean status) {
-        getConfig().set("toggles.silent-chest." + playerLoader.getPlayerDataID(player), status);
-        saveConfig();
-    }
-
-    /**
-     * Gets the provided player's AnyChest setting.
-     * 
-     * @param player the OfflinePlayer
-     * @return true if AnyChest is enabled
-     */
-    public boolean getPlayerAnyChestStatus(OfflinePlayer player) {
-        return getConfig().getBoolean("toggles.any-chest." + playerLoader.getPlayerDataID(player), false);
-    }
-
-    /**
-     * Sets a player's AnyChest setting.
-     * 
-     * @param player the OfflinePlayer
-     * @param status the status
-     */
-    public void setPlayerAnyChestStatus(OfflinePlayer player, boolean status) {
-        getConfig().set("toggles.silent-chest." + playerLoader.getPlayerDataID(player), status);
-        saveConfig();
-    }
-
-    /**
-     * Gets a unique identifier by which the OfflinePlayer can be referenced. Using the value
-     * returned to look up a Player will generally be much faster for later implementations.
-     * 
-     * @param offline the OfflinePlayer
-     * @return the identifier
-     */
-    public String getPlayerID(OfflinePlayer offline) {
-        return this.playerLoader.getPlayerDataID(offline);
-    }
-
-    /**
-     * Get an OfflinePlayer by name.
-     * <p>
-     * Note: This method is potentially very heavily blocking. It should not ever be called on the
-     * main thread, and if it is, a stack trace will be displayed alerting server owners to the
-     * call.
-     * 
-     * @param name the name of the Player
-     * @return the OfflinePlayer with the closest matching name or null if no players have ever logged in
-     */
-    public OfflinePlayer matchPlayer(String name) {
-
-        // Warn if called on the main thread - if we resort to searching offline players, this may take several seconds.
-        if (getServer().isPrimaryThread()) {
-            getLogger().warning("Call to OpenInv#matchPlayer made on the main thread!");
-            getLogger().warning("This can cause the server to hang, potentially severely.");
-            getLogger().warning("Trace:");
-            for (StackTraceElement element : new Throwable().fillInStackTrace().getStackTrace()) {
-                getLogger().warning(element.toString());
-            }
-        }
-
-        // Attempt exact offline match first - adds UUID support for later versions
-        OfflinePlayer player = this.playerLoader.getPlayerByID(name);
-
-        // Ensure name is valid if server is in online mode to avoid unnecessary searching
-        if (getServer().getOnlineMode() && !name.matches("[a-zA-Z0-9_]{3,16}")) {
-            return null;
-        }
-
-        player = getServer().getPlayerExact(name);
-
-        if (player != null) {
-            return player;
-        }
-
-        player = getServer().getOfflinePlayer(name);
-
-        /*
-         * Compatibility: Pre-UUID, getOfflinePlayer always returns an OfflinePlayer. Post-UUID,
-         * getOfflinePlayer will return null if no matching player is found. To preserve
-         * compatibility, only return the player if they have played before. Ignoring current online
-         * status is fine, they'd have been found by getPlayerExact otherwise.
-         */
-        if (player != null && player.hasPlayedBefore()) {
-            return player;
-        }
-
-        player = getServer().getPlayer(name);
-
-        if (player != null) {
-            return player;
-        }
-
-        int bestMatch = Integer.MAX_VALUE;
-        for (OfflinePlayer offline : getServer().getOfflinePlayers()) {
-            if (offline.getName() == null) {
-                // Loaded by UUID only, name has never been looked up.
-                continue;
-            }
-
-            // Compatibility: Lang3 is only bundled with 1.8+
-            int currentMatch = org.apache.commons.lang.StringUtils.getLevenshteinDistance(name, offline.getName());
-
-            if (currentMatch == 0) {
-                return offline;
-            }
-
-            if (currentMatch < bestMatch) {
-                bestMatch = currentMatch;
-                player = offline;
-            }
-        }
-
-        // Only null if no players have played ever, otherwise even the worst match will do.
-        return player;
-    }
-
-    /**
-     * Load a Player from an OfflinePlayer. May return null under some circumstances.
-     * 
-     * @param offline the OfflinePlayer to load a Player for
-     * @return the Player
-     */
-    public Player loadPlayer(final OfflinePlayer offline) {
-
-        if (offline == null) {
-            return null;
-        }
-
-        String key = this.playerLoader.getPlayerDataID(offline);
-        if (this.playerCache.containsKey(key)) {
-            return this.playerCache.get(key);
-        }
-
-        Player loaded;
-
-        if (offline.isOnline()) {
-            loaded = offline.getPlayer();
-            this.playerCache.put(key, loaded);
-            return loaded;
-        }
-
-        if (Bukkit.isPrimaryThread()) {
-            return this.playerLoader.loadPlayer(offline);
-        }
-
-        Future<Player> future = Bukkit.getScheduler().callSyncMethod(this,
-                new Callable<Player>() {
-                    @Override
-                    public Player call() throws Exception {
-                        return playerLoader.loadPlayer(offline);
-                    }
-                });
-
-        int ticks = 0;
-        while (!future.isDone() && !future.isCancelled() && ticks < 10) {
-            ++ticks;
-            try {
-                Thread.sleep(50L);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-                return null;
-            }
-        }
-
-        if (!future.isDone() || future.isCancelled()) {
-            return null;
-        }
-
-        try {
-            loaded = future.get();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            return null;
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            return null;
-        }
-
-        if (loaded != null) {
-            this.playerCache.put(key, loaded);
-        }
-
-        return loaded;
-    }
-
-    /**
-     * Method for handling a Player coming online.
-     * 
-     * @param player the Player
-     */
-    public void setPlayerOnline(final Player player) {
-
-        String key = this.playerLoader.getPlayerDataID(player);
-
-        // Check if the player is cached. If not, neither of their inventories is open.
-        if (!this.playerCache.containsKey(key)) {
-            return;
-        }
-
-        this.playerCache.put(key, player);
-
-        if (this.inventories.containsKey(key)) {
-            this.inventories.get(key).setPlayerOnline(player);
-            new BukkitRunnable() {
-                @Override
-                public void run() {
-                    if (player.isOnline()) {
-                        player.updateInventory();
-                    }
-                }
-            }.runTask(this);
-        }
-
-        if (this.enderChests.containsKey(key)) {
-            this.enderChests.get(key).setPlayerOnline(player);
-        }
-    }
-
-    /**
-     * Method for handling a Player going offline.
-     * 
-     * @param player the Player
-     */
-    public void setPlayerOffline(final Player player) {
-
-        String key = this.playerLoader.getPlayerDataID(player);
-
-        // Check if the player is cached. If not, neither of their inventories is open.
-        if (!this.playerCache.containsKey(key)) {
-            return;
-        }
-
-        if (this.inventories.containsKey(key)) {
-            this.inventories.get(key).setPlayerOffline();
-        }
-
-        if (this.enderChests.containsKey(key)) {
-            this.enderChests.get(key).setPlayerOffline();
-        }
-    }
-
-    /**
-     * Evicts all viewers lacking cross-world permissions from a Player's inventory.
-     * 
-     * @param player the Player
-     */
-    public void changeWorld(final Player player) {
-
-        String key = this.playerLoader.getPlayerDataID(player);
-
-        // Check if the player is cached. If not, neither of their inventories is open.
-        if (!this.playerCache.containsKey(key)) {
-            return;
-        }
-
-        if (this.inventories.containsKey(key)) {
-            Iterator<HumanEntity> iterator = this.inventories.get(key).getBukkitInventory().getViewers().iterator();
-            while (iterator.hasNext()) {
-                HumanEntity human = iterator.next();
-                // If player has permission or is in the same world, allow continued access
-                // Just in case, also allow null worlds.
-                if (Permissions.CROSSWORLD.hasPermission(human) || human.getWorld() == null
-                        || human.getWorld().equals(player.getWorld())) {
-                    continue;
-                }
-                human.closeInventory();
-            }
-        }
-
-        if (this.enderChests.containsKey(key)) {
-            Iterator<HumanEntity> iterator = this.enderChests.get(key).getBukkitInventory().getViewers().iterator();
-            while (iterator.hasNext()) {
-                HumanEntity human = iterator.next();
-                if (Permissions.CROSSWORLD.hasPermission(human) || human.getWorld() == null
-                        || human.getWorld().equals(player.getWorld())) {
-                    continue;
-                }
-                human.closeInventory();
-            }
-        }
-    }
-
-    /**
-     * Displays all applicable help for OpenInv commands.
-     * 
-     * @param player the Player to help
-     */
-    public void showHelp(Player player) {
-        // Get registered commands
-        for (String commandName : this.getDescription().getCommands().keySet()) {
-            PluginCommand command = this.getCommand(commandName);
-
-            // Ensure command is successfully registered and player can use it
-            if (command == null  || !command.testPermissionSilent(player)) {
-                continue;
-            }
-
-            // Send usage
-            player.sendMessage(command.getUsage().replace("<command>", commandName));
-
-            List<String> aliases = command.getAliases();
-            if (aliases.isEmpty()) {
-                continue;
-            }
-
-            // Assemble alias list
-            StringBuilder aliasBuilder = new StringBuilder("   (aliases: ");
-            for (String alias : aliases) {
-                aliasBuilder.append(alias).append(", ");
-            }
-            aliasBuilder.delete(aliasBuilder.length() - 2, aliasBuilder.length()).append(')');
-
-            // Send all aliases
-            player.sendMessage(aliasBuilder.toString());
-        }
-    }
-
-}

plugin/src/main/java/com/lishid/openinv/OpenInvPlayerListener.java

@@ -1,78 +0,0 @@
-/*
- * 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;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event.Result;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-
-public class OpenInvPlayerListener implements Listener {
-
-    private final OpenInv plugin;
-
-    public OpenInvPlayerListener(OpenInv plugin) {
-        this.plugin = plugin;
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerJoin(final PlayerJoinEvent event) {
-        plugin.setPlayerOnline(event.getPlayer());
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        plugin.setPlayerOffline(event.getPlayer());
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onPlayerInteract(PlayerInteractEvent event) {
-        if (event.getAction() != Action.RIGHT_CLICK_BLOCK || event.getPlayer().isSneaking()
-                || event.useInteractedBlock() == Result.DENY
-                || !plugin.getAnySilentContainer().isAnySilentContainer(event.getClickedBlock())) {
-            return;
-        }
-
-        Player player = event.getPlayer();
-        boolean anychest = Permissions.ANYCHEST.hasPermission(player) && plugin.getPlayerAnyChestStatus(player);
-        boolean needsAnyChest = plugin.getAnySilentContainer().isAnyContainerNeeded(player, event.getClickedBlock());
-
-        if (!anychest && needsAnyChest) {
-            return;
-        }
-
-        boolean silentchest = Permissions.SILENT.hasPermission(player) && plugin.getPlayerSilentChestStatus(player);
-
-        // If anychest or silentchest is active
-        if ((anychest || silentchest) && plugin.getAnySilentContainer().activateContainer(player, silentchest, event.getClickedBlock())) {
-            if (silentchest && plugin.notifySilentChest() && needsAnyChest && plugin.notifyAnyChest()) {
-                player.sendMessage("You are opening a blocked container silently.");
-            } else if (silentchest && plugin.notifySilentChest()) {
-                player.sendMessage("You are opening a container silently.");
-            } else if (needsAnyChest && plugin.notifyAnyChest()) {
-                player.sendMessage("You are opening a blocked container.");
-            }
-            event.setCancelled(true);
-        }
-    }
-
-}

plugin/src/main/java/com/lishid/openinv/Permissions.java

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

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

@@ -1,160 +0,0 @@
-package com.lishid.openinv.util;
-
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import com.google.common.collect.Multimap;
-import com.google.common.collect.TreeMultimap;
-
-/**
- * A minimal time-based cache implementation backed by a HashMap and TreeMultimap.
- * 
- * @author Jikoo
- */
-public class Cache<K, V> {
-
-    private final Map<K, V> internal;
-    private final Multimap<Long, K> expiry;
-    private final long retention;
-    private final Function<V> inUseCheck, postRemoval;
-
-    /**
-     * Constructs a Cache with the specified retention duration, in use function, and post-removal function.
-     * 
-     * @param retention duration after which keys are automatically invalidated if not in use
-     * @param inUseCheck Function used to check if a key is considered in use
-     * @param postRemoval Function used to perform any operations required when a key is invalidated
-     */
-    public Cache(long retention, Function<V> inUseCheck, Function<V> postRemoval) {
-        this.internal = new HashMap<K, V>();
-
-        this.expiry = TreeMultimap.create(new Comparator<Long>() {
-                    @Override
-                    public int compare(Long long1, Long long2) {
-                        return long1.compareTo(long2);
-                    }
-                },
-                new Comparator<K>() {
-                    @Override
-                    public int compare(K k1, K k2) {
-                        return 0;
-                    }
-                });
-
-        this.retention = retention;
-        this.inUseCheck = inUseCheck;
-        this.postRemoval = postRemoval;
-    }
-
-    /**
-     * Set a key and value pair. Keys are unique. Using an existing key will cause the old value to
-     * be overwritten and the expiration timer to be reset.
-     * 
-     * @param key key with which the specified value is to be associated
-     * @param value value to be associated with the specified key
-     */
-    public void put(K key, V value) {
-        // Invalidate key - runs lazy check and ensures value won't be cleaned up early
-        invalidate(key);
-
-        internal.put(key, value);
-        expiry.put(System.currentTimeMillis() + retention, key);
-    }
-
-    /**
-     * Returns the value to which the specified key is mapped, or null if no value is mapped for the key.
-     * 
-     * @param key the key whose associated value is to be returned
-     * @return the value to which the specified key is mapped, or null if no value is mapped for the key
-     */
-    public V get(K key) {
-        // Run lazy check to clean cache
-        lazyCheck();
-
-        return internal.get(key);
-    }
-
-    /**
-     * Returns true if the specified key is mapped to a value.
-     * 
-     * @param key key to check if a mapping exists for
-     * @return true if a mapping exists for the specified key
-     */
-    public boolean containsKey(K key) {
-        // Run lazy check to clean cache
-        lazyCheck();
-
-        return internal.containsKey(key);
-    }
-
-    /**
-     * Forcibly invalidates a key, even if it is considered to be in use.
-     * 
-     * @param key key to invalidate
-     */
-    public void invalidate(K key) {
-        // Run lazy check to clean cache
-        lazyCheck();
-
-        if (!internal.containsKey(key)) {
-            // Value either not present or cleaned by lazy check. Either way, we're good
-            return;
-        }
-
-        // Remove stored object
-        internal.remove(key);
-
-        // Remove expiration entry - prevents more work later, plus prevents issues with values invalidating early
-        for (Iterator<Map.Entry<Long, K>> iterator = expiry.entries().iterator(); iterator.hasNext();) {
-            if (key.equals(iterator.next().getValue())) {
-                iterator.remove();
-                break;
-            }
-        }
-    }
-
-    /**
-     * Forcibly invalidates all keys, even if they are considered to be in use.
-     */
-    public void invalidateAll() {
-        for (V value : internal.values()) {
-            postRemoval.run(value);
-        }
-        expiry.clear();
-        internal.clear();
-    }
-
-    /**
-     * Invalidate all expired keys that are not considered in use. If a key is expired but is
-     * considered in use by the provided Function, its expiration time is reset.
-     */
-    private void lazyCheck() {
-        long now = System.currentTimeMillis();
-        long nextExpiry = now + retention;
-        for (Iterator<Map.Entry<Long, K>> iterator = expiry.entries().iterator(); iterator.hasNext();) {
-            Map.Entry<Long, K> entry = iterator.next();
-
-            if (entry.getKey() > now) {
-                break;
-            }
-
-            iterator.remove();
-
-            if (inUseCheck.run(internal.get(entry.getValue()))) {
-                expiry.put(nextExpiry, entry.getValue());
-                continue;
-            }
-
-            V value = internal.remove(entry.getValue());
-
-            if (value == null) {
-                continue;
-            }
-
-            postRemoval.run(value);
-        }
-    }
-
-}

plugin/src/main/java/com/lishid/openinv/util/Function.java

@@ -1,12 +0,0 @@
-package com.lishid.openinv.util;
-
-/**
- * Abstraction for some simple cache calls.
- * 
- * @author Jikoo
- */
-public abstract class Function<V> {
-
-    public abstract boolean run(V value);
-
-}

plugin/src/main/resources/plugin.yml

@@ -1,45 +0,0 @@
-name: OpenInv
-main: com.lishid.openinv.OpenInv
-version: ${openinv.version}
-author: lishid
-authors: [Jikoo, ShadowRanger]
-description: >
-             This plugin allows you to open a player's inventory as a chest and interact with it in real time.
-commands:
-  openinv:
-    aliases: [oi, inv, open]
-    description: Open a player's inventory
-    permission: OpenInv.*;OpenInv.openinv
-    usage: |-
-           /<command> [Player] - Open a player's inventory
-  openender:
-    aliases: [oe]
-    description: Opens the enderchest of a player
-    permission: OpenInv.*;OpenInv.openender
-    usage: |-
-           /<command> [Player] - Open a player's enderchest
-  searchinv:
-    aliases: [si]
-    description: Search and list players having a specific item
-    permission: OpenInv.*;OpenInv.search
-    usage: |-
-           /<command> <Item> [MinAmount] - Item is the ID or the Bukkit Material, MinAmount is the minimum amount required
-  searchender:
-    aliases: [se]
-    permission: OpenInv.*;OpenInv.search
-    description: Searches and lists players having a specific item in their ender chest
-    usage: |-
-           /<command> <item> [minAmount] - Item is the ID or the Bukkit Material, MinAmount is the minimum amount required
-  silentchest:
-    aliases: [sc, silent]
-    description: Toggle silent chest function, which stops sounds and animations when using containers.
-    permission: OpenInv.*;OpenInv.silent
-    usage: |-
-           /<command> [Check] - Check or toggle silent chest
-  anychest:
-    aliases: [ac]
-    description: Toggle anychest function, which allows opening of blocked chests.
-    permission: OpenInv.*;OpenInv.anychest
-    usage: |-
-           /<command> [Check] - Checks or toggle anychest
-

pom.xml

@@ -1,162 +1,136 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <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>
-  <groupId>com.lishid</groupId>
-  <artifactId>openinv</artifactId>
-  <packaging>pom</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>OpenInv</name>
-  <url>http://dev.bukkit.org/bukkit-plugins/openinv/</url>
+  <groupId>OpenInv</groupId>
+  <artifactId>OpenInv</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <openinv.version>3.0.1</openinv.version>
-  </properties>
-
-  <profiles>
-
-    <!--
-      ~ N.B.: All dependencies for profiles are set in ./assembly/pom.xml
-      ~ 
-      ~ This is to prevent recursive dependencies. It's not ideal, but it works.
-      ~ The parent project always builds first. Then, due to profile ordering here,
-      ~ whatever modules are enabled are built. Finally, the assembly module is built,
-      ~ which contains no actual code, but shades all its "dependencies" into one jar.
-     -->
-
-    <!--
-      ~ This profile exists to simplify profile usage.
-      ~ The interface and plugin modules should be built first to ensure that they are up to date.
-     -->
-    <profile>
-      <id>reactorbuildfirst</id>
-      <activation>
-        <property>
-          <name>!breakBuildProcess</name>
-        </property>
-      </activation>
-      <modules>
-        <module>internal</module>
-        <module>plugin</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>latest</id>
-      <activation>
-        <property>
-          <name>latest</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <modules>
-        <module>v1_11_R1</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>modern</id>
-      <activation>
-        <property>
-          <name>modern</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <modules>
-        <module>v1_8_R1</module>
-        <module>v1_8_R2</module>
-        <module>v1_8_R3</module>
-        <module>v1_9_R1</module>
-        <module>v1_9_R2</module>
-        <module>v1_10_R1</module>
-        <module>v1_11_R1</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>all</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>1_4_5</module>
-        <module>1_4_6</module>
-        <module>v1_4_R1</module>
-        <!-- 1_5_R1 was never released -->
-        <module>v1_5_R2</module>
-        <module>v1_5_R3</module>
-        <!-- 1_6_R1 also had no tagged releases, remove? -->
-        <module>v1_6_R1</module>
-        <module>v1_6_R2</module>
-        <module>v1_6_R3</module>
-        <!-- TODO: Recompile CB for 1_7_R1 through 1_7_R4, currently using whatever jars worked -->
-        <module>v1_7_R1</module>
-        <module>v1_7_R2</module>
-        <module>v1_7_R3</module>
-        <module>v1_7_R4</module>
-        <module>v1_8_R1</module>
-        <module>v1_8_R2</module>
-        <module>v1_8_R3</module>
-        <module>v1_9_R1</module>
-        <module>v1_9_R2</module>
-        <module>v1_10_R1</module>
-        <module>v1_11_R1</module>
-      </modules>
-    </profile>
-
-    <!--
-      ~ This profile exists to fix reactor build order.
-      ~ The assembly module must be built last to aggregate all active modules into the final jar.
-     -->
-    <profile>
-      <id>reactorbuildlast</id>
-      <activation>
-        <property>
-          <name>!breakBuildProcess</name>
-        </property>
-      </activation>
-      <modules>
-        <module>assembly</module>
-      </modules>
-    </profile>
-
-  </profiles>
-
-  <repositories>
-    <repository>
-      <id>spigot-repo</id>
-      <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-    </repository>
-  </repositories>
+  <dependencies>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.9-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_9_R1</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.8.8-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_8_R3</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.8.3-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_8_R2</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.8-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_8_R1</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.7.10-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_7_R4</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.7.9-R0.2-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_7_R3</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.7.5-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_7_R2</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.7.2-R0.4-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_7_R1</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.6.4-R2.0-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_6_R3</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.6.2-R1.1-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_6_R2</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.6.1-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_6_R1</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.5.2-R1.0-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_5_R3</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.5.1-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_5_R2</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.5-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_5_R1</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.4.7-R1.1-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_4_R1</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.4.6-R0.4-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_4_6</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.4.5-R1.1-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_4_5</classifier>
+    </dependency>
+  </dependencies>
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.4.3</version>
-        <configuration>
-          <filters>
-            <filter>
-              <artifact>*:*</artifact>
-              <!-- Keep the file clean, don't include every single pom from all modules -->
-              <excludes>META-INF/maven/**</excludes>
-            </filter>
-          </filters>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.1</version>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
@@ -164,5 +138,4 @@
       </plugin>
     </plugins>
   </build>
-
 </project>

src/main/java/com/lishid/openinv/OpenInv.java

@@ -0,0 +1,220 @@
+/*
+ * 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;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permissible;
+import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import com.lishid.openinv.commands.AnyChestPluginCommand;
+import com.lishid.openinv.commands.OpenEnderPluginCommand;
+import com.lishid.openinv.commands.OpenInvPluginCommand;
+import com.lishid.openinv.commands.SearchInvPluginCommand;
+import com.lishid.openinv.commands.SilentChestPluginCommand;
+import com.lishid.openinv.internal.IAnySilentChest;
+import com.lishid.openinv.internal.IInventoryAccess;
+import com.lishid.openinv.internal.IPlayerDataManager;
+import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.InternalAccessor;
+
+/**
+ * Open other player's inventory
+ * 
+ * @author lishid
+ */
+public class OpenInv extends JavaPlugin {
+
+    private final Map<String, ISpecialPlayerInventory> inventories = new HashMap<String, ISpecialPlayerInventory>();
+    private final Map<String, ISpecialEnderChest> enderChests = new HashMap<String, ISpecialEnderChest>();
+
+    private InternalAccessor accessor;
+    private IPlayerDataManager playerLoader;
+    private IInventoryAccess inventoryAccess;
+    private IAnySilentChest anySilentChest;
+
+    @Override
+    public void onEnable() {
+        // Get plugin manager
+        PluginManager pm = getServer().getPluginManager();
+
+        accessor = new InternalAccessor(this);
+        // Version check
+        if (!accessor.initialize(getServer())) {
+            getLogger().info("Your version of CraftBukkit is not supported.");
+            getLogger().info("Please look for an updated version of OpenInv.");
+            pm.disablePlugin(this);
+            return;
+        }
+
+        playerLoader = accessor.newPlayerDataManager();
+        inventoryAccess = accessor.newInventoryAccess();
+        anySilentChest = accessor.newAnySilentChest();
+
+        FileConfiguration config = getConfig();
+        config.set("NotifySilentChest", config.getBoolean("NotifySilentChest", true));
+        config.set("NotifyAnyChest", config.getBoolean("NotifyAnyChest", true));
+        config.addDefault("NotifySilentChest", true);
+        config.addDefault("NotifyAnyChest", true);
+        config.options().copyDefaults(true);
+        saveConfig();
+
+        pm.registerEvents(new OpenInvPlayerListener(this), this);
+        pm.registerEvents(new OpenInvInventoryListener(this), this);
+
+        getCommand("openinv").setExecutor(new OpenInvPluginCommand(this));
+        getCommand("searchinv").setExecutor(new SearchInvPluginCommand());
+        getCommand("silentchest").setExecutor(new SilentChestPluginCommand(this));
+        getCommand("anychest").setExecutor(new AnyChestPluginCommand(this));
+        getCommand("openender").setExecutor(new OpenEnderPluginCommand(this));
+
+    }
+
+    public InternalAccessor getInternalAccessor() {
+        return this.accessor;
+    }
+
+    public IPlayerDataManager getPlayerLoader() {
+        return this.playerLoader;
+    }
+
+    public IInventoryAccess getInventoryAccess() {
+        return this.inventoryAccess;
+    }
+
+    public IAnySilentChest getAnySilentChest() {
+        return this.anySilentChest;
+    }
+
+    public ISpecialPlayerInventory getInventoryFor(Player player) {
+        String id = getPlayerLoader().getPlayerDataID(player);
+        if (inventories.containsKey(id)) {
+            return inventories.get(id);
+        }
+        return null;
+    }
+
+    public ISpecialPlayerInventory getOrCreateInventoryFor(Player player, boolean offline) {
+        String id = getPlayerLoader().getPlayerDataID(player);
+        if (inventories.containsKey(id)) {
+            return inventories.get(id);
+        }
+        ISpecialPlayerInventory inv = getInternalAccessor().newSpecialPlayerInventory(player, offline);
+        inventories.put(id, inv);
+        return inv;
+    }
+
+    public void removeLoadedInventory(Player player) {
+        String id = getPlayerLoader().getPlayerDataID(player);
+        if (inventories.containsKey(id)) {
+            inventories.remove(id);
+        }
+    }
+
+    public ISpecialEnderChest getEnderChestFor(Player player) {
+        String id = getPlayerLoader().getPlayerDataID(player);
+        if (enderChests.containsKey(id)) {
+            return enderChests.get(id);
+        }
+        return null;
+    }
+
+    public ISpecialEnderChest getOrCreateEnderChestFor(Player player, boolean offline) {
+        String id = getPlayerLoader().getPlayerDataID(player);
+        if (enderChests.containsKey(id)) {
+            return enderChests.get(id);
+        }
+        ISpecialEnderChest inv = getInternalAccessor().newSpecialEnderChest(player, offline);
+        enderChests.put(id, inv);
+        return inv;
+    }
+
+    public void removeLoadedEnderChest(Player player) {
+        String id = getPlayerLoader().getPlayerDataID(player);
+        if (enderChests.containsKey(id)) {
+            enderChests.remove(id);
+        }
+    }
+
+    public boolean notifySilentChest() {
+        return getConfig().getBoolean("NotifySilentChest", true);
+    }
+
+    public boolean notifyAnyChest() {
+        return getConfig().getBoolean("NotifyAnyChest", true);
+    }
+
+    public boolean getPlayerItemOpenInvStatus(OfflinePlayer player) {
+        return getConfig().getBoolean("ItemOpenInv." + getPlayerLoader().getPlayerDataID(player) + ".toggle", false);
+    }
+
+    public void setPlayerItemOpenInvStatus(OfflinePlayer player, boolean status) {
+        getConfig().set("ItemOpenInv." + getPlayerLoader().getPlayerDataID(player) + ".toggle", status);
+        saveConfig();
+    }
+
+    public boolean getPlayerSilentChestStatus(OfflinePlayer player) {
+        return getConfig().getBoolean("SilentChest." + getPlayerLoader().getPlayerDataID(player) + ".toggle", false);
+    }
+
+    public void setPlayerSilentChestStatus(OfflinePlayer player, boolean status) {
+        getConfig().set("SilentChest." + getPlayerLoader().getPlayerDataID(player) + ".toggle", status);
+        saveConfig();
+    }
+
+    public boolean getPlayerAnyChestStatus(OfflinePlayer player) {
+        return getConfig().getBoolean("AnyChest." + getPlayerLoader().getPlayerDataID(player) + ".toggle", true);
+    }
+
+    public void setPlayerAnyChestStatus(OfflinePlayer player, boolean status) {
+        getConfig().set("AnyChest." + getPlayerLoader().getPlayerDataID(player) + ".toggle", status);
+        saveConfig();
+    }
+
+    public static void ShowHelp(Player player) {
+        player.sendMessage(ChatColor.GREEN + "/openinv <Player> - Open a player's inventory");
+        player.sendMessage(ChatColor.GREEN + "   (aliases: oi, inv, open)");
+        player.sendMessage(ChatColor.GREEN + "/openender <Player> - Open a player's enderchest");
+        player.sendMessage(ChatColor.GREEN + "   (aliases: oe, enderchest)");
+        player.sendMessage(ChatColor.GREEN + "/searchinv <Item> [MinAmount] - ");
+        player.sendMessage(ChatColor.GREEN + "   Search and list players having a specific item.");
+        player.sendMessage(ChatColor.GREEN + "   (aliases: si, search)");
+        player.sendMessage(ChatColor.GREEN + "/anychest - Toggle anychest function");
+        player.sendMessage(ChatColor.GREEN + "   (aliases: ac)");
+        player.sendMessage(ChatColor.GREEN + "/silentchest - Toggle silent chest function");
+        player.sendMessage(ChatColor.GREEN + "   (aliases: sc, silent)");
+    }
+
+    public static boolean hasPermission(Permissible player, String permission) {
+        String[] parts = permission.split("\\.");
+        String perm = "";
+        for (int i = 0; i < parts.length; i++) {
+            if (player.hasPermission(perm + "*")) {
+                return true;
+            }
+            perm += parts[i] + ".";
+        }
+        return player.hasPermission(permission);
+    }
+}

src/main/java/com/lishid/openinv/OpenInvInventoryListener.java

@@ -16,14 +16,11 @@
 
 package com.lishid.openinv;
 
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryDragEvent;
-import org.bukkit.event.player.PlayerChangedWorldEvent;
-import org.bukkit.inventory.Inventory;
 
 public class OpenInvInventoryListener implements Listener {
 
@@ -33,30 +30,21 @@ public class OpenInvInventoryListener implements Listener {
         this.plugin = plugin;
     }
 
-    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.NORMAL)
     public void onInventoryClick(InventoryClickEvent event) {
-        if (cancelInteract(event.getWhoClicked(), event.getInventory())) {
+        // If this is the top inventory
+        // if (event.getView().convertSlot(event.getRawSlot()) == event.getRawSlot())
+        // {
+        if (!plugin.getInventoryAccess().check(event.getInventory(), event.getWhoClicked())) {
             event.setCancelled(true);
         }
+        // }
     }
 
-    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.NORMAL)
     public void onInventoryDrag(InventoryDragEvent event) {
-        if (cancelInteract(event.getWhoClicked(), event.getInventory())) {
+        if (!plugin.getInventoryAccess().check(event.getInventory(), event.getWhoClicked())) {
             event.setCancelled(true);
         }
     }
-
-    private boolean cancelInteract(HumanEntity entity, Inventory inventory) {
-        return plugin.getInventoryAccess().isSpecialPlayerInventory(inventory)
-                && !Permissions.EDITINV.hasPermission(entity)
-                || plugin.getInventoryAccess().isSpecialEnderChest(inventory)
-                        && !Permissions.EDITENDER.hasPermission(entity);
-    }
-
-    @EventHandler
-    public void onWorldChange(PlayerChangedWorldEvent event) {
-        plugin.changeWorld(event.getPlayer());
-    }
-
 }

src/main/java/com/lishid/openinv/OpenInvPlayerListener.java

@@ -0,0 +1,128 @@
+/*
+ * 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;
+
+import org.bukkit.ChatColor;
+import org.bukkit.block.Chest;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event.Result;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
+public class OpenInvPlayerListener implements Listener {
+
+    private final OpenInv plugin;
+
+    public OpenInvPlayerListener(OpenInv plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        ISpecialPlayerInventory inventory = plugin.getInventoryFor(event.getPlayer());
+
+        if (inventory != null) {
+            inventory.setPlayerOnline(event.getPlayer());
+        }
+
+        ISpecialEnderChest chest = plugin.getEnderChestFor(event.getPlayer());
+
+        if (chest != null) {
+            chest.setPlayerOnline(event.getPlayer());
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        ISpecialPlayerInventory inventory = plugin.getInventoryFor(event.getPlayer());
+        if (inventory != null) {
+            if (inventory.setPlayerOffline()) {
+                plugin.removeLoadedInventory(event.getPlayer());
+            }
+        }
+        ISpecialEnderChest chest = plugin.getEnderChestFor(event.getPlayer());
+        if (chest != null) {
+            if (chest.setPlayerOffline()) {
+                plugin.removeLoadedEnderChest(event.getPlayer());
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        Player player = event.getPlayer();
+
+        if (event.getPlayer().isSneaking()) {
+            return;
+        }
+
+        if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.useInteractedBlock() == Result.DENY) {
+            return;
+        }
+
+        if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getType() == org.bukkit.Material.ENDER_CHEST) {
+            if (OpenInv.hasPermission(player, Permissions.PERM_SILENT) && plugin.getPlayerSilentChestStatus(player)) {
+                event.setCancelled(true);
+                player.openInventory(player.getEnderChest());
+            }
+        }
+
+        if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getState() instanceof Chest) {
+            boolean silentchest = false;
+            boolean anychest = false;
+            int x = event.getClickedBlock().getX();
+            int y = event.getClickedBlock().getY();
+            int z = event.getClickedBlock().getZ();
+
+            if (OpenInv.hasPermission(player, Permissions.PERM_SILENT) && plugin.getPlayerSilentChestStatus(player)) {
+                silentchest = true;
+            }
+
+            if (OpenInv.hasPermission(player, Permissions.PERM_ANYCHEST) && plugin.getPlayerAnyChestStatus(player)) {
+                try {
+                    anychest = plugin.getAnySilentChest().isAnyChestNeeded(player, x, y, z);
+                }
+                catch (Exception e) {
+                    player.sendMessage(ChatColor.RED + "Error while executing openinv. Unsupported CraftBukkit.");
+                    e.printStackTrace();
+                }
+            }
+
+            // If the anychest or silentchest is active
+            if (anychest || silentchest) {
+                if (!plugin.getAnySilentChest().activateChest(player, anychest, silentchest, x, y, z)) {
+                    if (silentchest && plugin.notifySilentChest()) {
+                        player.sendMessage("You are opening a chest silently.");
+                    }
+                    if (anychest && plugin.notifyAnyChest()) {
+                        player.sendMessage("You are opening a blocked chest.");
+                    }
+                    event.setCancelled(true);
+                }
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,16 @@
+package com.lishid.openinv;
+
+public class Permissions {
+    public static final String PERM_OPENINV = "OpenInv.openinv";
+    public static final String PERM_OVERRIDE = "OpenInv.override";
+    public static final String PERM_EXEMPT = "OpenInv.exempt";
+    public static final String PERM_CROSSWORLD = "OpenInv.crossworld";
+    public static final String PERM_SILENT = "OpenInv.silent";
+    public static final String PERM_ANYCHEST = "OpenInv.anychest";
+    public static final String PERM_ENDERCHEST = "OpenInv.openender";
+    public static final String PERM_ENDERCHEST_ALL = "OpenInv.openenderall";
+    public static final String PERM_SEARCH = "OpenInv.search";
+    public static final String PERM_EDITINV = "OpenInv.editinv";
+    public static final String PERM_EDITENDER = "OpenInv.editender";
+    public static final String PERM_OPENSELF = "OpenInv.openself";
+}

src/main/java/com/lishid/openinv/commands/AnyChestPluginCommand.java

@@ -40,15 +40,18 @@ public class AnyChestPluginCommand implements CommandExecutor {
 
         Player player = (Player) sender;
 
-        if (args.length > 0 && args[0].equalsIgnoreCase("check")) {
-            sender.sendMessage("AnyChest is " + (plugin.getPlayerAnyChestStatus(player) ? "ON" : "OFF") + ".");
-            return true;
+        if (args.length > 0) {
+            if (args[0].equalsIgnoreCase("check")) {
+                if (plugin.getPlayerAnyChestStatus(player))
+                    sender.sendMessage("AnyChest is ON.");
+                else
+                    sender.sendMessage("AnyChest is OFF.");
+            }
         }
 
         plugin.setPlayerAnyChestStatus(player, !plugin.getPlayerAnyChestStatus(player));
-        sender.sendMessage("AnyChest is now " + (plugin.getPlayerAnyChestStatus(player) ? "ON" : "OFF") + ".");
+        sender.sendMessage("AnyChest is now " + (plugin.getPlayerAnyChestStatus(player) ? "On" : "Off") + ".");
 
         return true;
     }
-
 }

src/main/java/com/lishid/openinv/commands/OpenEnderPluginCommand.java

@@ -17,11 +17,9 @@
 package com.lishid.openinv.commands;
 
 import java.util.HashMap;
+import java.util.List;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.Permissions;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
@@ -30,16 +28,18 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
-public class OpenEnderPluginCommand implements CommandExecutor {
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.ISpecialEnderChest;
 
+public class OpenEnderPluginCommand implements CommandExecutor {
     private final OpenInv plugin;
-    private final HashMap<Player, String> openEnderHistory = new HashMap<Player, String>();
+    public static HashMap<Player, String> openEnderHistory = new HashMap<Player, String>();
 
     public OpenEnderPluginCommand(OpenInv plugin) {
         this.plugin = plugin;
     }
 
-    @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (!(sender instanceof Player)) {
             sender.sendMessage(ChatColor.RED + "You can't use this from the console.");
@@ -47,7 +47,7 @@ public class OpenEnderPluginCommand implements CommandExecutor {
         }
 
         if (args.length > 0 && args[0].equalsIgnoreCase("?")) {
-            plugin.showHelp((Player) sender);
+            OpenInv.ShowHelp((Player) sender);
             return true;
         }
 
@@ -66,22 +66,28 @@ public class OpenEnderPluginCommand implements CommandExecutor {
         // Read from history if target is not named
         if (args.length < 1) {
             name = history;
-        } else {
+        }
+        else {
             name = args[0];
         }
 
         new BukkitRunnable() {
-            @Override
             public void run() {
-                final OfflinePlayer offlinePlayer = plugin.matchPlayer(name);
-
-                if (offlinePlayer == null || !offlinePlayer.hasPlayedBefore() && !offlinePlayer.isOnline()) {
+                List<Player> matches = Bukkit.matchPlayer(name);
+                final OfflinePlayer offlinePlayer;
+                if (!matches.isEmpty()) {
+                    offlinePlayer = matches.get(0);
+                } else {
+                    offlinePlayer = Bukkit.getOfflinePlayer(name);
+                }
+                if (!player.isOnline()) {
+                    return;
+                }
+                if (offlinePlayer == null || !offlinePlayer.hasPlayedBefore()) {
                     player.sendMessage(ChatColor.RED + "Player not found!");
                     return;
                 }
-
                 new BukkitRunnable() {
-                    @Override
                     public void run() {
                         if (!player.isOnline()) {
                             return;
@@ -89,7 +95,6 @@ public class OpenEnderPluginCommand implements CommandExecutor {
                         openInventory(player, offlinePlayer);
                     }
                 }.runTask(plugin);
-
             }
         }.runTaskAsynchronously(plugin);
 
@@ -99,11 +104,9 @@ public class OpenEnderPluginCommand implements CommandExecutor {
     private void openInventory(Player player, OfflinePlayer target) {
 
         Player onlineTarget;
-        boolean online = target.isOnline();
-
-        if (!online) {
+        if (!target.isOnline()) {
             // Try loading the player's data
-            onlineTarget = plugin.loadPlayer(target);
+            onlineTarget = plugin.getPlayerLoader().loadPlayer(target);
 
             if (onlineTarget == null) {
                 player.sendMessage(ChatColor.RED + "Player not found!");
@@ -113,29 +116,19 @@ public class OpenEnderPluginCommand implements CommandExecutor {
             onlineTarget = target.getPlayer();
         }
 
-        if (!onlineTarget.equals(player)) {
-            if (!Permissions.ENDERCHEST_ALL.hasPermission(player)) {
-                player.sendMessage(ChatColor.RED + "You do not have permission to access other players' enderchests.");
-                return;
-            }
-            if (!Permissions.CROSSWORLD.hasPermission(player) && !player.getWorld().equals(onlineTarget.getWorld())) {
-                player.sendMessage(ChatColor.RED + onlineTarget.getDisplayName() + " is not in your world!");
-                return;
-            }
-            if (!Permissions.OVERRIDE.hasPermission(player) && Permissions.EXEMPT.hasPermission(onlineTarget)) {
-                player.sendMessage(ChatColor.RED + onlineTarget.getDisplayName() + "'s inventory is protected!");
-                return;
-            }
+
+        if (!onlineTarget.equals(player) && !OpenInv.hasPermission(player, Permissions.PERM_ENDERCHEST_ALL)) {
+            player.sendMessage(ChatColor.RED + "You do not have permission to access other player's enderchest");
+            return;
         }
 
         // Record the target
         openEnderHistory.put(player, onlineTarget.getName());
 
         // Create the inventory
-        ISpecialEnderChest chest = plugin.getEnderChest(onlineTarget, online);
+        ISpecialEnderChest chest = plugin.getOrCreateEnderChestFor(onlineTarget, !target.isOnline());
 
         // Open the inventory
         player.openInventory(chest.getBukkitInventory());
     }
-
 }

src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java

@@ -17,11 +17,9 @@
 package com.lishid.openinv.commands;
 
 import java.util.HashMap;
+import java.util.List;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.Permissions;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
@@ -30,16 +28,18 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
-public class OpenInvPluginCommand implements CommandExecutor {
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
 
+public class OpenInvPluginCommand implements CommandExecutor {
     private final OpenInv plugin;
-    private final HashMap<Player, String> openInvHistory = new HashMap<Player, String>();
+    public static HashMap<Player, String> openInvHistory = new HashMap<Player, String>();
 
     public OpenInvPluginCommand(OpenInv plugin) {
         this.plugin = plugin;
     }
 
-    @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (!(sender instanceof Player)) {
             sender.sendMessage(ChatColor.RED + "You can't use this from the console.");
@@ -47,7 +47,7 @@ public class OpenInvPluginCommand implements CommandExecutor {
         }
 
         if (args.length > 0 && args[0].equalsIgnoreCase("?")) {
-            plugin.showHelp((Player) sender);
+            OpenInv.ShowHelp((Player) sender);
             return true;
         }
 
@@ -66,22 +66,28 @@ public class OpenInvPluginCommand implements CommandExecutor {
         // Read from history if target is not named
         if (args.length < 1) {
             name = history;
-        } else {
+        }
+        else {
             name = args[0];
         }
 
         new BukkitRunnable() {
-            @Override
             public void run() {
-                final OfflinePlayer offlinePlayer = plugin.matchPlayer(name);
-
-                if (offlinePlayer == null || !offlinePlayer.hasPlayedBefore() && !offlinePlayer.isOnline()) {
+                List<Player> matches = Bukkit.matchPlayer(name);
+                final OfflinePlayer offlinePlayer;
+                if (!matches.isEmpty()) {
+                    offlinePlayer = matches.get(0);
+                } else {
+                    offlinePlayer = Bukkit.getOfflinePlayer(name);
+                }
+                if (!player.isOnline()) {
+                    return;
+                }
+                if (offlinePlayer == null || !offlinePlayer.hasPlayedBefore()) {
                     player.sendMessage(ChatColor.RED + "Player not found!");
                     return;
                 }
-
                 new BukkitRunnable() {
-                    @Override
                     public void run() {
                         if (!player.isOnline()) {
                             return;
@@ -89,7 +95,6 @@ public class OpenInvPluginCommand implements CommandExecutor {
                         openInventory(player, offlinePlayer);
                     }
                 }.runTask(plugin);
-
             }
         }.runTaskAsynchronously(plugin);
 
@@ -100,11 +105,10 @@ public class OpenInvPluginCommand implements CommandExecutor {
 
 
         Player onlineTarget;
-        boolean online = target.isOnline();
 
-        if (!online) {
+        if (!target.isOnline()) {
             // Try loading the player's data
-            onlineTarget = plugin.loadPlayer(target);
+            onlineTarget = plugin.getPlayerLoader().loadPlayer(target);
 
             if (onlineTarget == null) {
                 player.sendMessage(ChatColor.RED + "Player not found!");
@@ -115,34 +119,30 @@ public class OpenInvPluginCommand implements CommandExecutor {
         }
 
         // Permissions checks
-        if (onlineTarget.equals(player)) {
-            // Self-open check
-            if (!Permissions.OPENSELF.hasPermission(player)) {
-                player.sendMessage(ChatColor.RED + "You're not allowed to openinv yourself.");
-                return;
-            }
-        } else {
-            // Protected check
-            if (!Permissions.OVERRIDE.hasPermission(player) && Permissions.EXEMPT.hasPermission(onlineTarget)) {
-                player.sendMessage(ChatColor.RED + onlineTarget.getDisplayName() + "'s inventory is protected!");
-                return;
-            }
+        if (!OpenInv.hasPermission(player, Permissions.PERM_OVERRIDE) && OpenInv.hasPermission(onlineTarget, Permissions.PERM_EXEMPT)) {
+            player.sendMessage(ChatColor.RED + onlineTarget.getDisplayName() + "'s inventory is protected!");
+            return;
+        }
 
-            // Crossworld check
-            if ((!Permissions.CROSSWORLD.hasPermission(player) && !Permissions.OVERRIDE.hasPermission(player)) && onlineTarget.getWorld() != player.getWorld()) {
-                player.sendMessage(ChatColor.RED + onlineTarget.getDisplayName() + " is not in your world!");
-                return;
-            }
+        // Crosswork check
+        if ((!OpenInv.hasPermission(player, Permissions.PERM_CROSSWORLD) && !OpenInv.hasPermission(player, Permissions.PERM_OVERRIDE)) && onlineTarget.getWorld() != player.getWorld()) {
+            player.sendMessage(ChatColor.RED + onlineTarget.getDisplayName() + " is not in your world!");
+            return;
+        }
+
+        // Self-open check
+        if (!OpenInv.hasPermission(player, Permissions.PERM_OPENSELF) && onlineTarget.equals(player)) {
+            player.sendMessage(ChatColor.RED + "You're not allowed to openinv yourself.");
+            return;
         }
 
         // Record the target
         openInvHistory.put(player, onlineTarget.getName());
 
         // Create the inventory
-        ISpecialPlayerInventory inv = plugin.getInventory(onlineTarget, online);
+        ISpecialPlayerInventory inv = plugin.getOrCreateInventoryFor(onlineTarget, !target.isOnline());
 
         // Open the inventory
         player.openInventory(inv.getBukkitInventory());
     }
-
 }

src/main/java/com/lishid/openinv/commands/SearchInvPluginCommand.java

@@ -23,12 +23,14 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
 
 public class SearchInvPluginCommand implements CommandExecutor {
+    public SearchInvPluginCommand() {
+
+    }
 
-    @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        String PlayerList = "";
 
         Material material = null;
         int count = 1;
@@ -38,11 +40,11 @@ public class SearchInvPluginCommand implements CommandExecutor {
             gData = args[0].split(":");
             material = Material.matchMaterial(gData[0]);
         }
-
         if (args.length >= 2) {
             try {
                 count = Integer.parseInt(args[1]);
-            } catch (NumberFormatException ex) {
+            }
+            catch (NumberFormatException ex) {
                 sender.sendMessage(ChatColor.RED + "'" + args[1] + "' is not a number!");
                 return false;
             }
@@ -53,23 +55,13 @@ public class SearchInvPluginCommand implements CommandExecutor {
             return false;
         }
 
-        StringBuilder players = new StringBuilder();
-        for (Player player : Bukkit.getServer().getOnlinePlayers()) {
-            Inventory inventory = command.getName().equals("searchinv") ? player.getInventory() : player.getEnderChest();
-            if (inventory.contains(material, count)) {
-                players.append(player.getName()).append(", ");
+        for (Player templayer : Bukkit.getServer().getOnlinePlayers()) {
+            if (templayer.getInventory().contains(material, count)) {
+                PlayerList += templayer.getName() + "  ";
             }
         }
 
-        // Matches found, delete trailing comma and space
-        if (players.length() > 0) {
-            players.delete(players.length() - 2, players.length());
-        } else {
-            sender.sendMessage("No players found with " + material.toString());
-        }
-
-        sender.sendMessage("Players with the item " + material.toString() + ":  " + players.toString());
+        sender.sendMessage("Players with the item " + material.toString() + ":  " + PlayerList);
         return true;
     }
-
 }

src/main/java/com/lishid/openinv/commands/SilentChestPluginCommand.java

@@ -40,13 +40,17 @@ public class SilentChestPluginCommand implements CommandExecutor {
 
         Player player = (Player) sender;
 
-        if (args.length > 0 && args[0].equalsIgnoreCase("check")) {
-            sender.sendMessage("SilentChest is " + (plugin.getPlayerAnyChestStatus(player) ? "ON" : "OFF") + ".");
-            return true;
+        if (args.length > 0) {
+            if (args[0].equalsIgnoreCase("check")) {
+                if (plugin.getPlayerSilentChestStatus(player))
+                    sender.sendMessage("SilentChest is ON.");
+                else
+                    sender.sendMessage("SilentChest is OFF.");
+            }
         }
 
         plugin.setPlayerSilentChestStatus(player, !plugin.getPlayerSilentChestStatus(player));
-        sender.sendMessage("SilentChest is now " + (plugin.getPlayerSilentChestStatus(player) ? "ON" : "OFF") + ".");
+        sender.sendMessage("SilentChest is now " + (plugin.getPlayerSilentChestStatus(player) ? "On" : "Off") + ".");
 
         return true;
     }

src/main/java/com/lishid/openinv/internal/IAnySilentChest.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal;
+
+import org.bukkit.entity.Player;
+
+public interface IAnySilentChest {
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z);
+
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z);
+}

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

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+public interface IInventoryAccess {
+    public boolean check(Inventory inventory, HumanEntity player);
+}

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

@@ -20,31 +20,7 @@ import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 public interface IPlayerDataManager {
-
-    /**
-     * Loads a Player for an OfflinePlayer.
-     * </p>
-     * This method is potentially blocking, and should not be called on the main thread.
-     * 
-     * @param offline
-     * @return
-     */
     public Player loadPlayer(OfflinePlayer offline);
 
-    /**
-     * Gets a unique identifying string for an OfflinePlayer.
-     * 
-     * @param player
-     * @return
-     */
     public String getPlayerDataID(OfflinePlayer player);
-
-    /**
-     * Gets an OfflinePlayer by the given unique identifier.
-     * 
-     * @param identifier the unique identifier
-     * @return the OfflinePlayer, or null if no exact match was found
-     */
-    public OfflinePlayer getPlayerByID(String identifier);
-
 }

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

@@ -21,30 +21,17 @@ import org.bukkit.inventory.Inventory;
 
 public interface ISpecialEnderChest {
 
-    /**
-     * Gets the Inventory associated with this ISpecialEnderChest.
-     * 
-     * @return the Inventory
-     */
     public Inventory getBukkitInventory();
 
-    /**
-     * Sets the Player associated with this ISpecialEnderChest online.
-     * 
-     * @param player the Player coming online
-     */
-    public void setPlayerOnline(Player player);
+    public boolean inventoryRemovalCheck();
+
+    public void setPlayerOnline(Player p);
 
     /**
      * Sets the Player associated with this ISpecialEnderChest offline.
-     */
-    public void setPlayerOffline();
-
-    /**
-     * Gets whether or not this ISpecialEnderChest is in use.
      * 
-     * @return true if the ISpecialEnderChest is in use
+     * @return true if the ISpecialEnderChest is eligible for removal
      */
-    public boolean isInUse();
+    public boolean setPlayerOffline();
 
 }

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

@@ -21,30 +21,16 @@ import org.bukkit.inventory.Inventory;
 
 public interface ISpecialPlayerInventory {
 
-    /**
-     * Gets the Inventory associated with this ISpecialPlayerInventory.
-     * 
-     * @return the Inventory
-     */
     public Inventory getBukkitInventory();
 
-    /**
-     * Sets the Player associated with this ISpecialPlayerInventory online.
-     * 
-     * @param player the Player coming online
-     */
+    public boolean inventoryRemovalCheck();
+
     public void setPlayerOnline(Player player);
 
     /**
      * Sets the Player associated with this ISpecialPlayerInventory offline.
-     */
-    public void setPlayerOffline();
-
-    /**
-     * Gets whether or not this ISpecialPlayerInventory is in use.
      * 
-     * @return true if the ISpecialPlayerInventory is in use
+     * @return true if the ISpecialPlayerInventory is eligible for removal
      */
-    public boolean isInUse();
-
+    public boolean setPlayerOffline();
 }

src/main/java/com/lishid/openinv/internal/InternalAccessor.java

@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal;
+
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.OpenInv;
+
+public class InternalAccessor {
+
+    private final OpenInv plugin;
+
+    private String version;
+
+    public InternalAccessor(OpenInv plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Check if the current server version is supported, and, if it is, prepare to load version-specific code.
+     * 
+     * @param server the Server
+     * 
+     * @return true if supported
+     */
+    public boolean initialize(Server server) {
+        String packageName = server.getClass().getPackage().getName();
+        version = packageName.substring(packageName.lastIndexOf('.') + 1);
+
+        try {
+            Class.forName("com.lishid.openinv.internal." + version + ".AnySilentChest");
+            return true;
+        }
+        catch (Exception e) {
+            return false;
+        }
+    }
+
+    private void printErrorMessage() {
+        plugin.getLogger().warning("OpenInv encountered an error with the CraftBukkit version \"" + version + "\". Please look for an updated version of OpenInv.");
+    }
+
+    public IPlayerDataManager newPlayerDataManager() {
+        return (IPlayerDataManager) createObject(IPlayerDataManager.class, "PlayerDataManager");
+    }
+
+    public IInventoryAccess newInventoryAccess() {
+        return (IInventoryAccess) createObject(IInventoryAccess.class, "InventoryAccess");
+    }
+
+    public IAnySilentChest newAnySilentChest() {
+        return (IAnySilentChest) createObject(IAnySilentChest.class, "AnySilentChest");
+    }
+
+    public ISpecialPlayerInventory newSpecialPlayerInventory(Player player, boolean offline) {
+        try {
+            Class<?> internalClass = Class.forName("com.lishid.openinv.internal." + version + ".SpecialPlayerInventory");
+            if (ISpecialPlayerInventory.class.isAssignableFrom(internalClass)) {
+                return (ISpecialPlayerInventory) internalClass.getConstructor(Player.class, Boolean.class).newInstance(player, offline);
+            }
+        }
+        catch (Exception e) {
+            printErrorMessage();
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    public ISpecialEnderChest newSpecialEnderChest(Player player, boolean offline) {
+        try {
+            Class<?> internalClass = Class.forName("com.lishid.openinv.internal." + version + ".SpecialEnderChest");
+            if (ISpecialEnderChest.class.isAssignableFrom(internalClass)) {
+                return (ISpecialEnderChest) internalClass.getConstructor(Player.class, Boolean.class).newInstance(player, offline);
+            }
+        }
+        catch (Exception e) {
+            printErrorMessage();
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    private Object createObject(Class<? extends Object> assignableClass, String className) {
+        try {
+            Class<?> internalClass = Class.forName("com.lishid.openinv.internal." + version + "." + className);
+            if (assignableClass.isAssignableFrom(internalClass)) {
+                return internalClass.getConstructor().newInstance();
+            }
+        }
+        catch (Exception e) {
+            printErrorMessage();
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+}

src/main/java/com/lishid/openinv/internal/v1_4_5/AnySilentChest.java

@@ -0,0 +1,120 @@
+/*
+ * 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 org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.internal.IAnySilentChest;
+
+// Volatile
+import net.minecraft.server.v1_4_5.Block;
+import net.minecraft.server.v1_4_5.EntityPlayer;
+import net.minecraft.server.v1_4_5.IInventory;
+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.World;
+
+import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
+
+public class AnySilentChest implements IAnySilentChest {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        // If block on top
+        if (world.s(x, y + 1, z))
+            return true;
+
+        // If block next to chest is chest and has a block on top
+        if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id) && (world.s(x + 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id) && (world.s(x, y + 1, z - 1)))
+            return true;
+        if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id) && (world.s(x, y + 1, z + 1)))
+            return true;
+
+        return false;
+    }
+
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        Object chest = world.getTileEntity(x, y, z);
+        if (chest == null)
+            return true;
+
+        if (!anychest) {
+            if (world.s(x, y + 1, z))
+                return true;
+            if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id) && (world.s(x + 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id) && (world.s(x, y + 1, z - 1)))
+                return true;
+            if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id) && (world.s(x, y + 1, z + 1)))
+                return true;
+        }
+
+        if (world.getTypeId(x - 1, y, z) == Block.CHEST.id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        if (world.getTypeId(x + 1, y, z) == Block.CHEST.id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        if (world.getTypeId(x, y, z - 1) == Block.CHEST.id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        if (world.getTypeId(x, y, z + 1) == Block.CHEST.id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+
+        boolean returnValue = true;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+        }
+        else {
+            try {
+                int id = 0;
+                try {
+                    Field windowID = player.getClass().getDeclaredField("containerCounter");
+                    windowID.setAccessible(true);
+                    id = windowID.getInt(player);
+                    id = id % 100 + 1;
+                    windowID.setInt(player, id);
+                }
+                catch (NoSuchFieldException e) {}
+
+                player.netServerHandler.sendPacket(new Packet100OpenWindow(id, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize()));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                player.activeContainer.windowId = id;
+                player.activeContainer.addSlotListener(player);
+                returnValue = false;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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 org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+// 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 check(Inventory inventory, HumanEntity player) {
+        IInventory inv = ((CraftInventory) inventory).getInventory();
+
+        if (inv instanceof SpecialPlayerInventory) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
+                return false;
+            }
+        }
+
+        else if (inv instanceof SpecialEnderChest) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -16,12 +16,12 @@
 
 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;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 // Volatile
 import net.minecraft.server.v1_4_5.EntityPlayer;
 import net.minecraft.server.v1_4_5.ItemInWorldManager;
@@ -33,40 +33,24 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
-            return null;
-        }
-
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
-                new ItemInWorldManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new ItemInWorldManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
+            // Return the entity
+            return target;
         }
-        // Return the entity
-        return target;
+        return null;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
-
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
 }

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

@@ -20,27 +20,19 @@ 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);
-        // Send close signal
-        i2.f();
+        inv = i2;
+        // close signal
+        inv.f();
     }
 
     @Override
-    public void b(EntityHuman entityHuman) {
+    public void b(EntityHuman paramEntityHuman) {
         // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried);
-        }
     }
-
 }

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

@@ -20,14 +20,15 @@ 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.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;
@@ -38,17 +39,15 @@ import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public boolean playerOnline = false;
+    private final CraftPlayer owner;
     private final InventoryEnderChest enderChest;
-    private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
-    private CraftPlayer owner;
     private int maxStack = MAX_STACK;
+    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
-                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -61,27 +60,30 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
+    @Override
+    public void setPlayerOnline(Player p) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+        return this.inventoryRemovalCheck();
     }
 
     @Override
@@ -97,6 +99,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
@@ -119,10 +122,22 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public void update() {
-        super.update();
-        enderChest.update();
+    public boolean a(EntityHuman entityhuman) {
+        return true;
     }
 
+    @Override
+    public void startOpen() {
+
+    }
+
+    @Override
+    public void f() {
+
+    }
+
+    @Override
+    public void update() {
+        enderChest.update();
+    }
 }

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

@@ -16,26 +16,29 @@
 
 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.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 {
-
+    CraftPlayer owner;
+    public boolean playerOnline = false;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+    public SpecialPlayerInventory(Player p, Boolean online) {
+        super(((CraftPlayer) p).getHandle());
+        this.owner = ((CraftPlayer) p);
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -46,32 +49,41 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
+    @Override
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
-            this.player.inventory.items = this.items;
-            this.player.inventory.armor = this.armor;
+            CraftPlayer p = (CraftPlayer) player;
+            p.getHandle().inventory.items = this.items;
+            p.getHandle().inventory.armor = this.armor;
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
+        return this.inventoryRemovalCheck();
     }
 
     @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+    public void onClose(CraftHumanEntity who) {
+        super.onClose(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return contents;
+        ItemStack[] C = new ItemStack[getSize()];
+        System.arraycopy(items, 0, C, 0, items.length);
+        System.arraycopy(items, 0, C, items.length, armor.length);
+        return C;
     }
 
     @Override
@@ -197,13 +209,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            player.drop(itemstack);
+            owner.getHandle().drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        player.defaultContainer.b();
+        owner.getHandle().defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -228,10 +240,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
     @Override
     public String getName() {
-        if (player.getName().length() > 16) {
-            return player.getName().substring(0, 16);
+        if (player.name.length() > 16) {
+            return player.name.substring(0, 16);
         }
-        return player.getName();
+        return player.name;
     }
 
+    @Override
+    public boolean a_(EntityHuman entityhuman) {
+        return true;
+    }
 }

src/main/java/com/lishid/openinv/internal/v1_4_6/AnySilentChest.java

@@ -0,0 +1,120 @@
+/*
+ * 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 org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.internal.IAnySilentChest;
+
+import net.minecraft.server.v1_4_6.Block;
+import net.minecraft.server.v1_4_6.EntityPlayer;
+import net.minecraft.server.v1_4_6.IInventory;
+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.World;
+
+// Volatile
+import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
+
+public class AnySilentChest implements IAnySilentChest {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        // If block on top
+        if (world.s(x, y + 1, z))
+            return true;
+
+        // If block next to chest is chest and has a block on top
+        if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id) && (world.s(x + 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id) && (world.s(x, y + 1, z - 1)))
+            return true;
+        if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id) && (world.s(x, y + 1, z + 1)))
+            return true;
+
+        return false;
+    }
+
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        Object chest = world.getTileEntity(x, y, z);
+        if (chest == null)
+            return true;
+
+        if (!anychest) {
+            if (world.s(x, y + 1, z))
+                return true;
+            if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id) && (world.s(x + 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id) && (world.s(x, y + 1, z - 1)))
+                return true;
+            if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id) && (world.s(x, y + 1, z + 1)))
+                return true;
+        }
+
+        if (world.getTypeId(x - 1, y, z) == Block.CHEST.id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        if (world.getTypeId(x + 1, y, z) == Block.CHEST.id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        if (world.getTypeId(x, y, z - 1) == Block.CHEST.id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        if (world.getTypeId(x, y, z + 1) == Block.CHEST.id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+
+        boolean returnValue = true;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+        }
+        else {
+            try {
+                int id = 0;
+                try {
+                    Field windowID = player.getClass().getDeclaredField("containerCounter");
+                    windowID.setAccessible(true);
+                    id = windowID.getInt(player);
+                    id = id % 100 + 1;
+                    windowID.setInt(player, id);
+                }
+                catch (NoSuchFieldException e) {}
+
+                player.playerConnection.sendPacket(new Packet100OpenWindow(id, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize()));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                player.activeContainer.windowId = id;
+                player.activeContainer.addSlotListener(player);
+                returnValue = false;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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 org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+import net.minecraft.server.v1_4_6.IInventory;
+
+// Volatile
+import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+    @Override
+    public boolean check(Inventory inventory, HumanEntity player) {
+        IInventory inv = ((CraftInventory) inventory).getInventory();
+
+        if (inv instanceof SpecialPlayerInventory) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
+                return false;
+            }
+        }
+
+        else if (inv instanceof SpecialEnderChest) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -16,12 +16,12 @@
 
 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;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 // Volatile
 import net.minecraft.server.v1_4_6.EntityPlayer;
 import net.minecraft.server.v1_4_6.MinecraftServer;
@@ -33,40 +33,24 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
-            return null;
-        }
-
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
-                new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
+            // Return the entity
+            return target;
         }
-        // Return the entity
-        return target;
+        return null;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
-
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
 }

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

@@ -20,27 +20,19 @@ 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);
-        // Send close signal
-        i2.f();
+        inv = i2;
+        // close signal
+        inv.f();
     }
 
     @Override
-    public void b(EntityHuman entityHuman) {
+    public void b(EntityHuman paramEntityHuman) {
         // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried);
-        }
     }
-
 }

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

@@ -20,14 +20,15 @@ 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.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;
@@ -38,17 +39,15 @@ import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public boolean playerOnline = false;
+    private final CraftPlayer owner;
     private final InventoryEnderChest enderChest;
-    private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
-    private CraftPlayer owner;
     private int maxStack = MAX_STACK;
+    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
-                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -61,27 +60,30 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
+    @Override
+    public void setPlayerOnline(Player p) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+        return inventoryRemovalCheck();
     }
 
     @Override
@@ -97,6 +99,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
@@ -119,10 +122,22 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public void update() {
-        super.update();
-        enderChest.update();
+    public boolean a(EntityHuman entityhuman) {
+        return true;
     }
 
+    @Override
+    public void startOpen() {
+
+    }
+
+    @Override
+    public void f() {
+
+    }
+
+    @Override
+    public void update() {
+        enderChest.update();
+    }
 }

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

@@ -16,26 +16,29 @@
 
 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.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 {
-
+    CraftPlayer owner;
+    public boolean playerOnline = false;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+    public SpecialPlayerInventory(Player p, Boolean online) {
+        super(((CraftPlayer) p).getHandle());
+        this.owner = ((CraftPlayer) p);
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -46,32 +49,41 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
+    @Override
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
-            this.player.inventory.items = this.items;
-            this.player.inventory.armor = this.armor;
+            CraftPlayer p = (CraftPlayer) player;
+            p.getHandle().inventory.items = this.items;
+            p.getHandle().inventory.armor = this.armor;
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
+        return this.inventoryRemovalCheck();
     }
 
     @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+    public void onClose(CraftHumanEntity who) {
+        super.onClose(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return contents;
+        ItemStack[] C = new ItemStack[getSize()];
+        System.arraycopy(items, 0, C, 0, items.length);
+        System.arraycopy(items, 0, C, items.length, armor.length);
+        return C;
     }
 
     @Override
@@ -86,14 +98,16 @@ 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);
         }
 
@@ -107,14 +121,16 @@ 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);
         }
 
@@ -125,7 +141,8 @@ 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;
@@ -134,8 +151,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -145,14 +163,16 @@ 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);
         }
 
@@ -162,8 +182,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -173,57 +194,60 @@ 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) {
-            player.drop(itemstack);
+            owner.getHandle().drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        player.defaultContainer.b();
+        owner.getHandle().defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
-        return i + 9;
+        else
+            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;
-        }
-        return i;
+        else
+            return i;
     }
 
     @Override
     public String getName() {
-        if (player.getName().length() > 16) {
-            return player.getName().substring(0, 16);
+        if (player.name.length() > 16) {
+            return player.name.substring(0, 16);
         }
-        return player.getName();
+        return player.name;
     }
 
+    @Override
+    public boolean a_(EntityHuman entityhuman) {
+        return true;
+    }
 }

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

@@ -0,0 +1,120 @@
+/*
+ * 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 org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.internal.IAnySilentChest;
+
+import net.minecraft.server.v1_4_R1.Block;
+import net.minecraft.server.v1_4_R1.EntityPlayer;
+import net.minecraft.server.v1_4_R1.IInventory;
+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.World;
+
+// Volatile
+import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
+
+public class AnySilentChest implements IAnySilentChest {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        // If block on top
+        if (world.s(x, y + 1, z))
+            return true;
+
+        // If block next to chest is chest and has a block on top
+        if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id) && (world.s(x + 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id) && (world.s(x, y + 1, z - 1)))
+            return true;
+        if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id) && (world.s(x, y + 1, z + 1)))
+            return true;
+
+        return false;
+    }
+
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        Object chest = world.getTileEntity(x, y, z);
+        if (chest == null)
+            return true;
+
+        if (!anychest) {
+            if (world.s(x, y + 1, z))
+                return true;
+            if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id) && (world.s(x + 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id) && (world.s(x, y + 1, z - 1)))
+                return true;
+            if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id) && (world.s(x, y + 1, z + 1)))
+                return true;
+        }
+
+        if (world.getTypeId(x - 1, y, z) == Block.CHEST.id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        if (world.getTypeId(x + 1, y, z) == Block.CHEST.id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        if (world.getTypeId(x, y, z - 1) == Block.CHEST.id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        if (world.getTypeId(x, y, z + 1) == Block.CHEST.id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+
+        boolean returnValue = true;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+        }
+        else {
+            try {
+                int id = 0;
+                try {
+                    Field windowID = player.getClass().getDeclaredField("containerCounter");
+                    windowID.setAccessible(true);
+                    id = windowID.getInt(player);
+                    id = id % 100 + 1;
+                    windowID.setInt(player, id);
+                }
+                catch (NoSuchFieldException e) {}
+
+                player.playerConnection.sendPacket(new Packet100OpenWindow(id, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize()));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                player.activeContainer.windowId = id;
+                player.activeContainer.addSlotListener(player);
+                returnValue = false;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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 org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+import net.minecraft.server.v1_4_R1.IInventory;
+
+// Volatile
+import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+    @Override
+    public boolean check(Inventory inventory, HumanEntity player) {
+        IInventory inv = ((CraftInventory) inventory).getInventory();
+
+        if (inv instanceof SpecialPlayerInventory) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
+                return false;
+            }
+        }
+
+        else if (inv instanceof SpecialEnderChest) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -16,12 +16,12 @@
 
 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;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import net.minecraft.server.v1_4_R1.EntityPlayer;
 import net.minecraft.server.v1_4_R1.MinecraftServer;
 import net.minecraft.server.v1_4_R1.PlayerInteractManager;
@@ -34,40 +34,24 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
-            return null;
-        }
-
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
-                new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
+            // Return the entity
+            return target;
         }
-        // Return the entity
-        return target;
+        return null;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
-
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
 }

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

@@ -20,27 +20,19 @@ 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);
-        // Send close signal
-        i2.f();
+        inv = i2;
+        // close signal
+        inv.f();
     }
 
     @Override
-    public void b(EntityHuman entityHuman) {
+    public void b(EntityHuman paramEntityHuman) {
         // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried);
-        }
     }
-
 }

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

@@ -20,14 +20,15 @@ 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;
 
 // 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;
@@ -38,17 +39,15 @@ import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public boolean playerOnline = false;
+    private final CraftPlayer owner;
     private final InventoryEnderChest enderChest;
-    private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
-    private CraftPlayer owner;
     private int maxStack = MAX_STACK;
+    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
-                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -61,27 +60,30 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
+    @Override
+    public void setPlayerOnline(Player p) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+        return inventoryRemovalCheck();
     }
 
     @Override
@@ -97,6 +99,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
@@ -119,10 +122,22 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public void update() {
-        super.update();
-        enderChest.update();
+    public boolean a(EntityHuman entityhuman) {
+        return true;
     }
 
+    @Override
+    public void startOpen() {
+
+    }
+
+    @Override
+    public void f() {
+
+    }
+
+    @Override
+    public void update() {
+        enderChest.update();
+    }
 }

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

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

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

@@ -0,0 +1,123 @@
+/*
+ * 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 org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.internal.IAnySilentChest;
+
+// Volatile
+import net.minecraft.server.v1_5_R2.EntityPlayer;
+import net.minecraft.server.v1_5_R2.IInventory;
+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.World;
+
+import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
+
+public class AnySilentChest implements IAnySilentChest {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        // If block on top
+        if (world.t(x, y + 1, z))
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        // If block next to chest is chest and has a block on top
+        if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x + 1, y, z) == id) && (world.t(x + 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x, y, z - 1) == id) && (world.t(x, y + 1, z - 1)))
+            return true;
+        if ((world.getTypeId(x, y, z + 1) == id) && (world.t(x, y + 1, z + 1)))
+            return true;
+
+        return false;
+    }
+
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        Object chest = world.getTileEntity(x, y, z);
+        if (chest == null)
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        if (!anychest) {
+            if (world.t(x, y + 1, z))
+                return true;
+            if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x + 1, y, z) == id) && (world.t(x + 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x, y, z - 1) == id) && (world.t(x, y + 1, z - 1)))
+                return true;
+            if ((world.getTypeId(x, y, z + 1) == id) && (world.t(x, y + 1, z + 1)))
+                return true;
+        }
+
+        if (world.getTypeId(x - 1, y, z) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        if (world.getTypeId(x + 1, y, z) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        if (world.getTypeId(x, y, z - 1) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        if (world.getTypeId(x, y, z + 1) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+
+        boolean returnValue = true;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+        }
+        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) chest).getName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = false;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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 org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+// 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 check(Inventory inventory, HumanEntity player) {
+        IInventory inv = ((CraftInventory) inventory).getInventory();
+
+        if (inv instanceof SpecialPlayerInventory) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
+                return false;
+            }
+        }
+
+        else if (inv instanceof SpecialEnderChest) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -16,12 +16,12 @@
 
 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;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 // Volatile
 import net.minecraft.server.v1_5_R2.EntityPlayer;
 import net.minecraft.server.v1_5_R2.MinecraftServer;
@@ -33,40 +33,24 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
-            return null;
-        }
-
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
-                new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
+            // Return the entity
+            return target;
         }
-        // Return the entity
-        return target;
+        return null;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
-
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
 }

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

@@ -20,27 +20,19 @@ 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);
-        // Send close signal
-        i2.g();
+        inv = i2;
+        // close signal
+        inv.g();
     }
 
     @Override
-    public void b(EntityHuman entityHuman) {
+    public void b(EntityHuman paramEntityHuman) {
         // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried);
-        }
     }
-
 }

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

@@ -20,14 +20,15 @@ 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.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;
@@ -38,18 +39,15 @@ import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public boolean playerOnline = false;
+    private final CraftPlayer owner;
     private final InventoryEnderChest enderChest;
-    private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
-    private CraftPlayer owner;
     private int maxStack = MAX_STACK;
+    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
-                ((CraftPlayer) p).getHandle().getEnderChest().c(),
-                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -62,27 +60,30 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
+    @Override
+    public void setPlayerOnline(Player p) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+        return inventoryRemovalCheck();
     }
 
     @Override
@@ -98,6 +99,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
@@ -121,9 +123,21 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void update() {
-        super.update();
-        enderChest.update();
+    public boolean a(EntityHuman entityhuman) {
+        return true;
     }
 
+    @Override
+    public void startOpen() {
+
+    }
+
+    public void f() {
+
+    }
+
+    @Override
+    public void update() {
+        enderChest.update();
+    }
 }

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

@@ -16,26 +16,29 @@
 
 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.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 {
-
+    CraftPlayer owner;
+    public boolean playerOnline = false;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+    public SpecialPlayerInventory(Player p, Boolean online) {
+        super(((CraftPlayer) p).getHandle());
+        this.owner = ((CraftPlayer) p);
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -46,32 +49,41 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
+    @Override
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
-            this.player.inventory.items = this.items;
-            this.player.inventory.armor = this.armor;
+            CraftPlayer p = (CraftPlayer) player;
+            p.getHandle().inventory.items = this.items;
+            p.getHandle().inventory.armor = this.armor;
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
+        return this.inventoryRemovalCheck();
     }
 
     @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+    public void onClose(CraftHumanEntity who) {
+        super.onClose(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return contents;
+        ItemStack[] C = new ItemStack[getSize()];
+        System.arraycopy(items, 0, C, 0, items.length);
+        System.arraycopy(items, 0, C, items.length, armor.length);
+        return C;
     }
 
     @Override
@@ -86,14 +98,16 @@ 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);
         }
 
@@ -107,14 +121,16 @@ 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);
         }
 
@@ -125,7 +141,8 @@ 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;
@@ -134,8 +151,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -145,14 +163,16 @@ 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);
         }
 
@@ -162,8 +182,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -173,57 +194,60 @@ 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) {
-            player.drop(itemstack);
+            owner.getHandle().drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        player.defaultContainer.b();
+        owner.getHandle().defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
-        return i + 9;
+        else
+            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;
-        }
-        return i;
+        else
+            return i;
     }
 
     @Override
     public String getName() {
-        if (player.getName().length() > 16) {
-            return player.getName().substring(0, 16);
+        if (player.name.length() > 16) {
+            return player.name.substring(0, 16);
         }
-        return player.getName();
+        return player.name;
     }
 
+    @Override
+    public boolean a(EntityHuman entityhuman) {
+        return true;
+    }
 }

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

@@ -0,0 +1,123 @@
+/*
+ * 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 org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.internal.IAnySilentChest;
+
+//Volatile
+import net.minecraft.server.v1_5_R3.EntityPlayer;
+import net.minecraft.server.v1_5_R3.IInventory;
+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.World;
+
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
+
+public class AnySilentChest implements IAnySilentChest {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        // If block on top
+        if (world.t(x, y + 1, z))
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        // If block next to chest is chest and has a block on top
+        if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x + 1, y, z) == id) && (world.t(x + 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x, y, z - 1) == id) && (world.t(x, y + 1, z - 1)))
+            return true;
+        if ((world.getTypeId(x, y, z + 1) == id) && (world.t(x, y + 1, z + 1)))
+            return true;
+
+        return false;
+    }
+
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        Object chest = world.getTileEntity(x, y, z);
+        if (chest == null)
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        if (!anychest) {
+            if (world.t(x, y + 1, z))
+                return true;
+            if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x + 1, y, z) == id) && (world.t(x + 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x, y, z - 1) == id) && (world.t(x, y + 1, z - 1)))
+                return true;
+            if ((world.getTypeId(x, y, z + 1) == id) && (world.t(x, y + 1, z + 1)))
+                return true;
+        }
+
+        if (world.getTypeId(x - 1, y, z) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        if (world.getTypeId(x + 1, y, z) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        if (world.getTypeId(x, y, z - 1) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        if (world.getTypeId(x, y, z + 1) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+
+        boolean returnValue = true;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+        }
+        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) chest).getName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = false;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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 org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+// 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 check(Inventory inventory, HumanEntity player) {
+        IInventory inv = ((CraftInventory) inventory).getInventory();
+
+        if (inv instanceof SpecialPlayerInventory) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
+                return false;
+            }
+        }
+
+        else if (inv instanceof SpecialEnderChest) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -16,12 +16,12 @@
 
 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;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 // Volatile
 import net.minecraft.server.v1_5_R3.EntityPlayer;
 import net.minecraft.server.v1_5_R3.MinecraftServer;
@@ -33,40 +33,24 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
-            return null;
-        }
-
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
-                new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
+            // Return the entity
+            return target;
         }
-        // Return the entity
-        return target;
+        return null;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
-
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
 }

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

@@ -20,27 +20,19 @@ 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);
-        // Send close signal
-        i2.g();
+        inv = i2;
+        // close signal
+        inv.g();
     }
 
     @Override
-    public void b(EntityHuman entityHuman) {
+    public void b(EntityHuman paramEntityHuman) {
         // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried);
-        }
     }
-
 }

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

@@ -20,14 +20,15 @@ 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.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;
@@ -38,18 +39,15 @@ import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public boolean playerOnline = false;
+    private final CraftPlayer owner;
     private final InventoryEnderChest enderChest;
-    private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
-    private CraftPlayer owner;
     private int maxStack = MAX_STACK;
+    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
-                ((CraftPlayer) p).getHandle().getEnderChest().c(),
-                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -62,27 +60,30 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
+    @Override
+    public void setPlayerOnline(Player p) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+        return inventoryRemovalCheck();
     }
 
     @Override
@@ -98,6 +99,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
@@ -121,9 +123,21 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void update() {
-        super.update();
-        enderChest.update();
+    public boolean a(EntityHuman entityhuman) {
+        return true;
     }
 
+    @Override
+    public void startOpen() {
+
+    }
+
+    public void f() {
+
+    }
+
+    @Override
+    public void update() {
+        enderChest.update();
+    }
 }

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

@@ -16,26 +16,29 @@
 
 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.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 {
-
+    CraftPlayer owner;
+    public boolean playerOnline = false;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+    public SpecialPlayerInventory(Player p, Boolean online) {
+        super(((CraftPlayer) p).getHandle());
+        this.owner = ((CraftPlayer) p);
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -46,32 +49,41 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
+    @Override
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
-            this.player.inventory.items = this.items;
-            this.player.inventory.armor = this.armor;
+            CraftPlayer p = (CraftPlayer) player;
+            p.getHandle().inventory.items = this.items;
+            p.getHandle().inventory.armor = this.armor;
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
+        return this.inventoryRemovalCheck();
     }
 
     @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+    public void onClose(CraftHumanEntity who) {
+        super.onClose(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return contents;
+        ItemStack[] C = new ItemStack[getSize()];
+        System.arraycopy(items, 0, C, 0, items.length);
+        System.arraycopy(items, 0, C, items.length, armor.length);
+        return C;
     }
 
     @Override
@@ -86,14 +98,16 @@ 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);
         }
 
@@ -107,14 +121,16 @@ 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);
         }
 
@@ -125,7 +141,8 @@ 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;
@@ -134,8 +151,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -145,14 +163,16 @@ 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);
         }
 
@@ -162,8 +182,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -173,57 +194,60 @@ 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) {
-            player.drop(itemstack);
+            owner.getHandle().drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        player.defaultContainer.b();
+        owner.getHandle().defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
-        return i + 9;
+        else
+            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;
-        }
-        return i;
+        else
+            return i;
     }
 
     @Override
     public String getName() {
-        if (player.getName().length() > 16) {
-            return player.getName().substring(0, 16);
+        if (player.name.length() > 16) {
+            return player.name.substring(0, 16);
         }
-        return player.getName();
+        return player.name;
     }
 
+    @Override
+    public boolean a(EntityHuman entityhuman) {
+        return true;
+    }
 }

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

@@ -0,0 +1,123 @@
+/*
+ * 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 org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.internal.IAnySilentChest;
+
+// Volatile
+import net.minecraft.server.v1_6_R1.EntityPlayer;
+import net.minecraft.server.v1_6_R1.IInventory;
+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.World;
+
+import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
+
+public class AnySilentChest implements IAnySilentChest {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        // If block on top
+        if (world.t(x, y + 1, z))
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        // If block next to chest is chest and has a block on top
+        if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x + 1, y, z) == id) && (world.t(x + 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x, y, z - 1) == id) && (world.t(x, y + 1, z - 1)))
+            return true;
+        if ((world.getTypeId(x, y, z + 1) == id) && (world.t(x, y + 1, z + 1)))
+            return true;
+
+        return false;
+    }
+
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        Object chest = world.getTileEntity(x, y, z);
+        if (chest == null)
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        if (!anychest) {
+            if (world.t(x, y + 1, z))
+                return true;
+            if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x + 1, y, z) == id) && (world.t(x + 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x, y, z - 1) == id) && (world.t(x, y + 1, z - 1)))
+                return true;
+            if ((world.getTypeId(x, y, z + 1) == id) && (world.t(x, y + 1, z + 1)))
+                return true;
+        }
+
+        if (world.getTypeId(x - 1, y, z) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        if (world.getTypeId(x + 1, y, z) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        if (world.getTypeId(x, y, z - 1) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        if (world.getTypeId(x, y, z + 1) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+
+        boolean returnValue = true;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+        }
+        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) chest).getName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = false;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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 org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+// 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 check(Inventory inventory, HumanEntity player) {
+        IInventory inv = ((CraftInventory) inventory).getInventory();
+
+        if (inv instanceof SpecialPlayerInventory) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
+                return false;
+            }
+        }
+
+        else if (inv instanceof SpecialEnderChest) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -16,12 +16,12 @@
 
 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;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 // Volatile
 import net.minecraft.server.v1_6_R1.EntityPlayer;
 import net.minecraft.server.v1_6_R1.MinecraftServer;
@@ -33,40 +33,24 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
-            return null;
-        }
-
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
-                new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
+            // Return the entity
+            return target;
         }
-        // Return the entity
-        return target;
+        return null;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
-
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
 }

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

@@ -20,27 +20,19 @@ 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);
-        // Send close signal
-        i2.g();
+        inv = i2;
+        // close signal
+        inv.g();
     }
 
     @Override
-    public void b(EntityHuman entityHuman) {
+    public void b(EntityHuman paramEntityHuman) {
         // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried);
-        }
     }
-
 }

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

@@ -20,14 +20,15 @@ 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.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;
@@ -38,18 +39,15 @@ import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public boolean playerOnline = false;
+    private final CraftPlayer owner;
     private final InventoryEnderChest enderChest;
-    private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
-    private CraftPlayer owner;
     private int maxStack = MAX_STACK;
+    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
-                ((CraftPlayer) p).getHandle().getEnderChest().c(),
-                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -62,27 +60,30 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
+    @Override
+    public void setPlayerOnline(Player p) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+        return inventoryRemovalCheck();
     }
 
     @Override
@@ -98,6 +99,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
@@ -121,9 +123,21 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void update() {
-        super.update();
-        enderChest.update();
+    public boolean a(EntityHuman entityhuman) {
+        return true;
     }
 
+    @Override
+    public void startOpen() {
+
+    }
+
+    public void f() {
+
+    }
+
+    @Override
+    public void update() {
+        enderChest.update();
+    }
 }

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

@@ -16,26 +16,30 @@
 
 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.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 {
 
+public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
+    CraftPlayer owner;
+    public boolean playerOnline = false;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+    public SpecialPlayerInventory(Player p, Boolean online) {
+        super(((CraftPlayer) p).getHandle());
+        this.owner = ((CraftPlayer) p);
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -46,32 +50,41 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
+    @Override
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
-            this.player.inventory.items = this.items;
-            this.player.inventory.armor = this.armor;
+            CraftPlayer p = (CraftPlayer) player;
+            p.getHandle().inventory.items = this.items;
+            p.getHandle().inventory.armor = this.armor;
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
+        return this.inventoryRemovalCheck();
     }
 
     @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+    public void onClose(CraftHumanEntity who) {
+        super.onClose(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return contents;
+        ItemStack[] C = new ItemStack[getSize()];
+        System.arraycopy(items, 0, C, 0, items.length);
+        System.arraycopy(items, 0, C, items.length, armor.length);
+        return C;
     }
 
     @Override
@@ -86,14 +99,16 @@ 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);
         }
 
@@ -107,14 +122,16 @@ 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);
         }
 
@@ -125,7 +142,8 @@ 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;
@@ -134,8 +152,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -145,14 +164,16 @@ 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);
         }
 
@@ -162,8 +183,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -173,49 +195,48 @@ 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) {
-            player.drop(itemstack);
+            owner.getHandle().drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        player.defaultContainer.b();
+        owner.getHandle().defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
-        return i + 9;
+        else
+            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;
-        }
-        return i;
+        else
+            return i;
     }
 
     @Override
@@ -226,4 +247,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
+    @Override
+    public boolean a(EntityHuman entityhuman) {
+        return true;
+    }
 }

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

@@ -0,0 +1,123 @@
+/*
+ * 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 org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.internal.IAnySilentChest;
+
+// Volatile
+import net.minecraft.server.v1_6_R2.EntityPlayer;
+import net.minecraft.server.v1_6_R2.IInventory;
+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.World;
+
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
+
+public class AnySilentChest implements IAnySilentChest {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        // If block on top
+        if (world.t(x, y + 1, z))
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        // If block next to chest is chest and has a block on top
+        if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x + 1, y, z) == id) && (world.t(x + 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x, y, z - 1) == id) && (world.t(x, y + 1, z - 1)))
+            return true;
+        if ((world.getTypeId(x, y, z + 1) == id) && (world.t(x, y + 1, z + 1)))
+            return true;
+
+        return false;
+    }
+
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        Object chest = world.getTileEntity(x, y, z);
+        if (chest == null)
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        if (!anychest) {
+            if (world.t(x, y + 1, z))
+                return true;
+            if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x + 1, y, z) == id) && (world.t(x + 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x, y, z - 1) == id) && (world.t(x, y + 1, z - 1)))
+                return true;
+            if ((world.getTypeId(x, y, z + 1) == id) && (world.t(x, y + 1, z + 1)))
+                return true;
+        }
+
+        if (world.getTypeId(x - 1, y, z) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        if (world.getTypeId(x + 1, y, z) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        if (world.getTypeId(x, y, z - 1) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        if (world.getTypeId(x, y, z + 1) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+
+        boolean returnValue = true;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+        }
+        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) chest).getName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = false;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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 org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+// 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 check(Inventory inventory, HumanEntity player) {
+        IInventory inv = ((CraftInventory) inventory).getInventory();
+
+        if (inv instanceof SpecialPlayerInventory) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
+                return false;
+            }
+        }
+
+        else if (inv instanceof SpecialEnderChest) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -16,12 +16,12 @@
 
 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;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 // Volatile
 import net.minecraft.server.v1_6_R2.EntityPlayer;
 import net.minecraft.server.v1_6_R2.MinecraftServer;
@@ -33,40 +33,24 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
-            return null;
-        }
-
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
-                new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
+            // Return the entity
+            return target;
         }
-        // Return the entity
-        return target;
+        return null;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
-
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
 }

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

@@ -20,27 +20,19 @@ 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);
-        // Send close signal
-        i2.g();
+        inv = i2;
+        // close signal
+        inv.g();
     }
 
     @Override
-    public void b(EntityHuman entityHuman) {
+    public void b(EntityHuman paramEntityHuman) {
         // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried);
-        }
     }
-
 }

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

@@ -20,14 +20,15 @@ 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.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;
@@ -38,18 +39,15 @@ import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public boolean playerOnline = false;
+    private final CraftPlayer owner;
     private final InventoryEnderChest enderChest;
-    private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
-    private CraftPlayer owner;
     private int maxStack = MAX_STACK;
+    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
-                ((CraftPlayer) p).getHandle().getEnderChest().c(),
-                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -62,27 +60,30 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
+    @Override
+    public void setPlayerOnline(Player p) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+        return inventoryRemovalCheck();
     }
 
     @Override
@@ -98,6 +99,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
@@ -121,9 +123,21 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void update() {
-        super.update();
-        enderChest.update();
+    public boolean a(EntityHuman entityhuman) {
+        return true;
     }
 
+    @Override
+    public void startOpen() {
+
+    }
+
+    public void f() {
+
+    }
+
+    @Override
+    public void update() {
+        enderChest.update();
+    }
 }

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

@@ -16,26 +16,29 @@
 
 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.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 {
-
+    CraftPlayer owner;
+    public boolean playerOnline = false;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+    public SpecialPlayerInventory(Player p, Boolean online) {
+        super(((CraftPlayer) p).getHandle());
+        this.owner = ((CraftPlayer) p);
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -46,32 +49,41 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
+    @Override
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
-            this.player.inventory.items = this.items;
-            this.player.inventory.armor = this.armor;
+            CraftPlayer p = (CraftPlayer) player;
+            p.getHandle().inventory.items = this.items;
+            p.getHandle().inventory.armor = this.armor;
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
+        return this.inventoryRemovalCheck();
     }
 
     @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+    public void onClose(CraftHumanEntity who) {
+        super.onClose(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return contents;
+        ItemStack[] C = new ItemStack[getSize()];
+        System.arraycopy(items, 0, C, 0, items.length);
+        System.arraycopy(items, 0, C, items.length, armor.length);
+        return C;
     }
 
     @Override
@@ -86,14 +98,16 @@ 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);
         }
 
@@ -107,14 +121,16 @@ 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);
         }
 
@@ -125,7 +141,8 @@ 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;
@@ -134,8 +151,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -145,14 +163,16 @@ 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);
         }
 
@@ -162,8 +182,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -173,49 +194,48 @@ 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) {
-            player.drop(itemstack);
+            owner.getHandle().drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        player.defaultContainer.b();
+        owner.getHandle().defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
-        return i + 9;
+        else
+            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;
-        }
-        return i;
+        else
+            return i;
     }
 
     @Override
@@ -226,4 +246,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
+    @Override
+    public boolean a(EntityHuman entityhuman) {
+        return true;
+    }
 }

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

@@ -0,0 +1,123 @@
+/*
+ * 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 org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.internal.IAnySilentChest;
+
+// Volatile
+import net.minecraft.server.v1_6_R3.EntityPlayer;
+import net.minecraft.server.v1_6_R3.IInventory;
+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.World;
+
+import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
+
+public class AnySilentChest implements IAnySilentChest {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        // If block on top
+        if (world.t(x, y + 1, z))
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        // If block next to chest is chest and has a block on top
+        if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x + 1, y, z) == id) && (world.t(x + 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x, y, z - 1) == id) && (world.t(x, y + 1, z - 1)))
+            return true;
+        if ((world.getTypeId(x, y, z + 1) == id) && (world.t(x, y + 1, z + 1)))
+            return true;
+
+        return false;
+    }
+
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        Object chest = world.getTileEntity(x, y, z);
+        if (chest == null)
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        if (!anychest) {
+            if (world.t(x, y + 1, z))
+                return true;
+            if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x + 1, y, z) == id) && (world.t(x + 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x, y, z - 1) == id) && (world.t(x, y + 1, z - 1)))
+                return true;
+            if ((world.getTypeId(x, y, z + 1) == id) && (world.t(x, y + 1, z + 1)))
+                return true;
+        }
+
+        if (world.getTypeId(x - 1, y, z) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        if (world.getTypeId(x + 1, y, z) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        if (world.getTypeId(x, y, z - 1) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        if (world.getTypeId(x, y, z + 1) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+
+        boolean returnValue = true;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+        }
+        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) chest).getName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = false;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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 org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+// 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 check(Inventory inventory, HumanEntity player) {
+        IInventory inv = ((CraftInventory) inventory).getInventory();
+
+        if (inv instanceof SpecialPlayerInventory) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
+                return false;
+            }
+        }
+
+        else if (inv instanceof SpecialEnderChest) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -16,12 +16,12 @@
 
 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;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 // Volatile
 import net.minecraft.server.v1_6_R3.EntityPlayer;
 import net.minecraft.server.v1_6_R3.MinecraftServer;
@@ -33,40 +33,24 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
-            return null;
-        }
-
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
-                new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
+            // Return the entity
+            return target;
         }
-        // Return the entity
-        return target;
+        return null;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
-
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
 }

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

@@ -20,27 +20,19 @@ 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);
-        // Send close signal
-        i2.g();
+        inv = i2;
+        // close signal
+        inv.g();
     }
 
     @Override
-    public void b(EntityHuman entityHuman) {
+    public void b(EntityHuman paramEntityHuman) {
         // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried);
-        }
     }
-
 }

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

@@ -20,14 +20,15 @@ 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.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;
@@ -38,18 +39,15 @@ import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public boolean playerOnline = false;
+    private final CraftPlayer owner;
     private final InventoryEnderChest enderChest;
-    private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
-    private CraftPlayer owner;
     private int maxStack = MAX_STACK;
+    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
-                ((CraftPlayer) p).getHandle().getEnderChest().c(),
-                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -62,27 +60,30 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
+    @Override
+    public void setPlayerOnline(Player p) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+        return inventoryRemovalCheck();
     }
 
     @Override
@@ -98,6 +99,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
@@ -121,9 +123,21 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void update() {
-        super.update();
-        enderChest.update();
+    public boolean a(EntityHuman entityhuman) {
+        return true;
     }
 
+    @Override
+    public void startOpen() {
+
+    }
+
+    public void f() {
+
+    }
+
+    @Override
+    public void update() {
+        enderChest.update();
+    }
 }

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

@@ -16,26 +16,29 @@
 
 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.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 {
-
+    CraftPlayer owner;
+    public boolean playerOnline = false;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+    public SpecialPlayerInventory(Player p, Boolean online) {
+        super(((CraftPlayer) p).getHandle());
+        this.owner = ((CraftPlayer) p);
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -46,32 +49,41 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
+    @Override
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
-            this.player.inventory.items = this.items;
-            this.player.inventory.armor = this.armor;
+            CraftPlayer p = (CraftPlayer) player;
+            p.getHandle().inventory.items = this.items;
+            p.getHandle().inventory.armor = this.armor;
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
+        return this.inventoryRemovalCheck();
     }
 
     @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+    public void onClose(CraftHumanEntity who) {
+        super.onClose(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return contents;
+        ItemStack[] C = new ItemStack[getSize()];
+        System.arraycopy(items, 0, C, 0, items.length);
+        System.arraycopy(items, 0, C, items.length, armor.length);
+        return C;
     }
 
     @Override
@@ -86,14 +98,16 @@ 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);
         }
 
@@ -107,14 +121,16 @@ 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);
         }
 
@@ -125,7 +141,8 @@ 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;
@@ -134,8 +151,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -145,14 +163,16 @@ 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);
         }
 
@@ -162,8 +182,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -173,26 +194,28 @@ 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) {
-            player.drop(itemstack);
+            owner.getHandle().drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        player.defaultContainer.b();
+        owner.getHandle().defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -223,4 +246,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
+    @Override
+    public boolean a(EntityHuman entityhuman) {
+        return true;
+    }
 }

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

@@ -0,0 +1,124 @@
+/*
+ * 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 org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.internal.IAnySilentChest;
+
+//Volatile
+import net.minecraft.server.v1_7_R1.Block;
+import net.minecraft.server.v1_7_R1.EntityPlayer;
+import net.minecraft.server.v1_7_R1.IInventory;
+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.World;
+
+import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
+
+public class AnySilentChest implements IAnySilentChest {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        // If block on top
+        if (world.getType(x, y + 1, z).c())
+            return true;
+
+        int id = Block.b(world.getType(x, y, z));
+
+        // If block next to chest is chest and has a block on top
+        if ((Block.b(world.getType(x - 1, y, z)) == id) && (world.getType(x - 1, y + 1, z).c()))
+            return true;
+        if ((Block.b(world.getType(x + 1, y, z)) == id) && (world.getType(x + 1, y + 1, z).c()))
+            return true;
+        if ((Block.b(world.getType(x, y, z - 1)) == id) && (world.getType(x, y + 1, z - 1).c()))
+            return true;
+        if ((Block.b(world.getType(x, y, z + 1)) == id) && (world.getType(x, y + 1, z + 1).c()))
+            return true;
+
+        return false;
+    }
+
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        Object chest = world.getTileEntity(x, y, z);
+        if (chest == null)
+            return true;
+
+        int id = Block.b(world.getType(x, y, z));
+
+        if (!anychest) {
+            if (world.getType(x, y + 1, z).c())
+                return true;
+            if ((Block.b(world.getType(x - 1, y, z)) == id) && (world.getType(x - 1, y + 1, z).c()))
+                return true;
+            if ((Block.b(world.getType(x + 1, y, z)) == id) && (world.getType(x + 1, y + 1, z).c()))
+                return true;
+            if ((Block.b(world.getType(x, y, z - 1)) == id) && (world.getType(x, y + 1, z - 1).c()))
+                return true;
+            if ((Block.b(world.getType(x, y, z + 1)) == id) && (world.getType(x, y + 1, z + 1).c()))
+                return true;
+        }
+
+        if (Block.b(world.getType(x - 1, y, z)) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        if (Block.b(world.getType(x + 1, y, z)) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        if (Block.b(world.getType(x, y, z - 1)) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        if (Block.b(world.getType(x, y, z + 1)) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+
+        boolean returnValue = true;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+        }
+        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) chest).getInventoryName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = false;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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 org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+// 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 check(Inventory inventory, HumanEntity player) {
+        IInventory inv = ((CraftInventory) inventory).getInventory();
+
+        if (inv instanceof SpecialPlayerInventory) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
+                return false;
+            }
+        }
+
+        else if (inv instanceof SpecialEnderChest) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -16,12 +16,12 @@
 
 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;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 // Volatile
 import net.minecraft.server.v1_7_R1.EntityPlayer;
 import net.minecraft.server.v1_7_R1.MinecraftServer;
@@ -34,40 +34,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        // Ensure the player has data
-        if (offline == null || !offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        // Create a profile and entity to load the player data
-        GameProfile profile = new GameProfile(null, offline.getName());
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
-                new PlayerInteractManager(server.getWorldServer(0)));
+
+        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)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
+            // Return the entity
+            return target;
         }
-        // Return the entity
-        return target;
+        return null;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
-
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
 }

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

@@ -20,27 +20,19 @@ 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);
-        // Send close signal
-        i2.l_();
+        inv = i2;
+        // close signal
+        inv.l_();
     }
 
     @Override
-    public void b(EntityHuman entityHuman) {
+    public void b(EntityHuman paramEntityHuman) {
         // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried, false);
-        }
     }
-
 }

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

@@ -20,14 +20,15 @@ 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.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;
@@ -38,18 +39,15 @@ import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public boolean playerOnline = false;
+    private final CraftPlayer owner;
     private final InventoryEnderChest enderChest;
-    private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
-    private CraftPlayer owner;
     private int maxStack = MAX_STACK;
+    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(),
-                ((CraftPlayer) p).getHandle().getEnderChest().k_(),
-                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -62,27 +60,30 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
+    @Override
+    public void setPlayerOnline(Player p) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+        return inventoryRemovalCheck();
     }
 
     @Override
@@ -98,6 +99,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
@@ -121,9 +123,21 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void update() {
-        super.update();
-        enderChest.update();
+    public boolean a(EntityHuman entityhuman) {
+        return true;
     }
 
+    @Override
+    public void startOpen() {
+
+    }
+
+    public void f() {
+
+    }
+
+    @Override
+    public void update() {
+        enderChest.update();
+    }
 }

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

@@ -16,26 +16,29 @@
 
 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.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 {
-
+    CraftPlayer owner;
+    public boolean playerOnline = false;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+    public SpecialPlayerInventory(Player p, Boolean online) {
+        super(((CraftPlayer) p).getHandle());
+        this.owner = ((CraftPlayer) p);
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -46,32 +49,41 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
+    @Override
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
-            this.player.inventory.items = this.items;
-            this.player.inventory.armor = this.armor;
+            CraftPlayer p = (CraftPlayer) player;
+            p.getHandle().inventory.items = this.items;
+            p.getHandle().inventory.armor = this.armor;
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
+        return this.inventoryRemovalCheck();
     }
 
     @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+    public void onClose(CraftHumanEntity who) {
+        super.onClose(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return contents;
+        ItemStack[] C = new ItemStack[getSize()];
+        System.arraycopy(items, 0, C, 0, items.length);
+        System.arraycopy(items, 0, C, items.length, armor.length);
+        return C;
     }
 
     @Override
@@ -86,14 +98,16 @@ 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);
         }
 
@@ -107,14 +121,16 @@ 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);
         }
 
@@ -125,7 +141,8 @@ 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;
@@ -134,8 +151,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -145,14 +163,16 @@ 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);
         }
 
@@ -162,8 +182,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -173,49 +194,48 @@ 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) {
-            player.drop(itemstack, true);
+            owner.getHandle().drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        player.defaultContainer.b();
+        owner.getHandle().defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
-        return i + 9;
+        else
+            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;
-        }
-        return i;
+        else
+            return i;
     }
 
     @Override
@@ -226,4 +246,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
+    @Override
+    public boolean a(EntityHuman entityhuman) {
+        return true;
+    }
 }

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

@@ -0,0 +1,124 @@
+/*
+ * 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 org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.internal.IAnySilentChest;
+
+import net.minecraft.server.v1_7_R2.Block;
+//Volatile
+import net.minecraft.server.v1_7_R2.EntityPlayer;
+import net.minecraft.server.v1_7_R2.IInventory;
+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.World;
+
+import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
+
+public class AnySilentChest implements IAnySilentChest {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        // If block on top
+        if (world.getType(x, y + 1, z).c())
+            return true;
+
+        int id = Block.b(world.getType(x, y, z));
+
+        // If block next to chest is chest and has a block on top
+        if ((Block.b(world.getType(x - 1, y, z)) == id) && (world.getType(x - 1, y + 1, z).c()))
+            return true;
+        if ((Block.b(world.getType(x + 1, y, z)) == id) && (world.getType(x + 1, y + 1, z).c()))
+            return true;
+        if ((Block.b(world.getType(x, y, z - 1)) == id) && (world.getType(x, y + 1, z - 1).c()))
+            return true;
+        if ((Block.b(world.getType(x, y, z + 1)) == id) && (world.getType(x, y + 1, z + 1).c()))
+            return true;
+
+        return false;
+    }
+
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        Object chest = world.getTileEntity(x, y, z);
+        if (chest == null)
+            return true;
+
+        int id = Block.b(world.getType(x, y, z));
+
+        if (!anychest) {
+            if (world.getType(x, y + 1, z).c())
+                return true;
+            if ((Block.b(world.getType(x - 1, y, z)) == id) && (world.getType(x - 1, y + 1, z).c()))
+                return true;
+            if ((Block.b(world.getType(x + 1, y, z)) == id) && (world.getType(x + 1, y + 1, z).c()))
+                return true;
+            if ((Block.b(world.getType(x, y, z - 1)) == id) && (world.getType(x, y + 1, z - 1).c()))
+                return true;
+            if ((Block.b(world.getType(x, y, z + 1)) == id) && (world.getType(x, y + 1, z + 1).c()))
+                return true;
+        }
+
+        if (Block.b(world.getType(x - 1, y, z)) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        if (Block.b(world.getType(x + 1, y, z)) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        if (Block.b(world.getType(x, y, z - 1)) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        if (Block.b(world.getType(x, y, z + 1)) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+
+        boolean returnValue = true;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+        }
+        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) chest).getInventoryName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = false;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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 org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+// 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 check(Inventory inventory, HumanEntity player) {
+        IInventory inv = ((CraftInventory) inventory).getInventory();
+
+        if (inv instanceof SpecialPlayerInventory) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
+                return false;
+            }
+        }
+
+        else if (inv instanceof SpecialEnderChest) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -16,12 +16,12 @@
 
 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;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 //Volatile
 import net.minecraft.server.v1_7_R2.EntityPlayer;
 import net.minecraft.server.v1_7_R2.MinecraftServer;
@@ -30,45 +30,29 @@ import net.minecraft.util.com.mojang.authlib.GameProfile;
 
 import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
 
-@SuppressWarnings("deprecation") // Deprecated methods are used properly and will not change.
 public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        // 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());
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
-                new PlayerInteractManager(server.getWorldServer(0)));
+
+        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)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
+            // Return the entity
+            return target;
         }
-        // Return the entity
-        return target;
+        return null;
     }
 
     @Override
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
-
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
 }

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

@@ -20,27 +20,19 @@ 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);
-        // Send close signal
-        i2.l_();
+        inv = i2;
+        // close signal
+        inv.l_();
     }
 
     @Override
-    public void b(EntityHuman entityHuman) {
+    public void b(EntityHuman paramEntityHuman) {
         // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried, false);
-        }
     }
-
 }

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

@@ -20,14 +20,15 @@ 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.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;
@@ -38,18 +39,15 @@ import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R2.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public boolean playerOnline = false;
+    private final CraftPlayer owner;
     private final InventoryEnderChest enderChest;
-    private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
-    private CraftPlayer owner;
     private int maxStack = MAX_STACK;
+    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(),
-                ((CraftPlayer) p).getHandle().getEnderChest().k_(),
-                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -62,27 +60,30 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void setPlayerOnline(Player player) {
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
+    @Override
+    public void setPlayerOnline(Player p) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
-    }
-
-    @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+        return inventoryRemovalCheck();
     }
 
     @Override
@@ -98,6 +99,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
@@ -121,9 +123,21 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public void update() {
-        super.update();
-        enderChest.update();
+    public boolean a(EntityHuman entityhuman) {
+        return true;
     }
 
+    @Override
+    public void startOpen() {
+
+    }
+
+    public void f() {
+
+    }
+
+    @Override
+    public void update() {
+        enderChest.update();
+    }
 }

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

@@ -16,26 +16,29 @@
 
 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.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 {
-
+    CraftPlayer owner;
+    public boolean playerOnline = false;
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(((CraftPlayer) bukkitPlayer).getHandle());
+    public SpecialPlayerInventory(Player p, Boolean online) {
+        super(((CraftPlayer) p).getHandle());
+        this.owner = ((CraftPlayer) p);
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -46,32 +49,41 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
+    @Override
+    public boolean inventoryRemovalCheck() {
+        owner.saveData();
+        return transaction.isEmpty() && !playerOnline;
+    }
+
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = ((CraftPlayer) player).getHandle();
-            this.player.inventory.items = this.items;
-            this.player.inventory.armor = this.armor;
+            CraftPlayer p = (CraftPlayer) player;
+            p.getHandle().inventory.items = this.items;
+            p.getHandle().inventory.armor = this.armor;
+            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void setPlayerOffline() {
+    public boolean setPlayerOffline() {
         playerOnline = false;
+        return this.inventoryRemovalCheck();
     }
 
     @Override
-    public boolean isInUse() {
-        return !this.getViewers().isEmpty();
+    public void onClose(CraftHumanEntity who) {
+        super.onClose(who);
+        this.inventoryRemovalCheck();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return contents;
+        ItemStack[] C = new ItemStack[getSize()];
+        System.arraycopy(items, 0, C, 0, items.length);
+        System.arraycopy(items, 0, C, items.length, armor.length);
+        return C;
     }
 
     @Override
@@ -86,14 +98,16 @@ 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);
         }
 
@@ -107,14 +121,16 @@ 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);
         }
 
@@ -125,7 +141,8 @@ 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;
@@ -134,8 +151,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -145,14 +163,16 @@ 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);
         }
 
@@ -162,8 +182,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
-        return null;
+        else {
+            return null;
+        }
     }
 
     @Override
@@ -173,49 +194,48 @@ 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) {
-            player.drop(itemstack, true);
+            owner.getHandle().drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        player.defaultContainer.b();
+        owner.getHandle().defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
-        return i + 9;
+        else
+            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;
-        }
-        return i;
+        else
+            return i;
     }
 
     @Override
@@ -226,4 +246,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
+    @Override
+    public boolean a(EntityHuman entityhuman) {
+        return true;
+    }
 }

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

@@ -0,0 +1,124 @@
+/*
+ * 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 org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.internal.IAnySilentChest;
+
+// Volatile
+import net.minecraft.server.v1_7_R3.Block;
+import net.minecraft.server.v1_7_R3.EntityPlayer;
+import net.minecraft.server.v1_7_R3.IInventory;
+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.World;
+
+import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer;
+
+public class AnySilentChest implements IAnySilentChest {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        // If block on top
+        if (world.getType(x, y + 1, z).c())
+            return true;
+
+        int id = Block.b(world.getType(x, y, z));
+
+        // If block next to chest is chest and has a block on top
+        if ((Block.b(world.getType(x - 1, y, z)) == id) && (world.getType(x - 1, y + 1, z).c()))
+            return true;
+        if ((Block.b(world.getType(x + 1, y, z)) == id) && (world.getType(x + 1, y + 1, z).c()))
+            return true;
+        if ((Block.b(world.getType(x, y, z - 1)) == id) && (world.getType(x, y + 1, z - 1).c()))
+            return true;
+        if ((Block.b(world.getType(x, y, z + 1)) == id) && (world.getType(x, y + 1, z + 1).c()))
+            return true;
+
+        return false;
+    }
+
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        Object chest = world.getTileEntity(x, y, z);
+        if (chest == null)
+            return true;
+
+        int id = Block.b(world.getType(x, y, z));
+
+        if (!anychest) {
+            if (world.getType(x, y + 1, z).c())
+                return true;
+            if ((Block.b(world.getType(x - 1, y, z)) == id) && (world.getType(x - 1, y + 1, z).c()))
+                return true;
+            if ((Block.b(world.getType(x + 1, y, z)) == id) && (world.getType(x + 1, y + 1, z).c()))
+                return true;
+            if ((Block.b(world.getType(x, y, z - 1)) == id) && (world.getType(x, y + 1, z - 1).c()))
+                return true;
+            if ((Block.b(world.getType(x, y, z + 1)) == id) && (world.getType(x, y + 1, z + 1).c()))
+                return true;
+        }
+
+        if (Block.b(world.getType(x - 1, y, z)) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        if (Block.b(world.getType(x + 1, y, z)) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        if (Block.b(world.getType(x, y, z - 1)) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        if (Block.b(world.getType(x, y, z + 1)) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+
+        boolean returnValue = true;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+        }
+        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) chest).getInventoryName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = false;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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 org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+// 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 check(Inventory inventory, HumanEntity player) {
+        IInventory inv = ((CraftInventory) inventory).getInventory();
+
+        if (inv instanceof SpecialPlayerInventory) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
+                return false;
+            }
+        }
+
+        else if (inv instanceof SpecialEnderChest) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}