Almost entirely functional silent shulker boxes

For whatever reason, the shulker box EnumDirection isn't being retrieved properly, so AnyChest will only trigger on shulker boxes that would not be able to open if placed downwards (opening upwards). Silentchest and anychest will work, though.
Suppressed a few deprecation warnings that don't make sense to keep.
If you do use my fork of OpenInv's API, it's not yet stable (specifically, IAnySilentContainer), and will change a little more as I polish things up.

.gitignore

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

OpenInv/pom.xml

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

OpenInvCore/pom.xml

@@ -5,20 +5,18 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.2.1</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinvapi</artifactId>
+  <artifactId>openinvcore</artifactId>
-  <name>OpenInvAPI</name>
+  <name>OpenInvCore</name>
 
   <dependencies>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>bukkit</artifactId>
       <version>1.4.5-R1.0</version>
-      <scope>system</scope>
+      <scope>provided</scope>
-      <systemPath>${project.basedir}/../lib/bukkit-1.4.5-R1.0.jar</systemPath>
     </dependency>
   </dependencies>
-
 </project>

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

@@ -0,0 +1,39 @@
+/*
+ * 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;
+
+/**
+ * @deprecated Use {@link IAnySilentContainer}
+ */
+@Deprecated
+public interface IAnySilentChest {
+
+    /**
+     * @deprecated Use {@link IAnySilentContainer#activateContainer(Player, boolean, int, int, int)}.
+     */
+    @Deprecated
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z);
+
+    /**
+     * @deprecated Use {@link IAnySilentContainer#isAnyContainerNeeded(Player, int, int, int)}.
+     */
+    @Deprecated
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z);
+
+}

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

@@ -3,7 +3,8 @@ package com.lishid.openinv.internal;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 
-public interface IAnySilentContainer {
+@SuppressWarnings("deprecation")
+public interface IAnySilentContainer extends IAnySilentChest {
 
     /**
      * Checks if the given block is a container which can be unblocked or silenced.
@@ -13,25 +14,29 @@ public interface IAnySilentContainer {
      */
     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)}
+     * containers to open, be sure to check {@link #isAnyContainerNeeded(Player, int, int, int)}
      * first.
      * 
      * @param player
      * @param silentchest whether the container's noise is to be silenced
-     * @param block the Block
+     * @param x the x coordinate
+     * @param y the y coordinate
+     * @param z the z coordinate
      * @return true if the container can be opened
      */
-    public boolean activateContainer(Player player, boolean silentchest, Block block);
+    public boolean activateContainer(Player player, boolean silentchest, int x, int y, int z);
+
+    /**
+     * Checks if the container at the given coordinates is blocked.
+     * 
+     * @param player the Player opening the container
+     * @param x the x coordinate
+     * @param y the y coordinate
+     * @param z the z coordinate
+     * @return true if the container is blocked
+     */
+    public boolean isAnyContainerNeeded(Player player, int x, int y, int z);
 
 }

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

@@ -0,0 +1,33 @@
+/*
+ * 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 {
+
+    /**
+     * Check if an entity has permission to modify the contents of an inventory.
+     * 
+     * @param inventory the Inventory
+     * @param player the HumanEntity
+     * @return true if the HumanEntity can modify the Inventory
+     */
+    public boolean check(Inventory inventory, HumanEntity player);
+
+}

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

@@ -16,8 +16,6 @@
 
 package com.lishid.openinv.internal;
 
-import java.util.Collection;
-
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
@@ -41,19 +39,4 @@ public interface IPlayerDataManager {
      */
     public String getPlayerDataID(OfflinePlayer player);
 
-    /**
-     * Gets an OfflinePlayer by the given unique identifier.
-     * 
-     * @param identifier the unique identifier
-     * @return the OfflinePlayer, or null if no exact match was found
-     */
-    public OfflinePlayer getPlayerByID(String identifier);
-
-    /**
-     * Gets a Collection of all Players currently online.
-     * 
-     * @return the Collection of Players
-     */
-    public Collection<? extends Player> getOnlinePlayers();
-
 }

OpenInvCraftbukkit1_10_R1/pom.xml

@@ -4,25 +4,29 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
+    <artifactId>openinvparent</artifactId>
-    <version>3.2.1</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinvadapter1_10_R1</artifactId>
+  <artifactId>OpenInvCraftbukkit1_10_R1</artifactId>
-  <name>OpenInvAdapter1_10_R1</name>
+  <name>OpenInvCraftbukkit1_10_R1</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcore</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
       <version>1.10-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>3.2.1</version>
-    </dependency>
   </dependencies>
-
 </project>

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

@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_10_R1;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_10_R1.AxisAlignedBB;
+import net.minecraft.server.v1_10_R1.Block;
+import net.minecraft.server.v1_10_R1.BlockPosition;
+import net.minecraft.server.v1_10_R1.Entity;
+import net.minecraft.server.v1_10_R1.EntityOcelot;
+import net.minecraft.server.v1_10_R1.EntityPlayer;
+import net.minecraft.server.v1_10_R1.IInventory;
+import net.minecraft.server.v1_10_R1.ITileInventory;
+import net.minecraft.server.v1_10_R1.InventoryLargeChest;
+import net.minecraft.server.v1_10_R1.PacketPlayOutOpenWindow;
+import net.minecraft.server.v1_10_R1.TileEntityChest;
+import net.minecraft.server.v1_10_R1.World;
+
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
+
+public class AnySilentContainer implements IAnySilentContainer {
+
+    @Override
+    public boolean isAnySilentContainer(org.bukkit.block.Block block) {
+        return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        Object chest = world.getTileEntity(new BlockPosition(x, y, z));
+
+        if (chest == null) {
+            return false;
+        }
+
+        int id = Block.getId(world.getType(new BlockPosition(x, y, z)).getBlock());
+
+        if (Block.getId(world.getType(new BlockPosition(x, y, z + 1)).getBlock()) == id) {
+            chest = new InventoryLargeChest("Large chest", (ITileInventory) chest, (TileEntityChest) world.getTileEntity(new BlockPosition(x, y, z + 1)));
+        } else if (Block.getId(world.getType(new BlockPosition(x, y, z - 1)).getBlock()) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(new BlockPosition(x, y, z - 1)), (ITileInventory) chest);
+        } else if (Block.getId(world.getType(new BlockPosition(x + 1, y, z)).getBlock()) == id) {
+            chest = new InventoryLargeChest("Large chest", (ITileInventory) chest, (TileEntityChest) world.getTileEntity(new BlockPosition(x + 1, y, z)));
+        } else if (Block.getId(world.getType(new BlockPosition(x - 1, y, z)).getBlock()) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(new BlockPosition(x - 1, y, z)), (ITileInventory) chest);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+            returnValue = true;
+        } else {
+            try {
+                SilentContainerChest silentContainerChest = new SilentContainerChest(player.inventory, ((IInventory) chest), player);
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, "minecraft:chest", ((IInventory) chest).getScoreboardDisplayName(), ((IInventory) chest).getSize()));
+                player.activeContainer = silentContainerChest;
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(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 or ocelot on top
+        if (world.getType(new BlockPosition(x, y + 1, z)).l() || hasOcelotOnTop(world, x, y, z)) {
+            return true;
+        }
+
+        int id = Block.getId(world.getType(new BlockPosition(x, y, z)).getBlock());
+
+        // If block next to chest is chest and has a block or ocelot on top
+        return isBlockedChest(world, id, x - 1, y, z) || isBlockedChest(world, id, x + 1, y, z)
+                || isBlockedChest(world, id, x, y, z - 1) || isBlockedChest(world, id, x, y, z + 1);
+    }
+
+    private boolean isBlockedChest(World world, int id, int x, int y, int z) {
+        BlockPosition position = new BlockPosition(x, y, z);
+        if (Block.getId(world.getType(position).getBlock()) != id) {
+            return false;
+        }
+
+        if (world.getType(position).l()) {
+            return true;
+        }
+
+        return hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Entity localEntity : world.a(EntityOcelot.class,
+                new AxisAlignedBB(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @deprecated Use {@link #activateContainer(Player, boolean, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z) {
+        return !activateContainer(player, silentchest, x, y, z);
+    }
+
+    /**
+     * @deprecated Use {@link #isAnyContainerNeeded(Player, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z) {
+        return isAnyContainerNeeded(player, x, y, z);
+    }
+
+}

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

@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_10_R1;
+
+import java.lang.reflect.Field;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_10_R1.IInventory;
+
+import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+
+    @Override
+    public boolean check(Inventory inventory, HumanEntity player) {
+        IInventory inv = grabInventory(inventory);
+
+        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;
+    }
+
+    private IInventory grabInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory();
+        }
+
+        // Use reflection to find the iinventory
+        Class<? extends Inventory> clazz = inventory.getClass();
+        IInventory result = null;
+        for (Field f : clazz.getDeclaredFields()) {
+            f.setAccessible(true);
+            if (IInventory.class.isAssignableFrom(f.getDeclaringClass())) {
+                try {
+                    result = (IInventory) f.get(inventory);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return result;
+    }
+
+}

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

@@ -16,48 +16,42 @@
 
 package com.lishid.openinv.internal.v1_10_R1;
 
-import java.util.Collection;
-import java.util.UUID;
-
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import com.mojang.authlib.GameProfile;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
+// Volatile
 import net.minecraft.server.v1_10_R1.EntityPlayer;
 import net.minecraft.server.v1_10_R1.MinecraftServer;
 import net.minecraft.server.v1_10_R1.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        // Ensure player has data
         if (offline == null || !offline.hasPlayedBefore()) {
             return null;
         }
-
-        // Create a profile and entity to load the player data
         GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+        // Create an entity to load the player data
-                new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
+            // Return the entity
+            return target;
         }
-        // Return the entity
+        return null;
-        return target;
     }
 
     @Override
@@ -65,45 +59,4 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getUniqueId().toString();
     }
 
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        try {
-            UUID uuid = UUID.fromString(identifier);
-            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
-            // Ensure player is a real player, otherwise return null
-            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-                return null;
-            }
-            return player;
-        } catch (IllegalArgumentException e) {
-            // Not a UUID
-            return null;
-        }
-    }
-
-    @Override
-    public Collection<? extends Player> getOnlinePlayers() {
-        return Bukkit.getOnlinePlayers();
-    }
-
-    public static EntityPlayer getHandle(Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
 }

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

@@ -16,6 +16,7 @@
 
 package com.lishid.openinv.internal.v1_10_R1;
 
+// Volatile
 import net.minecraft.server.v1_10_R1.ContainerChest;
 import net.minecraft.server.v1_10_R1.EntityHuman;
 import net.minecraft.server.v1_10_R1.IInventory;
@@ -23,11 +24,13 @@ import net.minecraft.server.v1_10_R1.ItemStack;
 import net.minecraft.server.v1_10_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
+    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2, EntityHuman e1) {
         super(i1, i2, e1);
-        // Send close signal
+        inv = i2;
-        i2.closeContainer(e1);
+        // close signal
+        inv.closeContainer(e1);
     }
 
     @Override
@@ -41,5 +44,4 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried, false);
         }
     }
-
 }

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

@@ -24,27 +24,26 @@ import com.lishid.openinv.internal.ISpecialEnderChest;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import net.minecraft.server.v1_10_R1.EntityPlayer;
+// Volatile
 import net.minecraft.server.v1_10_R1.IInventory;
 import net.minecraft.server.v1_10_R1.InventoryEnderChest;
 import net.minecraft.server.v1_10_R1.InventorySubcontainer;
 import net.minecraft.server.v1_10_R1.ItemStack;
 
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline = false;
+    public boolean playerOnline = false;
 
     public SpecialEnderChest(Player player, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+        super(((CraftPlayer) player).getHandle().getEnderChest().getName(), ((CraftPlayer) player).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) player).getHandle().getEnderChest().getSize());
-                PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(),
+        CraftPlayer craftPlayer = (CraftPlayer) player;
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        this.enderChest = craftPlayer.getHandle().getEnderChest();
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.bukkitOwner = craftPlayer;
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.bukkitOwner = nmsPlayer.getBukkitEntity();
         setItemArrays(this, enderChest.getContents());
     }
 
@@ -77,10 +76,11 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                this.bukkitOwner = player;
-                this.bukkitOwner = nmsPlayer.getBukkitEntity();
+                CraftPlayer craftPlayer = (CraftPlayer) player;
-                setItemArrays(nmsPlayer.getEnderChest(), this.items);
+                setItemArrays(craftPlayer.getHandle().getEnderChest(), this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -24,10 +24,12 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
+// Volatile
 import net.minecraft.server.v1_10_R1.EntityHuman;
 import net.minecraft.server.v1_10_R1.ItemStack;
 import net.minecraft.server.v1_10_R1.PlayerInventory;
 
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -37,7 +39,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         setItemArrays(this, player.inventory.items, player.inventory.armor, player.inventory.extraSlots);
     }
@@ -87,7 +89,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);
+            this.player = ((CraftPlayer) player).getHandle();
             setItemArrays(this.player.inventory, items, armor, extraSlots);
             playerOnline = true;
         }
@@ -124,14 +126,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.extraSlots;
-        } else if (is == this.armor) {
+        }
+        else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -152,14 +156,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.extraSlots;
-        } else if (is == this.armor) {
+        }
+        else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -175,7 +181,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            } else {
+            }
+            else {
                 itemstack = is[i].cloneAndSubtract(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -184,8 +191,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -195,14 +203,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.extraSlots;
-        } else if (is == this.armor) {
+        }
+        else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -217,8 +227,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -228,14 +239,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.extraSlots;
-        } else if (is == this.armor) {
+        }
+        else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -256,26 +269,23 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
+        else
-        return i + 9;
+            return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0) {
+        if (i == 0)
             return 3;
-        }
+        if (i == 1)
-        if (i == 1) {
             return 2;
-        }
+        if (i == 2)
-        if (i == 2) {
             return 1;
-        }
+        if (i == 3)
-        if (i == 3) {
             return 0;
-        }
+        else
-        return i;
+            return i;
     }
 
     @Override
@@ -290,5 +300,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     public boolean a(EntityHuman entityhuman) {
         return true;
     }
-
 }

OpenInvCraftbukkit1_11_R1/pom.xml

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

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

@@ -25,9 +25,11 @@ import org.bukkit.block.BlockState;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
+// Volatile
 import net.minecraft.server.v1_11_R1.AxisAlignedBB;
 import net.minecraft.server.v1_11_R1.Block;
 import net.minecraft.server.v1_11_R1.BlockChest;
+import net.minecraft.server.v1_11_R1.BlockChest.Type;
 import net.minecraft.server.v1_11_R1.BlockEnderChest;
 import net.minecraft.server.v1_11_R1.BlockPosition;
 import net.minecraft.server.v1_11_R1.BlockShulkerBox;
@@ -37,18 +39,17 @@ import net.minecraft.server.v1_11_R1.EntityOcelot;
 import net.minecraft.server.v1_11_R1.EntityPlayer;
 import net.minecraft.server.v1_11_R1.EnumDirection;
 import net.minecraft.server.v1_11_R1.IBlockData;
+import net.minecraft.server.v1_11_R1.IInventory;
 import net.minecraft.server.v1_11_R1.ITileInventory;
-import net.minecraft.server.v1_11_R1.InventoryEnderChest;
 import net.minecraft.server.v1_11_R1.InventoryLargeChest;
 import net.minecraft.server.v1_11_R1.PacketPlayOutOpenWindow;
 import net.minecraft.server.v1_11_R1.StatisticList;
 import net.minecraft.server.v1_11_R1.TileEntity;
 import net.minecraft.server.v1_11_R1.TileEntityChest;
-import net.minecraft.server.v1_11_R1.TileEntityEnderChest;
 import net.minecraft.server.v1_11_R1.TileEntityShulkerBox;
 import net.minecraft.server.v1_11_R1.World;
 
-import org.bukkit.craftbukkit.v1_11_R1.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
 
 public class AnySilentContainer implements IAnySilentContainer {
 
@@ -62,20 +63,134 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block b) {
+    public boolean activateContainer(Player p, boolean silentchest, int x, int y, int z) {
-        EntityPlayer player = PlayerDataManager.getHandle(p);
+
-        World world = player.world;
+        // TODO backport to all modules? TODO change new API to activateContainer(Player, Block)? Use BlockState instead?
-        BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
+        if (silentchest && p.getWorld().getBlockAt(x, y, z).getType() == Material.ENDER_CHEST) {
-        IBlockData blockData = world.getType(blockPosition);
+            p.openInventory(p.getEnderChest());
-        Block block = blockData.getBlock();
+            return true;
+        }
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        final World world = player.world;
+        final BlockPosition blockPosition = new BlockPosition(x, y, z);
+        Object tile = world.getTileEntity(blockPosition);
+
+        if (tile == null) {
+            return false;
+        }
+
+        Block block = world.getType(blockPosition).getBlock();
+        Container container = null;
+
+        if (block instanceof BlockChest) {
+            BlockChest blockChest = (BlockChest) block;
+
+            for (EnumDirection enumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
+                BlockPosition localBlockPosition = blockPosition.shift(enumDirection);
+                Block localBlock = world.getType(localBlockPosition).getBlock();
+
+                if (localBlock != block) {
+                    continue;
+                }
+
+                TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
+                if (!(localTileEntity instanceof TileEntityChest)) {
+                    continue;
+                }
+
+                if ((enumDirection == EnumDirection.WEST) || (enumDirection == EnumDirection.NORTH)) {
+                    tile = new InventoryLargeChest("container.chestDouble",
+                            (TileEntityChest) localTileEntity, (ITileInventory) tile);
+                } else {
+                    tile = new InventoryLargeChest("container.chestDouble",
+                            (ITileInventory) tile, (TileEntityChest) localTileEntity);
+                }
+                break;
+            }
+
+            if (blockChest.g == Type.BASIC)
+                player.b(StatisticList.ac);
+            else if (blockChest.g == Type.TRAP) {
+                player.b(StatisticList.W);
+            }
+
+            if (silentchest) {
+                container = new SilentContainerChest(player.inventory, ((IInventory) tile), player);
+            }
+        }
 
         if (block instanceof BlockShulkerBox) {
-            return isBlockedShulkerBox(world, blockPosition, blockData);
+            player.b(StatisticList.ae);
+
+            if (silentchest && tile instanceof TileEntityShulkerBox) {
+                // Set value to current + 1. Ensures consistency later when resetting.
+                SilentContainerShulkerBox.setOpenValue((TileEntityShulkerBox) tile,
+                        SilentContainerShulkerBox.getOpenValue((TileEntityShulkerBox) tile) + 1);
+
+                container = new SilentContainerShulkerBox(player.inventory, (IInventory) tile, player);
+            }
+        }
+
+        if (!(tile instanceof IInventory)) {
+            // TODO anyenderchest
+            p.sendMessage(ChatColor.RED + "Unhandled non-IInventory for block!");
+            return false;
+        }
+
+        boolean returnValue = false;
+        final IInventory iInventory = (IInventory) tile;
+
+        if (!silentchest || container == null) {
+            player.openContainer(iInventory);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, iInventory.getName(), iInventory.getScoreboardDisplayName(), iInventory.getSize()));
+                player.activeContainer = container;
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+                if (tile instanceof TileEntityShulkerBox) {
+                    new BukkitRunnable() {
+                        @Override
+                        public void run() {
+                            // TODO hacky
+                            Object tile = world.getTileEntity(blockPosition);
+                            if (!(tile instanceof TileEntityShulkerBox)) {
+                                return;
+                            }
+                            TileEntityShulkerBox box = (TileEntityShulkerBox) tile;
+                            // Reset back - we added 1, and calling TileEntityShulkerBox#startOpen adds 1 more.
+                            SilentContainerShulkerBox.setOpenValue(box,
+                                    SilentContainerShulkerBox.getOpenValue((TileEntityShulkerBox) tile) - 2);
+                        }
+                    }.runTaskLater(Bukkit.getPluginManager().getPlugin("OpenInv"), 2);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(Player p, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        BlockPosition blockPosition = new BlockPosition(x, y, z);
+        Block block = world.getType(blockPosition).getBlock();
+
+        if (block instanceof BlockShulkerBox) {
+            return isBlockedShulkerBox(world, blockPosition, block);
         }
 
         if (block instanceof BlockEnderChest) {
             // Ender chests are not blocked by ocelots.
-            return world.getType(blockPosition.up()).m();
+            return world.getType(new BlockPosition(x, y + 1, z)).m();
         }
 
         // Check if chest is blocked or has an ocelot on top
@@ -105,7 +220,7 @@ public class AnySilentContainer implements IAnySilentContainer {
         return false;
     }
 
-    private boolean isBlockedShulkerBox(World world, BlockPosition blockPosition, IBlockData blockData) {
+    private boolean isBlockedShulkerBox(World world, BlockPosition blockPosition, Block block) {
         // For reference, look at net.minecraft.server.BlockShulkerBox
         TileEntity tile = world.getTileEntity(blockPosition);
 
@@ -113,20 +228,16 @@ public class AnySilentContainer implements IAnySilentContainer {
             return false;
         }
 
-        EnumDirection enumDirection = blockData.get(BlockShulkerBox.a);
+        IBlockData iBlockData = block.getBlockData();
+
+        EnumDirection enumDirection = iBlockData.get(BlockShulkerBox.a);
         if (((TileEntityShulkerBox) tile).p() == TileEntityShulkerBox.AnimationPhase.CLOSED) {
-            AxisAlignedBB axisAlignedBB = Block.j.b(0.5F * enumDirection.getAdjacentX(),
+            AxisAlignedBB axisAlignedBB = BlockShulkerBox.j.b(0.5F * enumDirection.getAdjacentX(),
                     0.5F * enumDirection.getAdjacentY(), 0.5F * enumDirection.getAdjacentZ())
                     .a(enumDirection.getAdjacentX(), enumDirection.getAdjacentY(),
                             enumDirection.getAdjacentZ());
 
-            try {
+            return world.b(axisAlignedBB.a(blockPosition.shift(enumDirection)));
-                // 1.11.2
-                return world.a(axisAlignedBB.a(blockPosition.shift(enumDirection)));
-            } catch (NoSuchMethodError e) {
-                // 1.11
-                return world.b(axisAlignedBB.a(blockPosition.shift(enumDirection)));
-            }
         }
 
         return false;
@@ -151,136 +262,22 @@ public class AnySilentContainer implements IAnySilentContainer {
         return false;
     }
 
+    /**
+     * @deprecated Use {@link #activateContainer(Player, boolean, boolean, int, int, int)}.
+     */
+    @Deprecated
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block b) {
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z) {
+        return !activateContainer(player, silentchest, x, y, z);
+    }
 
-        EntityPlayer player = PlayerDataManager.getHandle(p);
+    /**
-
+     * @deprecated Use {@link #isAnyContainerNeeded(Player, int, int, int)}.
-        // Silent ender chest is pretty much API-only
+     */
-        if (silentchest && b.getType() == Material.ENDER_CHEST) {
+    @Deprecated
-            p.openInventory(p.getEnderChest());
+    @Override
-            player.b(StatisticList.getStatistic("stat.enderchestOpened"));
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z) {
-            return true;
+        return isAnyContainerNeeded(player, x, y, z);
-        }
-
-        final World world = player.world;
-        final BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
-        final Object tile = world.getTileEntity(blockPosition);
-
-        if (tile == null) {
-            return false;
-        }
-
-        if (tile instanceof TileEntityEnderChest) {
-            // Anychest ender chest.  See net.minecraft.server.BlockEnderChest
-            InventoryEnderChest enderChest = player.getEnderChest();
-            enderChest.a((TileEntityEnderChest) tile);
-            player.openContainer(enderChest);
-            player.b(StatisticList.getStatistic("stat.enderchestOpened"));
-            return true;
-        }
-
-        if (!(tile instanceof ITileInventory)) {
-            return false;
-        }
-
-        ITileInventory tileInventory = (ITileInventory) tile;
-        Block block = world.getType(blockPosition).getBlock();
-        Container container = null;
-
-        if (block instanceof BlockChest) {
-            for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
-                BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
-                Block localBlock = world.getType(localBlockPosition).getBlock();
-
-                if (localBlock != block) {
-                    continue;
-                }
-
-                TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
-                if (!(localTileEntity instanceof TileEntityChest)) {
-                    continue;
-                }
-
-                if ((localEnumDirection == EnumDirection.WEST) || (localEnumDirection == EnumDirection.NORTH)) {
-                    tileInventory = new InventoryLargeChest("container.chestDouble",
-                            (TileEntityChest) localTileEntity, tileInventory);
-                } else {
-                    tileInventory = new InventoryLargeChest("container.chestDouble",
-                            tileInventory, (TileEntityChest) localTileEntity);
-                }
-                break;
-            }
-
-            BlockChest blockChest = (BlockChest) block;
-            if (blockChest.g == BlockChest.Type.BASIC) {
-                player.b(StatisticList.getStatistic("stat.chestOpened"));
-            } else if (blockChest.g == BlockChest.Type.TRAP) {
-                player.b(StatisticList.getStatistic("stat.trappedChestTriggered"));
-            }
-
-            if (silentchest) {
-                container = new SilentContainerChest(player.inventory, tileInventory, player);
-            }
-        }
-
-        if (block instanceof BlockShulkerBox) {
-            player.b(StatisticList.getStatistic("stat.shulkerBoxOpened"));
-
-            if (silentchest && tileInventory instanceof TileEntityShulkerBox) {
-                // Set value to current + 1. Ensures consistency later when resetting.
-                SilentContainerShulkerBox.setOpenValue((TileEntityShulkerBox) tileInventory,
-                        SilentContainerShulkerBox.getOpenValue((TileEntityShulkerBox) tileInventory) + 1);
-
-                container = new SilentContainerShulkerBox(player.inventory, tileInventory, player);
-            }
-        }
-
-        // AnyChest only - SilentChest not active or container unsupported
-        if (!silentchest || container == null) {
-            player.openContainer(tileInventory);
-            return true;
-        }
-
-        // SilentChest
-        try {
-            // Call InventoryOpenEvent
-            container = CraftEventFactory.callInventoryOpenEvent(player, container, false);
-            if (container == null) {
-                return false;
-            }
-
-            // Open window
-            int windowId = player.nextContainerCounter();
-            player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, tileInventory.getContainerName(), tileInventory.getScoreboardDisplayName(), tileInventory.getSize()));
-            player.activeContainer = container;
-            player.activeContainer.windowId = windowId;
-            player.activeContainer.addSlotListener(player);
-
-            // Special handling for shulker boxes - reset value for viewers to what it was initially.
-            if (tile instanceof TileEntityShulkerBox) {
-                new BukkitRunnable() {
-                    @Override
-                    public void run() {
-                        // TODO hacky
-                        Object tile = world.getTileEntity(blockPosition);
-                        if (!(tile instanceof TileEntityShulkerBox)) {
-                            return;
-                        }
-                        TileEntityShulkerBox box = (TileEntityShulkerBox) tile;
-                        // Reset back - we added 1, and calling TileEntityShulkerBox#startOpen adds 1 more.
-                        SilentContainerShulkerBox.setOpenValue(box,
-                                SilentContainerShulkerBox.getOpenValue((TileEntityShulkerBox) tile) - 2);
-                    }
-                }.runTaskLater(Bukkit.getPluginManager().getPlugin("OpenInv"), 2);
-            }
-
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
-            return false;
-        }
     }
 
 }

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

@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_11_R1;
+
+import java.lang.reflect.Field;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_11_R1.IInventory;
+
+import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+
+    @Override
+    public boolean check(Inventory inventory, HumanEntity player) {
+        IInventory inv = grabInventory(inventory);
+
+        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;
+    }
+
+    private IInventory grabInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory();
+        }
+
+        // Use reflection to find the iinventory
+        Class<? extends Inventory> clazz = inventory.getClass();
+        IInventory result = null;
+        for (Field f : clazz.getDeclaredFields()) {
+            f.setAccessible(true);
+            if (IInventory.class.isAssignableFrom(f.getDeclaringClass())) {
+                try {
+                    result = (IInventory) f.get(inventory);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return result;
+    }
+}

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

@@ -16,48 +16,42 @@
 
 package com.lishid.openinv.internal.v1_11_R1;
 
-import java.util.Collection;
-import java.util.UUID;
-
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import com.mojang.authlib.GameProfile;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
+// Volatile
 import net.minecraft.server.v1_11_R1.EntityPlayer;
 import net.minecraft.server.v1_11_R1.MinecraftServer;
 import net.minecraft.server.v1_11_R1.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        // Ensure player has data
         if (offline == null || !offline.hasPlayedBefore()) {
             return null;
         }
-
-        // Create a profile and entity to load the player data
         GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+        // Create an entity to load the player data
-                new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
+            // Return the entity
+            return target;
         }
-        // Return the entity
+        return null;
-        return target;
     }
 
     @Override
@@ -65,45 +59,4 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getUniqueId().toString();
     }
 
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        try {
-            UUID uuid = UUID.fromString(identifier);
-            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
-            // Ensure player is a real player, otherwise return null
-            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-                return null;
-            }
-            return player;
-        } catch (IllegalArgumentException e) {
-            // Not a UUID
-            return null;
-        }
-    }
-
-    @Override
-    public Collection<? extends Player> getOnlinePlayers() {
-        return Bukkit.getOnlinePlayers();
-    }
-
-    public static EntityPlayer getHandle(Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
 }

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

@@ -16,6 +16,7 @@
 
 package com.lishid.openinv.internal.v1_11_R1;
 
+// Volatile
 import net.minecraft.server.v1_11_R1.ContainerChest;
 import net.minecraft.server.v1_11_R1.EntityHuman;
 import net.minecraft.server.v1_11_R1.IInventory;
@@ -27,7 +28,7 @@ public class SilentContainerChest extends ContainerChest {
     public SilentContainerChest(PlayerInventory playerInventory, IInventory iInventory,
             EntityHuman entityHuman) {
         super(playerInventory, iInventory, entityHuman);
-        // Send close signal
+        // close signal
         iInventory.closeContainer(entityHuman);
     }
 
@@ -42,5 +43,4 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried, false);
         }
     }
-
 }

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

@@ -11,29 +11,14 @@ import net.minecraft.server.v1_11_R1.TileEntityShulkerBox;
 
 public class SilentContainerShulkerBox extends ContainerShulkerBox {
 
-    private static Field fieldShulkerActionData;
+    private static Field h;
-
-    public SilentContainerShulkerBox(PlayerInventory playerInventory, IInventory iInventory,
-            EntityHuman entityHuman) {
-        super(playerInventory, iInventory, entityHuman);
-    }
-
-    @Override
-    public void b(EntityHuman entityHuman) {
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (!playerinventory.getCarried().isEmpty()) {
-            entityHuman.drop(playerinventory.getCarried(), false);
-            playerinventory.setCarried(ItemStack.a);
-        }
-    }
 
     private static Field exposeOpenStatus() throws NoSuchFieldException, SecurityException {
-        if (fieldShulkerActionData == null) {
+        if (h == null) {
-            fieldShulkerActionData = TileEntityShulkerBox.class.getDeclaredField("h");
+            h = TileEntityShulkerBox.class.getDeclaredField("h");
-            fieldShulkerActionData.setAccessible(true);
+            h.setAccessible(true);
         }
-        return fieldShulkerActionData;
+        return h;
     }
 
     public static void setOpenValue(TileEntityShulkerBox tileShulkerBox, Object value) {
@@ -53,4 +38,19 @@ public class SilentContainerShulkerBox extends ContainerShulkerBox {
         }
     }
 
+    public SilentContainerShulkerBox(PlayerInventory playerInventory, IInventory iInventory,
+            EntityHuman entityHuman) {
+        super(playerInventory, iInventory, entityHuman);
+    }
+
+    @Override
+    public void b(EntityHuman entityHuman) {
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (!playerinventory.getCarried().isEmpty()) {
+            entityHuman.drop(playerinventory.getCarried(), false);
+            playerinventory.setCarried(ItemStack.a);
+        }
+    }
+
 }

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

@@ -25,27 +25,26 @@ import com.lishid.openinv.internal.ISpecialEnderChest;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import net.minecraft.server.v1_11_R1.EntityPlayer;
+// Volatile
 import net.minecraft.server.v1_11_R1.IInventory;
 import net.minecraft.server.v1_11_R1.InventoryEnderChest;
 import net.minecraft.server.v1_11_R1.InventorySubcontainer;
 import net.minecraft.server.v1_11_R1.ItemStack;
 
+import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    private boolean playerOnline = false;
+    public boolean playerOnline = false;
 
     public SpecialEnderChest(Player player, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+        super(((CraftPlayer) player).getHandle().getEnderChest().getName(), ((CraftPlayer) player).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) player).getHandle().getEnderChest().getSize());
-                PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(),
+        CraftPlayer craftPlayer = (CraftPlayer) player;
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        this.enderChest = craftPlayer.getHandle().getEnderChest();
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.bukkitOwner = craftPlayer;
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.bukkitOwner = nmsPlayer.getBukkitEntity();
         setItemLists(this, enderChest.getContents());
     }
 
@@ -78,10 +77,11 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                this.bukkitOwner = player;
-                this.bukkitOwner = nmsPlayer.getBukkitEntity();
+                CraftPlayer craftPlayer = (CraftPlayer) player;
-                setItemLists(nmsPlayer.getEnderChest(), this.items);
+                setItemLists(craftPlayer.getHandle().getEnderChest(), this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -26,11 +26,13 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
 import net.minecraft.server.v1_11_R1.ContainerUtil;
+// Volatile
 import net.minecraft.server.v1_11_R1.EntityHuman;
 import net.minecraft.server.v1_11_R1.ItemStack;
 import net.minecraft.server.v1_11_R1.NonNullList;
 import net.minecraft.server.v1_11_R1.PlayerInventory;
 
+import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -39,7 +41,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         setItemArrays(this, player.inventory.items, player.inventory.armor, player.inventory.extraSlots);
     }
@@ -89,7 +91,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);;
+            this.player = ((CraftPlayer) player).getHandle();
             setItemArrays(this.player.inventory, items, armor, extraSlots);
             playerOnline = true;
         }
@@ -185,8 +187,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (list != null && !list.get(i).isEmpty()) {
             ItemStack itemstack = list.get(i);
 
-            list.set(i, ItemStack.a);
+             list.set(i, ItemStack.a);
-            return itemstack;
+             return itemstack;
         }
 
         return ItemStack.a;
@@ -216,31 +218,28 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         }
 
         if (list != null) {
-            list.set(i, itemstack);
+             list.set(i, itemstack);
         }
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
+        else
-        return i + 9;
+            return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0) {
+        if (i == 0)
             return 3;
-        }
+        if (i == 1)
-        if (i == 1) {
             return 2;
-        }
+        if (i == 2)
-        if (i == 2) {
             return 1;
-        }
+        if (i == 3)
-        if (i == 3) {
             return 0;
-        }
+        else
-        return i;
+            return i;
     }
 
     @Override
@@ -255,5 +254,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     public boolean a(EntityHuman entityhuman) {
         return true;
     }
-
 }

OpenInvCraftbukkit1_4_5/pom.xml

@@ -4,25 +4,29 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
+    <artifactId>openinvparent</artifactId>
-    <version>3.2.1</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinvadapter1_4_5</artifactId>
+  <artifactId>OpenInvCraftbukkit1_4_5</artifactId>
-  <name>OpenInvAdapter1_4_5</name>
+  <name>OpenInvCraftbukkit1_4_5</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcore</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.4.5-R1.0</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>3.2.1</version>
-    </dependency>
   </dependencies>
-
 </project>

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

@@ -0,0 +1,153 @@
+/*
+ * 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.Block;
+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.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 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 activateContainer(Player p, 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 false;
+        }
+
+        if (world.getTypeId(x, y, z + 1) == Block.CHEST.id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+        } else if(world.getTypeId(x, y, z - 1) == Block.CHEST.id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        } else if (world.getTypeId(x + 1, y, z) == Block.CHEST.id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        } else if (world.getTypeId(x - 1, y, z) == Block.CHEST.id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+            returnValue = true;
+        } 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 = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(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 or ocelot on top
+        if (world.s(x, y + 1, z) || hasOcelotOnTop(world, x, y, z))
+            return true;
+
+        // If block next to chest is chest and has a block or ocelot on top
+        return isBlockedChest(world, x - 1, y, z) || isBlockedChest(world, x + 1, y, z)
+                || isBlockedChest(world, x, y, z - 1) || isBlockedChest(world, x, y, z + 1);
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        if (world.getTypeId(x, y, z) != Block.CHEST.id) {
+            return false;
+        }
+
+        if (world.s(x, y + 1, z)) {
+            return true;
+        }
+
+        return 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().a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @deprecated Use {@link #activateContainer(Player, boolean, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z) {
+        return !activateContainer(player, silentchest, x, y, z);
+    }
+
+    /**
+     * @deprecated Use {@link #isAnyContainerNeeded(Player, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z) {
+        return isAnyContainerNeeded(player, x, y, z);
+    }
+
+}

OpenInvCraftbukkit1_4_5/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;
+    }
+}

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

@@ -16,46 +16,37 @@
 
 package com.lishid.openinv.internal.v1_4_5;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
+// Volatile
 import net.minecraft.server.v1_4_5.EntityPlayer;
 import net.minecraft.server.v1_4_5.ItemInWorldManager;
 import net.minecraft.server.v1_4_5.MinecraftServer;
 
 import org.bukkit.craftbukkit.v1_4_5.CraftServer;
-import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
     @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(),
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new ItemInWorldManager(server.getWorldServer(0)));
-                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 null;
-        return target;
     }
 
     @Override
@@ -63,39 +54,4 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    public static EntityPlayer getHandle(Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().f(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
 }

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

@@ -16,6 +16,7 @@
 
 package com.lishid.openinv.internal.v1_4_5;
 
+// Volatile
 import net.minecraft.server.v1_4_5.ContainerChest;
 import net.minecraft.server.v1_4_5.EntityHuman;
 import net.minecraft.server.v1_4_5.IInventory;
@@ -23,11 +24,13 @@ 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
+        inv = i2;
-        i2.f();
+        // close signal
+        inv.f();
     }
 
     @Override
@@ -41,5 +44,4 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried);
         }
     }
-
 }

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import net.minecraft.server.v1_4_5.EntityPlayer;
+// Volatile
 import net.minecraft.server.v1_4_5.IInventory;
 import net.minecraft.server.v1_4_5.InventoryEnderChest;
 import net.minecraft.server.v1_4_5.InventorySubcontainer;
@@ -41,17 +41,16 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
+    public boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(Player player, Boolean online) {
+    public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) player).getHandle().getEnderChest().getName(),
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-                ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        CraftPlayer player = (CraftPlayer) p;
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.enderChest = player.getHandle().getEnderChest();
-        this.enderChest = nmsPlayer.getEnderChest();
+        this.owner = player;
-        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -64,13 +63,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                owner = (CraftPlayer) player;
-                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
-                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
             playerOnline = true;
         }
     }

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

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

OpenInvCraftbukkit1_4_6/pom.xml

@@ -4,25 +4,29 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
+    <artifactId>openinvparent</artifactId>
-    <version>3.2.1</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinvadapter1_4_6</artifactId>
+  <artifactId>OpenInvCraftbukkit1_4_6</artifactId>
-  <name>OpenInvAdapter1_4_6</name>
+  <name>OpenInvCraftbukkit1_4_6</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcore</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.4.6-R0.3</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>3.2.1</version>
-    </dependency>
   </dependencies>
-
 </project>

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

@@ -0,0 +1,152 @@
+/*
+ * 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.Block;
+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.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;
+
+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 activateContainer(Player p, 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 false;
+        }
+
+        if (world.getTypeId(x, y, z + 1) == Block.CHEST.id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+        } else if(world.getTypeId(x, y, z - 1) == Block.CHEST.id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        } else if (world.getTypeId(x + 1, y, z) == Block.CHEST.id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        } else if (world.getTypeId(x - 1, y, z) == Block.CHEST.id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+            returnValue = true;
+        } 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 = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(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 or ocelot on top
+        if (world.s(x, y + 1, z) || hasOcelotOnTop(world, x, y, z))
+            return true;
+
+        // If block next to chest is chest and has a block or ocelot on top
+        return isBlockedChest(world, x - 1, y, z) || isBlockedChest(world, x + 1, y, z)
+                || isBlockedChest(world, x, y, z - 1) || isBlockedChest(world, x, y, z + 1);
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        if (world.getTypeId(x, y, z) != Block.CHEST.id) {
+            return false;
+        }
+
+        if (world.s(x, y + 1, z)) {
+            return true;
+        }
+
+        return 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().a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @deprecated Use {@link #activateContainer(Player, boolean, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z) {
+        return !activateContainer(player, silentchest, x, y, z);
+    }
+
+    /**
+     * @deprecated Use {@link #isAnyContainerNeeded(Player, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z) {
+        return isAnyContainerNeeded(player, x, y, z);
+    }
+
+}

OpenInvCraftbukkit1_4_6/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;
+
+// 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 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;
+    }
+}

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

@@ -16,46 +16,37 @@
 
 package com.lishid.openinv.internal.v1_4_6;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
+// Volatile
 import net.minecraft.server.v1_4_6.EntityPlayer;
 import net.minecraft.server.v1_4_6.MinecraftServer;
 import net.minecraft.server.v1_4_6.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_4_6.CraftServer;
-import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
     @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(),
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
-                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 null;
-        return target;
     }
 
     @Override
@@ -63,39 +54,4 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    public static EntityPlayer getHandle(Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().f(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
 }

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

@@ -16,6 +16,7 @@
 
 package com.lishid.openinv.internal.v1_4_6;
 
+// Volatile
 import net.minecraft.server.v1_4_6.ContainerChest;
 import net.minecraft.server.v1_4_6.EntityHuman;
 import net.minecraft.server.v1_4_6.IInventory;
@@ -23,11 +24,13 @@ 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
+        inv = i2;
-        i2.f();
+        // close signal
+        inv.f();
     }
 
     @Override
@@ -41,5 +44,4 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried);
         }
     }
-
 }

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import net.minecraft.server.v1_4_6.EntityPlayer;
+// Volatile
 import net.minecraft.server.v1_4_6.IInventory;
 import net.minecraft.server.v1_4_6.InventoryEnderChest;
 import net.minecraft.server.v1_4_6.InventorySubcontainer;
@@ -41,17 +41,16 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
+    public boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(Player player, Boolean online) {
+    public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) player).getHandle().getEnderChest().getName(),
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-                ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        CraftPlayer player = (CraftPlayer) p;
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.enderChest = player.getHandle().getEnderChest();
-        this.enderChest = nmsPlayer.getEnderChest();
+        this.owner = player;
-        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -64,13 +63,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                owner = (CraftPlayer) player;
-                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
-                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -21,9 +21,11 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
+// Volatile
 import net.minecraft.server.v1_4_6.ItemStack;
 import net.minecraft.server.v1_4_6.PlayerInventory;
 
+import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -33,7 +35,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -47,7 +49,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -84,14 +86,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);
         }
 
@@ -105,14 +109,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);
         }
 
@@ -123,7 +129,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;
@@ -132,8 +139,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -143,14 +151,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);
         }
 
@@ -160,8 +170,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -171,14 +182,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);
         }
 
@@ -194,26 +207,23 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
+        else
-        return i + 9;
+            return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0) {
+        if (i == 0)
             return 3;
-        }
+        if (i == 1)
-        if (i == 1) {
             return 2;
-        }
+        if (i == 2)
-        if (i == 2) {
             return 1;
-        }
+        if (i == 3)
-        if (i == 3) {
             return 0;
-        }
+        else
-        return i;
+            return i;
     }
 
     @Override

OpenInvCraftbukkit1_4_R1/pom.xml

@@ -4,25 +4,29 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
+    <artifactId>openinvparent</artifactId>
-    <version>3.2.1</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinvadapter1_4_R1</artifactId>
+  <artifactId>OpenInvCraftbukkit1_4_R1</artifactId>
-  <name>OpenInvAdapter1_4_R1</name>
+  <name>OpenInvCraftbukkit1_4_R1</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcore</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.4.7-R1.0</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>3.2.1</version>
-    </dependency>
   </dependencies>
-
 </project>

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

@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_4_R1;
+
+import java.lang.reflect.Field;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_4_R1.AxisAlignedBB;
+import net.minecraft.server.v1_4_R1.Block;
+import net.minecraft.server.v1_4_R1.EntityOcelot;
+import net.minecraft.server.v1_4_R1.EntityPlayer;
+import net.minecraft.server.v1_4_R1.IInventory;
+import net.minecraft.server.v1_4_R1.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;
+
+import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
+
+public class AnySilentContainer implements IAnySilentContainer {
+
+    @Override
+    public boolean isAnySilentContainer(org.bukkit.block.Block block) {
+        return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, 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 false;
+        }
+
+        if (world.getTypeId(x, y, z + 1) == Block.CHEST.id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+        } else if(world.getTypeId(x, y, z - 1) == Block.CHEST.id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        } else if (world.getTypeId(x + 1, y, z) == Block.CHEST.id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        } else if (world.getTypeId(x - 1, y, z) == Block.CHEST.id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+            returnValue = true;
+        } 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 = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(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 or ocelot on top
+        if (world.s(x, y + 1, z) || hasOcelotOnTop(world, x, y, z))
+            return true;
+
+        // If block next to chest is chest and has a block or ocelot on top
+        return isBlockedChest(world, x - 1, y, z) || isBlockedChest(world, x + 1, y, z)
+                || isBlockedChest(world, x, y, z - 1) || isBlockedChest(world, x, y, z + 1);
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        if (world.getTypeId(x, y, z) != Block.CHEST.id) {
+            return false;
+        }
+
+        if (world.s(x, y + 1, z)) {
+            return true;
+        }
+
+        return 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().a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @deprecated Use {@link #activateContainer(Player, boolean, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z) {
+        return !activateContainer(player, silentchest, x, y, z);
+    }
+
+    /**
+     * @deprecated Use {@link #isAnyContainerNeeded(Player, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z) {
+        return isAnyContainerNeeded(player, x, y, z);
+    }
+
+}

OpenInvCraftbukkit1_4_R1/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 com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_4_R1.IInventory;
+
+import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+    @Override
+    public boolean 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;
+    }
+}

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

@@ -16,47 +16,38 @@
 
 package com.lishid.openinv.internal.v1_4_R1;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
 import net.minecraft.server.v1_4_R1.EntityPlayer;
 import net.minecraft.server.v1_4_R1.MinecraftServer;
 import net.minecraft.server.v1_4_R1.PlayerInteractManager;
 
+// Volatile
 import org.bukkit.craftbukkit.v1_4_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
 
 
 public class PlayerDataManager implements IPlayerDataManager {
 
     @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(),
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
-                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 null;
-        return target;
     }
 
     @Override
@@ -64,39 +55,4 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    public static EntityPlayer getHandle(Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().f(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
 }

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

@@ -16,6 +16,7 @@
 
 package com.lishid.openinv.internal.v1_4_R1;
 
+// Volatile
 import net.minecraft.server.v1_4_R1.ContainerChest;
 import net.minecraft.server.v1_4_R1.EntityHuman;
 import net.minecraft.server.v1_4_R1.IInventory;
@@ -23,11 +24,13 @@ 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
+        inv = i2;
-        i2.f();
+        // close signal
+        inv.f();
     }
 
     @Override
@@ -41,5 +44,4 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried);
         }
     }
-
 }

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import net.minecraft.server.v1_4_R1.EntityPlayer;
+// Volatile
 import net.minecraft.server.v1_4_R1.IInventory;
 import net.minecraft.server.v1_4_R1.InventoryEnderChest;
 import net.minecraft.server.v1_4_R1.InventorySubcontainer;
@@ -41,17 +41,16 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
+    public boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(Player player, Boolean online) {
+    public SpecialEnderChest(Player p, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        CraftPlayer player = (CraftPlayer) p;
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.enderChest = player.getHandle().getEnderChest();
-        this.enderChest = nmsPlayer.getEnderChest();
+        this.owner = player;
-        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -64,13 +63,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                owner = (CraftPlayer) player;
-                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
-                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
             playerOnline = true;
         }
     }

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

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

OpenInvCraftbukkit1_5_R2/pom.xml

@@ -4,25 +4,29 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
+    <artifactId>openinvparent</artifactId>
-    <version>3.2.1</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinvadapter1_5_R2</artifactId>
+  <artifactId>OpenInvCraftbukkit1_5_R2</artifactId>
-  <name>OpenInvAdapter1_5_R2</name>
+  <name>OpenInvCraftbukkit1_5_R2</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcore</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.5.1-R0.2</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>3.2.1</version>
-    </dependency>
   </dependencies>
-
 </project>

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

@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_5_R2;
+
+import java.lang.reflect.Field;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_5_R2.AxisAlignedBB;
+import net.minecraft.server.v1_5_R2.EntityOcelot;
+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 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 activateContainer(Player p, 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 false;
+        }
+
+        int id = world.getTypeId(x, y, z);
+
+        if (world.getTypeId(x, y, z + 1) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+        } else if(world.getTypeId(x, y, z - 1) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        } else if (world.getTypeId(x + 1, y, z) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        } else if (world.getTypeId(x - 1, y, z) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+            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) chest).getName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(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 or ocelot on top
+        if (world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z))
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        // If block next to chest is chest and has a block or ocelot on top
+        return isBlockedChest(world, id, x - 1, y, z) || isBlockedChest(world, id, x + 1, y, z)
+                || isBlockedChest(world, id, x, y, z - 1) || isBlockedChest(world, id, x, y, z + 1);
+    }
+
+    private boolean isBlockedChest(World world, int id, int x, int y, int z) {
+        if (world.getTypeId(x, y, z) != id) {
+            return false;
+        }
+
+        if (world.t(x, y + 1, z)) {
+            return true;
+        }
+
+        return 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().a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @deprecated Use {@link #activateContainer(Player, boolean, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z) {
+        return !activateContainer(player, silentchest, x, y, z);
+    }
+
+    /**
+     * @deprecated Use {@link #isAnyContainerNeeded(Player, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z) {
+        return isAnyContainerNeeded(player, x, y, z);
+    }
+
+}

OpenInvCraftbukkit1_5_R2/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 com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_5_R2.IInventory;
+
+import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+    @Override
+    public boolean 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;
+    }
+}

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

@@ -16,46 +16,37 @@
 
 package com.lishid.openinv.internal.v1_5_R2;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
+// Volatile
 import net.minecraft.server.v1_5_R2.EntityPlayer;
 import net.minecraft.server.v1_5_R2.MinecraftServer;
 import net.minecraft.server.v1_5_R2.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_5_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
     @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(),
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
-                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 null;
-        return target;
     }
 
     @Override
@@ -63,39 +54,4 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    public static EntityPlayer getHandle(Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().f(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
 }

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

@@ -16,6 +16,7 @@
 
 package com.lishid.openinv.internal.v1_5_R2;
 
+// Volatile
 import net.minecraft.server.v1_5_R2.ContainerChest;
 import net.minecraft.server.v1_5_R2.EntityHuman;
 import net.minecraft.server.v1_5_R2.IInventory;
@@ -23,11 +24,13 @@ 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
+        inv = i2;
-        i2.g();
+        // close signal
+        inv.g();
     }
 
     @Override
@@ -41,5 +44,4 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried);
         }
     }
-
 }

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import net.minecraft.server.v1_5_R2.EntityPlayer;
+// Volatile
 import net.minecraft.server.v1_5_R2.IInventory;
 import net.minecraft.server.v1_5_R2.InventoryEnderChest;
 import net.minecraft.server.v1_5_R2.InventorySubcontainer;
@@ -41,18 +41,16 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
+    public boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(Player player, Boolean online) {
+    public SpecialEnderChest(Player p, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-                PlayerDataManager.getHandle(player).getEnderChest().c(),
+        CraftPlayer player = (CraftPlayer) p;
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        this.enderChest = player.getHandle().getEnderChest();
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.owner = player;
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -65,13 +63,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                owner = (CraftPlayer) player;
-                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
-                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -21,9 +21,11 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
+// Volatile
 import net.minecraft.server.v1_5_R2.ItemStack;
 import net.minecraft.server.v1_5_R2.PlayerInventory;
 
+import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -33,7 +35,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -47,7 +49,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -84,14 +86,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);
         }
 
@@ -105,14 +109,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);
         }
 
@@ -123,7 +129,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;
@@ -132,8 +139,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -143,14 +151,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);
         }
 
@@ -160,8 +170,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -171,14 +182,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);
         }
 
@@ -194,26 +207,23 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
+        else
-        return i + 9;
+            return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0) {
+        if (i == 0)
             return 3;
-        }
+        if (i == 1)
-        if (i == 1) {
             return 2;
-        }
+        if (i == 2)
-        if (i == 2) {
             return 1;
-        }
+        if (i == 3)
-        if (i == 3) {
             return 0;
-        }
+        else
-        return i;
+            return i;
     }
 
     @Override

OpenInvCraftbukkit1_5_R3/pom.xml

@@ -4,25 +4,29 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
+    <artifactId>openinvparent</artifactId>
-    <version>3.2.1</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinvadapter1_5_R3</artifactId>
+  <artifactId>OpenInvCraftbukkit1_5_R3</artifactId>
-  <name>OpenInvAdapter1_5_R3</name>
+  <name>OpenInvCraftbukkit1_5_R3</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcore</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.5.2-R1.0</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>3.2.1</version>
-    </dependency>
   </dependencies>
-
 </project>

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

@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_5_R3;
+
+import java.lang.reflect.Field;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+//Volatile
+import net.minecraft.server.v1_5_R3.AxisAlignedBB;
+import net.minecraft.server.v1_5_R3.EntityOcelot;
+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 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 activateContainer(Player p, 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 false;
+        }
+
+        int id = world.getTypeId(x, y, z);
+
+        if (world.getTypeId(x, y, z + 1) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+        } else if(world.getTypeId(x, y, z - 1) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        } else if (world.getTypeId(x + 1, y, z) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        } else if (world.getTypeId(x - 1, y, z) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+            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) chest).getName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(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 or ocelot on top
+        if (world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z))
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        // If block next to chest is chest and has a block or ocelot on top
+        return isBlockedChest(world, id, x - 1, y, z) || isBlockedChest(world, id, x + 1, y, z)
+                || isBlockedChest(world, id, x, y, z - 1) || isBlockedChest(world, id, x, y, z + 1);
+    }
+
+    private boolean isBlockedChest(World world, int id, int x, int y, int z) {
+        if (world.getTypeId(x, y, z) != id) {
+            return false;
+        }
+
+        if (world.t(x, y + 1, z)) {
+            return true;
+        }
+
+        return 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().a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @deprecated Use {@link #activateContainer(Player, boolean, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z) {
+        return !activateContainer(player, silentchest, x, y, z);
+    }
+
+    /**
+     * @deprecated Use {@link #isAnyContainerNeeded(Player, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z) {
+        return isAnyContainerNeeded(player, x, y, z);
+    }
+
+}

OpenInvCraftbukkit1_5_R3/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 com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_5_R3.IInventory;
+
+import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+    @Override
+    public boolean 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;
+    }
+}

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

@@ -16,46 +16,37 @@
 
 package com.lishid.openinv.internal.v1_5_R3;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
+// Volatile
 import net.minecraft.server.v1_5_R3.EntityPlayer;
 import net.minecraft.server.v1_5_R3.MinecraftServer;
 import net.minecraft.server.v1_5_R3.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_5_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
     @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(),
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
-                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 null;
-        return target;
     }
 
     @Override
@@ -63,39 +54,4 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    public static EntityPlayer getHandle(Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
 }

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

@@ -16,18 +16,21 @@
 
 package com.lishid.openinv.internal.v1_5_R3;
 
+// Volatile
 import net.minecraft.server.v1_5_R3.ContainerChest;
 import net.minecraft.server.v1_5_R3.EntityHuman;
 import net.minecraft.server.v1_5_R3.IInventory;
 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
+        inv = i2;
-        i2.g();
+        // close signal
+        inv.g();
     }
 
     @Override
@@ -41,5 +44,4 @@ public class SilentContainerChest extends ContainerChest {    public IInventory
             entityHuman.drop(carried);
         }
     }
-
 }

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import net.minecraft.server.v1_5_R3.EntityPlayer;
+// Volatile
 import net.minecraft.server.v1_5_R3.IInventory;
 import net.minecraft.server.v1_5_R3.InventoryEnderChest;
 import net.minecraft.server.v1_5_R3.InventorySubcontainer;
@@ -41,18 +41,16 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
+    public boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(Player player, Boolean online) {
+    public SpecialEnderChest(Player p, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-                PlayerDataManager.getHandle(player).getEnderChest().c(),
+        CraftPlayer player = (CraftPlayer) p;
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        this.enderChest = player.getHandle().getEnderChest();
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.owner = player;
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -65,13 +63,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                owner = (CraftPlayer) player;
-                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
-                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -21,9 +21,11 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
+// Volatile
 import net.minecraft.server.v1_5_R3.ItemStack;
 import net.minecraft.server.v1_5_R3.PlayerInventory;
 
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -33,7 +35,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -47,7 +49,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -84,14 +86,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);
         }
 
@@ -105,14 +109,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);
         }
 
@@ -123,7 +129,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;
@@ -132,8 +139,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -143,14 +151,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);
         }
 
@@ -160,8 +170,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -171,14 +182,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);
         }
 
@@ -194,26 +207,23 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
+        else
-        return i + 9;
+            return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0) {
+        if (i == 0)
             return 3;
-        }
+        if (i == 1)
-        if (i == 1) {
             return 2;
-        }
+        if (i == 2)
-        if (i == 2) {
             return 1;
-        }
+        if (i == 3)
-        if (i == 3) {
             return 0;
-        }
+        else
-        return i;
+            return i;
     }
 
     @Override

OpenInvCraftbukkit1_6_R1/pom.xml

@@ -4,25 +4,29 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
+    <artifactId>openinvparent</artifactId>
-    <version>3.2.1</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinvadapter1_6_R1</artifactId>
+  <artifactId>OpenInvCraftbukkit1_6_R1</artifactId>
-  <name>OpenInvAdapter1_6_R1</name>
+  <name>OpenInvCraftbukkit1_6_R1</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcore</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.6.1-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>3.2.1</version>
-    </dependency>
   </dependencies>
-
 </project>

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

@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_6_R1;
+
+import java.lang.reflect.Field;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_6_R1.AxisAlignedBB;
+import net.minecraft.server.v1_6_R1.EntityOcelot;
+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 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 activateContainer(Player p, 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 false;
+        }
+
+        int id = world.getTypeId(x, y, z);
+
+        if (world.getTypeId(x, y, z + 1) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+        } else if(world.getTypeId(x, y, z - 1) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        } else if (world.getTypeId(x + 1, y, z) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        } else if (world.getTypeId(x - 1, y, z) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+            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) chest).getName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(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 or ocelot on top
+        if (world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z))
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        // If block next to chest is chest and has a block or ocelot on top
+        return isBlockedChest(world, id, x - 1, y, z) || isBlockedChest(world, id, x + 1, y, z)
+                || isBlockedChest(world, id, x, y, z - 1) || isBlockedChest(world, id, x, y, z + 1);
+    }
+
+    private boolean isBlockedChest(World world, int id, int x, int y, int z) {
+        if (world.getTypeId(x, y, z) != id) {
+            return false;
+        }
+
+        if (world.t(x, y + 1, z)) {
+            return true;
+        }
+
+        return 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().a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @deprecated Use {@link #activateContainer(Player, boolean, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z) {
+        return !activateContainer(player, silentchest, x, y, z);
+    }
+
+    /**
+     * @deprecated Use {@link #isAnyContainerNeeded(Player, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z) {
+        return isAnyContainerNeeded(player, x, y, z);
+    }
+
+}

OpenInvCraftbukkit1_6_R1/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 com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_6_R1.IInventory;
+
+import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+    @Override
+    public boolean 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;
+    }
+}

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

@@ -16,46 +16,37 @@
 
 package com.lishid.openinv.internal.v1_6_R1;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
+// Volatile
 import net.minecraft.server.v1_6_R1.EntityPlayer;
 import net.minecraft.server.v1_6_R1.MinecraftServer;
 import net.minecraft.server.v1_6_R1.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_6_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
     @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(),
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
-                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 null;
-        return target;
     }
 
     @Override
@@ -63,39 +54,4 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    public static EntityPlayer getHandle(Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
 }

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

@@ -16,6 +16,7 @@
 
 package com.lishid.openinv.internal.v1_6_R1;
 
+// Volatile
 import net.minecraft.server.v1_6_R1.ContainerChest;
 import net.minecraft.server.v1_6_R1.EntityHuman;
 import net.minecraft.server.v1_6_R1.IInventory;
@@ -23,11 +24,13 @@ 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
+        inv = i2;
-        i2.g();
+        // close signal
+        inv.g();
     }
 
     @Override
@@ -41,5 +44,4 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried);
         }
     }
-
 }

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import net.minecraft.server.v1_6_R1.EntityPlayer;
+// Volatile
 import net.minecraft.server.v1_6_R1.IInventory;
 import net.minecraft.server.v1_6_R1.InventoryEnderChest;
 import net.minecraft.server.v1_6_R1.InventorySubcontainer;
@@ -41,18 +41,16 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
+    public boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(Player player, Boolean online) {
+    public SpecialEnderChest(Player p, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-                PlayerDataManager.getHandle(player).getEnderChest().c(),
+        CraftPlayer player = (CraftPlayer) p;
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        this.enderChest = player.getHandle().getEnderChest();
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.owner = player;
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -65,13 +63,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                owner = (CraftPlayer) player;
-                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
-                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -21,9 +21,11 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
+// Volatile
 import net.minecraft.server.v1_6_R1.ItemStack;
 import net.minecraft.server.v1_6_R1.PlayerInventory;
 
+import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -33,7 +35,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -47,7 +49,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -84,14 +86,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);
         }
 
@@ -105,14 +109,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);
         }
 
@@ -123,7 +129,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;
@@ -132,8 +139,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -143,14 +151,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);
         }
 
@@ -160,8 +170,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -171,14 +182,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);
         }
 
@@ -194,26 +207,23 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
+        else
-        return i + 9;
+            return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0) {
+        if (i == 0)
             return 3;
-        }
+        if (i == 1)
-        if (i == 1) {
             return 2;
-        }
+        if (i == 2)
-        if (i == 2) {
             return 1;
-        }
+        if (i == 3)
-        if (i == 3) {
             return 0;
-        }
+        else
-        return i;
+            return i;
     }
 
     @Override

OpenInvCraftbukkit1_6_R2/pom.xml

@@ -4,25 +4,29 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
+    <artifactId>openinvparent</artifactId>
-    <version>3.2.1</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinvadapter1_6_R2</artifactId>
+  <artifactId>OpenInvCraftbukkit1_6_R2</artifactId>
-  <name>OpenInvAdapter1_6_R2</name>
+  <name>OpenInvCraftbukkit1_6_R2</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcore</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.6.2-R1.0</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>3.2.1</version>
-    </dependency>
   </dependencies>
-
 </project>

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

@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_6_R2;
+
+import java.lang.reflect.Field;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_6_R2.AxisAlignedBB;
+import net.minecraft.server.v1_6_R2.EntityOcelot;
+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 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 activateContainer(Player p, 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 false;
+        }
+
+        int id = world.getTypeId(x, y, z);
+
+        if (world.getTypeId(x, y, z + 1) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+        } else if(world.getTypeId(x, y, z - 1) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        } else if (world.getTypeId(x + 1, y, z) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        } else if (world.getTypeId(x - 1, y, z) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+            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) chest).getName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(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 or ocelot on top
+        if (world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z))
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        // If block next to chest is chest and has a block or ocelot on top
+        return isBlockedChest(world, id, x - 1, y, z) || isBlockedChest(world, id, x + 1, y, z)
+                || isBlockedChest(world, id, x, y, z - 1) || isBlockedChest(world, id, x, y, z + 1);
+    }
+
+    private boolean isBlockedChest(World world, int id, int x, int y, int z) {
+        if (world.getTypeId(x, y, z) != id) {
+            return false;
+        }
+
+        if (world.t(x, y + 1, z)) {
+            return true;
+        }
+
+        return 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().a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @deprecated Use {@link #activateContainer(Player, boolean, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z) {
+        return !activateContainer(player, silentchest, x, y, z);
+    }
+
+    /**
+     * @deprecated Use {@link #isAnyContainerNeeded(Player, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z) {
+        return isAnyContainerNeeded(player, x, y, z);
+    }
+
+}

OpenInvCraftbukkit1_6_R2/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 com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_6_R2.IInventory;
+
+import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+    @Override
+    public boolean 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;
+    }
+}

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

@@ -16,46 +16,37 @@
 
 package com.lishid.openinv.internal.v1_6_R2;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
+// Volatile
 import net.minecraft.server.v1_6_R2.EntityPlayer;
 import net.minecraft.server.v1_6_R2.MinecraftServer;
 import net.minecraft.server.v1_6_R2.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_6_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
     @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(),
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
-                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 null;
-        return target;
     }
 
     @Override
@@ -63,39 +54,4 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    public static EntityPlayer getHandle(Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
 }

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

@@ -16,6 +16,7 @@
 
 package com.lishid.openinv.internal.v1_6_R2;
 
+// Volatile
 import net.minecraft.server.v1_6_R2.ContainerChest;
 import net.minecraft.server.v1_6_R2.EntityHuman;
 import net.minecraft.server.v1_6_R2.IInventory;
@@ -23,11 +24,13 @@ 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
+        inv = i2;
-        i2.g();
+        // close signal
+        inv.g();
     }
 
     @Override
@@ -41,5 +44,4 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried);
         }
     }
-
 }

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import net.minecraft.server.v1_6_R2.EntityPlayer;
+// Volatile
 import net.minecraft.server.v1_6_R2.IInventory;
 import net.minecraft.server.v1_6_R2.InventoryEnderChest;
 import net.minecraft.server.v1_6_R2.InventorySubcontainer;
@@ -41,18 +41,16 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
+    public boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(Player player, Boolean online) {
+    public SpecialEnderChest(Player p, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-                PlayerDataManager.getHandle(player).getEnderChest().c(),
+        CraftPlayer player = (CraftPlayer) p;
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        this.enderChest = player.getHandle().getEnderChest();
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.owner = player;
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -65,13 +63,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                owner = (CraftPlayer) player;
-                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
-                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -21,9 +21,11 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
+// Volatile
 import net.minecraft.server.v1_6_R2.ItemStack;
 import net.minecraft.server.v1_6_R2.PlayerInventory;
 
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -33,7 +35,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -47,7 +49,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -84,14 +86,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);
         }
 
@@ -105,14 +109,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);
         }
 
@@ -123,7 +129,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;
@@ -132,8 +139,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -143,14 +151,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);
         }
 
@@ -160,8 +170,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -171,14 +182,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);
         }
 
@@ -194,26 +207,23 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
+        else
-        return i + 9;
+            return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0) {
+        if (i == 0)
             return 3;
-        }
+        if (i == 1)
-        if (i == 1) {
             return 2;
-        }
+        if (i == 2)
-        if (i == 2) {
             return 1;
-        }
+        if (i == 3)
-        if (i == 3) {
             return 0;
-        }
+        else
-        return i;
+            return i;
     }
 
     @Override

OpenInvCraftbukkit1_6_R3/pom.xml

@@ -4,25 +4,29 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
+    <artifactId>openinvparent</artifactId>
-    <version>3.2.1</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinvadapter1_6_R3</artifactId>
+  <artifactId>OpenInvCraftbukkit1_6_R3</artifactId>
-  <name>OpenInvAdapter1_6_R3</name>
+  <name>OpenInvCraftbukkit1_6_R3</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcore</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.6.4-R2.0</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>3.2.1</version>
-    </dependency>
   </dependencies>
-
 </project>

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

@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_6_R3;
+
+import java.lang.reflect.Field;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_6_R3.AxisAlignedBB;
+import net.minecraft.server.v1_6_R3.EntityOcelot;
+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 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 activateContainer(Player p, 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 false;
+        }
+
+        int id = world.getTypeId(x, y, z);
+
+        if (world.getTypeId(x, y, z + 1) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+        } else if(world.getTypeId(x, y, z - 1) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        } else if (world.getTypeId(x + 1, y, z) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        } else if (world.getTypeId(x - 1, y, z) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+            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) chest).getName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(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 or ocelot on top
+        if (world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z))
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        // If block next to chest is chest and has a block or ocelot on top
+        return isBlockedChest(world, id, x - 1, y, z) || isBlockedChest(world, id, x + 1, y, z)
+                || isBlockedChest(world, id, x, y, z - 1) || isBlockedChest(world, id, x, y, z + 1);
+    }
+
+    private boolean isBlockedChest(World world, int id, int x, int y, int z) {
+        if (world.getTypeId(x, y, z) != id) {
+            return false;
+        }
+
+        if (world.t(x, y + 1, z)) {
+            return true;
+        }
+
+        return 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().a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @deprecated Use {@link #activateContainer(Player, boolean, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z) {
+        return !activateContainer(player, silentchest, x, y, z);
+    }
+
+    /**
+     * @deprecated Use {@link #isAnyContainerNeeded(Player, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z) {
+        return isAnyContainerNeeded(player, x, y, z);
+    }
+
+}

OpenInvCraftbukkit1_6_R3/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 com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_6_R3.IInventory;
+
+import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+    @Override
+    public boolean 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;
+    }
+}

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

@@ -16,46 +16,37 @@
 
 package com.lishid.openinv.internal.v1_6_R3;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
+// Volatile
 import net.minecraft.server.v1_6_R3.EntityPlayer;
 import net.minecraft.server.v1_6_R3.MinecraftServer;
 import net.minecraft.server.v1_6_R3.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
     @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(),
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
-                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 null;
-        return target;
     }
 
     @Override
@@ -63,39 +54,4 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    public static EntityPlayer getHandle(Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
 }

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

@@ -16,6 +16,7 @@
 
 package com.lishid.openinv.internal.v1_6_R3;
 
+// Volatile
 import net.minecraft.server.v1_6_R3.ContainerChest;
 import net.minecraft.server.v1_6_R3.EntityHuman;
 import net.minecraft.server.v1_6_R3.IInventory;
@@ -23,11 +24,13 @@ 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
+        inv = i2;
-        i2.g();
+        // close signal
+        inv.g();
     }
 
     @Override
@@ -41,5 +44,4 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried);
         }
     }
-
 }

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import net.minecraft.server.v1_6_R3.EntityPlayer;
+// Volatile
 import net.minecraft.server.v1_6_R3.IInventory;
 import net.minecraft.server.v1_6_R3.InventoryEnderChest;
 import net.minecraft.server.v1_6_R3.InventorySubcontainer;
@@ -41,18 +41,16 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
+    public boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(Player player, Boolean online) {
+    public SpecialEnderChest(Player p, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-                PlayerDataManager.getHandle(player).getEnderChest().c(),
+        CraftPlayer player = (CraftPlayer) p;
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        this.enderChest = player.getHandle().getEnderChest();
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.owner = player;
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -65,13 +63,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                owner = (CraftPlayer) player;
-                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
-                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -21,9 +21,11 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
+// Volatile
 import net.minecraft.server.v1_6_R3.ItemStack;
 import net.minecraft.server.v1_6_R3.PlayerInventory;
 
+import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -33,7 +35,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -47,7 +49,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -84,14 +86,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);
         }
 
@@ -105,14 +109,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);
         }
 
@@ -123,7 +129,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;
@@ -132,8 +139,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -143,14 +151,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);
         }
 
@@ -160,8 +170,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -171,14 +182,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);
         }
 

OpenInvCraftbukkit1_7_R1/pom.xml

@@ -4,25 +4,29 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
+    <artifactId>openinvparent</artifactId>
-    <version>3.2.1</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinvadapter1_7_R1</artifactId>
+  <artifactId>OpenInvCraftbukkit1_7_R1</artifactId>
-  <name>OpenInvAdapter1_7_R1</name>
+  <name>OpenInvCraftbukkit1_7_R1</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcore</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.7.2-R0.4</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>3.2.1</version>
-    </dependency>
   </dependencies>
-
 </project>

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

@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_7_R1;
+
+import java.lang.reflect.Field;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+//Volatile
+import net.minecraft.server.v1_7_R1.AxisAlignedBB;
+import net.minecraft.server.v1_7_R1.Block;
+import net.minecraft.server.v1_7_R1.EntityOcelot;
+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 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 activateContainer(Player p, 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 false;
+        }
+
+        int id = Block.b(world.getType(x, y, z));
+
+        if (Block.b(world.getType(x, y, z + 1)) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+        } else if(Block.b(world.getType(x, y, z - 1)) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        } else if (Block.b(world.getType(x + 1, y, z)) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        } else if (Block.b(world.getType(x - 1, y, z)) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = 0;
+                try {
+                    Field windowID = player.getClass().getDeclaredField("containerCounter");
+                    windowID.setAccessible(true);
+                    windowId = windowID.getInt(player);
+                    windowId = windowId % 100 + 1;
+                    windowID.setInt(player, windowId);
+                } catch (NoSuchFieldException e) {}
+
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) chest).getInventoryName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(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 or ocelot on top
+        if (world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z))
+            return true;
+
+        int id = Block.b(world.getType(x, y, z));
+
+        // If block next to chest is chest and has a block or ocelot on top
+        return isBlockedChest(world, id, x - 1, y, z) || isBlockedChest(world, id, x + 1, y, z)
+                || isBlockedChest(world, id, x, y, z - 1) || isBlockedChest(world, id, x, y, z + 1);
+    }
+
+    private boolean isBlockedChest(World world, int id, int x, int y, int z) {
+        if (Block.b(world.getType(x, y, z)) != id) {
+            return false;
+        }
+
+        if (world.t(x, y + 1, z)) {
+            return true;
+        }
+
+        return 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().a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @deprecated Use {@link #activateContainer(Player, boolean, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z) {
+        return !activateContainer(player, silentchest, x, y, z);
+    }
+
+    /**
+     * @deprecated Use {@link #isAnyContainerNeeded(Player, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z) {
+        return isAnyContainerNeeded(player, x, y, z);
+    }
+
+}

OpenInvCraftbukkit1_7_R1/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 com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_7_R1.IInventory;
+
+import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+    @Override
+    public boolean 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;
+    }
+}

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

@@ -16,47 +16,39 @@
 
 package com.lishid.openinv.internal.v1_7_R1;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
+// Volatile
 import net.minecraft.server.v1_7_R1.EntityPlayer;
 import net.minecraft.server.v1_7_R1.MinecraftServer;
 import net.minecraft.server.v1_7_R1.PlayerInteractManager;
 import net.minecraft.util.com.mojang.authlib.GameProfile;
 
 import org.bukkit.craftbukkit.v1_7_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
     @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 null;
-        return target;
     }
 
     @Override
@@ -64,39 +56,4 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    public static EntityPlayer getHandle(Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
 }

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

@@ -16,6 +16,7 @@
 
 package com.lishid.openinv.internal.v1_7_R1;
 
+// Volatile
 import net.minecraft.server.v1_7_R1.ContainerChest;
 import net.minecraft.server.v1_7_R1.EntityHuman;
 import net.minecraft.server.v1_7_R1.IInventory;
@@ -23,11 +24,13 @@ 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
+        inv = i2;
-        i2.l_();
+        // close signal
+        inv.l_();
     }
 
     @Override
@@ -41,5 +44,4 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried, false);
         }
     }
-
 }

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import net.minecraft.server.v1_7_R1.EntityPlayer;
+// Volatile
 import net.minecraft.server.v1_7_R1.IInventory;
 import net.minecraft.server.v1_7_R1.InventoryEnderChest;
 import net.minecraft.server.v1_7_R1.InventorySubcontainer;
@@ -41,18 +41,16 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
+    public boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(Player player, Boolean online) {
+    public SpecialEnderChest(Player p, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getInventoryName(),
+        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-                PlayerDataManager.getHandle(player).getEnderChest().k_(),
+        CraftPlayer player = (CraftPlayer) p;
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        this.enderChest = player.getHandle().getEnderChest();
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.owner = player;
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -65,13 +63,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                owner = (CraftPlayer) player;
-                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
-                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
             playerOnline = true;
         }
     }
@@ -126,5 +124,4 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         super.update();
         enderChest.update();
     }
-
 }

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

@@ -21,9 +21,11 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
+// Volatile
 import net.minecraft.server.v1_7_R1.ItemStack;
 import net.minecraft.server.v1_7_R1.PlayerInventory;
 
+import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -33,7 +35,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -47,7 +49,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -84,14 +86,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);
         }
 
@@ -105,14 +109,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);
         }
 
@@ -123,7 +129,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;
@@ -132,8 +139,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -143,14 +151,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);
         }
 
@@ -160,8 +170,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -171,14 +182,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);
         }
 
@@ -194,26 +207,23 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
+        else
-        return i + 9;
+            return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0) {
+        if (i == 0)
             return 3;
-        }
+        if (i == 1)
-        if (i == 1) {
             return 2;
-        }
+        if (i == 2)
-        if (i == 2) {
             return 1;
-        }
+        if (i == 3)
-        if (i == 3) {
             return 0;
-        }
+        else
-        return i;
+            return i;
     }
 
     @Override

OpenInvCraftbukkit1_7_R2/pom.xml

@@ -4,25 +4,29 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
+    <artifactId>openinvparent</artifactId>
-    <version>3.2.1</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinvadapter1_7_R2</artifactId>
+  <artifactId>OpenInvCraftbukkit1_7_R2</artifactId>
-  <name>OpenInvAdapter1_7_R2</name>
+  <name>OpenInvCraftbukkit1_7_R2</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcore</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.7.5-R0.1</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>3.2.1</version>
-    </dependency>
   </dependencies>
-
 </project>

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

@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_7_R2;
+
+import java.lang.reflect.Field;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+//Volatile
+import net.minecraft.server.v1_7_R2.AxisAlignedBB;
+import net.minecraft.server.v1_7_R2.Block;
+import net.minecraft.server.v1_7_R2.EntityOcelot;
+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 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 activateContainer(Player p, 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 false;
+        }
+
+        int id = Block.b(world.getType(x, y, z));
+
+        if (Block.b(world.getType(x, y, z + 1)) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+        } else if(Block.b(world.getType(x, y, z - 1)) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        } else if (Block.b(world.getType(x + 1, y, z)) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        } else if (Block.b(world.getType(x - 1, y, z)) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = 0;
+                try {
+                    Field windowID = player.getClass().getDeclaredField("containerCounter");
+                    windowID.setAccessible(true);
+                    windowId = windowID.getInt(player);
+                    windowId = windowId % 100 + 1;
+                    windowID.setInt(player, windowId);
+                } catch (NoSuchFieldException e) {}
+
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) chest).getInventoryName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(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 or ocelot on top
+        if (world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z))
+            return true;
+
+        int id = Block.b(world.getType(x, y, z));
+
+        // If block next to chest is chest and has a block or ocelot on top
+        return isBlockedChest(world, id, x - 1, y, z) || isBlockedChest(world, id, x + 1, y, z)
+                || isBlockedChest(world, id, x, y, z - 1) || isBlockedChest(world, id, x, y, z + 1);
+    }
+
+    private boolean isBlockedChest(World world, int id, int x, int y, int z) {
+        if (Block.b(world.getType(x, y, z)) != id) {
+            return false;
+        }
+
+        if (world.t(x, y + 1, z)) {
+            return true;
+        }
+
+        return 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;
+    }
+
+    /**
+     * @deprecated Use {@link #activateContainer(Player, boolean, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z) {
+        return !activateContainer(player, silentchest, x, y, z);
+    }
+
+    /**
+     * @deprecated Use {@link #isAnyContainerNeeded(Player, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z) {
+        return isAnyContainerNeeded(player, x, y, z);
+    }
+
+}

OpenInvCraftbukkit1_7_R2/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 com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_7_R2.IInventory;
+
+import org.bukkit.craftbukkit.v1_7_R2.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+    @Override
+    public boolean 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;
+    }
+}

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

@@ -16,48 +16,40 @@
 
 package com.lishid.openinv.internal.v1_7_R2;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
+//Volatile
 import net.minecraft.server.v1_7_R2.EntityPlayer;
 import net.minecraft.server.v1_7_R2.MinecraftServer;
 import net.minecraft.server.v1_7_R2.PlayerInteractManager;
 import net.minecraft.util.com.mojang.authlib.GameProfile;
 
 import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
 
 @SuppressWarnings("deprecation") // Deprecated methods are used properly and will not change.
 public class PlayerDataManager implements IPlayerDataManager {
 
     @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 null;
-        return target;
     }
 
     @Override
@@ -65,39 +57,4 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
-    @Override
-    public OfflinePlayer getPlayerByID(String identifier) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
-        // Ensure player is a real player, otherwise return null
-        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
-            return null;
-        }
-        return player;
-    }
-
-    @Override
-    public Collection<? extends Player> getOnlinePlayers() {
-        return Arrays.asList(Bukkit.getOnlinePlayers());
-    }
-
-    public static EntityPlayer getHandle(Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        EntityPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
-        }
-
-        return nmsPlayer;
-    }
-
 }

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

@@ -16,6 +16,7 @@
 
 package com.lishid.openinv.internal.v1_7_R2;
 
+// Volatile
 import net.minecraft.server.v1_7_R2.ContainerChest;
 import net.minecraft.server.v1_7_R2.EntityHuman;
 import net.minecraft.server.v1_7_R2.IInventory;
@@ -23,11 +24,13 @@ 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
+        inv = i2;
-        i2.l_();
+        // close signal
+        inv.l_();
     }
 
     @Override
@@ -41,5 +44,4 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried, false);
         }
     }
-
 }

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import net.minecraft.server.v1_7_R2.EntityPlayer;
+// Volatile
 import net.minecraft.server.v1_7_R2.IInventory;
 import net.minecraft.server.v1_7_R2.InventoryEnderChest;
 import net.minecraft.server.v1_7_R2.InventorySubcontainer;
@@ -41,18 +41,16 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
+    public boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(Player player, Boolean online) {
+    public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) player).getHandle().getEnderChest().getInventoryName(),
+        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-                ((CraftPlayer) player).getHandle().getEnderChest().k_(),
+        CraftPlayer player = (CraftPlayer) p;
-                ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        this.enderChest = player.getHandle().getEnderChest();
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.owner = player;
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -65,13 +63,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                owner = (CraftPlayer) player;
-                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
-                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -21,9 +21,11 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
+// Volatile
 import net.minecraft.server.v1_7_R2.ItemStack;
 import net.minecraft.server.v1_7_R2.PlayerInventory;
 
+import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R2.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -33,7 +35,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private boolean playerOnline = false;
 
     public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
-        super(PlayerDataManager.getHandle(bukkitPlayer));
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -47,7 +49,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            this.player = PlayerDataManager.getHandle(player);
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -84,14 +86,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);
         }
 
@@ -105,14 +109,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);
         }
 
@@ -123,7 +129,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;
@@ -132,8 +139,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -143,14 +151,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);
         }
 
@@ -160,8 +170,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-
+        else {
-        return null;
+            return null;
+        }
     }
 
     @Override
@@ -171,14 +182,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);
         }
 
@@ -194,26 +207,23 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private int getReversedItemSlotNum(int i) {
-        if (i >= 27) {
+        if (i >= 27)
             return i - 27;
-        }
+        else
-        return i + 9;
+            return i + 9;
     }
 
     private int getReversedArmorSlotNum(int i) {
-        if (i == 0) {
+        if (i == 0)
             return 3;
-        }
+        if (i == 1)
-        if (i == 1) {
             return 2;
-        }
+        if (i == 2)
-        if (i == 2) {
             return 1;
-        }
+        if (i == 3)
-        if (i == 3) {
             return 0;
-        }
+        else
-        return i;
+            return i;
     }
 
     @Override

OpenInvCraftbukkit1_7_R3/pom.xml

@@ -4,25 +4,29 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvinternal</artifactId>
+    <artifactId>openinvparent</artifactId>
-    <version>3.2.1</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinvadapter1_7_R3</artifactId>
+  <artifactId>OpenInvCraftbukkit1_7_R3</artifactId>
-  <name>OpenInvAdapter1_7_R3</name>
+  <name>OpenInvCraftbukkit1_7_R3</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcore</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvplugin</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
       <version>1.7.9-R0.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvcommon</artifactId>
-      <version>3.2.1</version>
-    </dependency>
   </dependencies>
-
 </project>

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

@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_7_R3;
+
+import java.lang.reflect.Field;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_7_R3.AxisAlignedBB;
+import net.minecraft.server.v1_7_R3.Block;
+import net.minecraft.server.v1_7_R3.EntityOcelot;
+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 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 activateContainer(Player p, 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 false;
+        }
+
+        int id = Block.b(world.getType(x, y, z));
+
+        if (Block.b(world.getType(x, y, z + 1)) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+        } else if(Block.b(world.getType(x, y, z - 1)) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        } else if (Block.b(world.getType(x + 1, y, z)) == id) {
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        } else if (Block.b(world.getType(x - 1, y, z)) == id) {
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = 0;
+                try {
+                    Field windowID = player.getClass().getDeclaredField("containerCounter");
+                    windowID.setAccessible(true);
+                    windowId = windowID.getInt(player);
+                    windowId = windowId % 100 + 1;
+                    windowID.setInt(player, windowId);
+                } catch (NoSuchFieldException e) {}
+
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) chest).getInventoryName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                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;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(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 or ocelot on top
+        if (world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z))
+            return true;
+
+        int id = Block.b(world.getType(x, y, z));
+
+        // If block next to chest is chest and has a block or ocelot on top
+        return isBlockedChest(world, id, x - 1, y, z) || isBlockedChest(world, id, x + 1, y, z)
+                || isBlockedChest(world, id, x, y, z - 1) || isBlockedChest(world, id, x, y, z + 1);
+    }
+
+    private boolean isBlockedChest(World world, int id, int x, int y, int z) {
+        if (Block.b(world.getType(x, y, z)) != id) {
+            return false;
+        }
+
+        if (world.t(x, y + 1, z)) {
+            return true;
+        }
+
+        return 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;
+    }
+
+    /**
+     * @deprecated Use {@link #activateContainer(Player, boolean, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z) {
+        return !activateContainer(player, silentchest, x, y, z);
+    }
+
+    /**
+     * @deprecated Use {@link #isAnyContainerNeeded(Player, int, int, int)}.
+     */
+    @Deprecated
+    @Override
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z) {
+        return isAnyContainerNeeded(player, x, y, z);
+    }
+
+}

OpenInvCraftbukkit1_7_R3/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 com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_7_R3.IInventory;
+
+import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+    @Override
+    public boolean 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;
+    }
+}

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

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

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

@@ -16,6 +16,7 @@
 
 package com.lishid.openinv.internal.v1_7_R3;
 
+// Volatile
 import net.minecraft.server.v1_7_R3.ContainerChest;
 import net.minecraft.server.v1_7_R3.EntityHuman;
 import net.minecraft.server.v1_7_R3.IInventory;
@@ -23,10 +24,13 @@ import net.minecraft.server.v1_7_R3.ItemStack;
 import net.minecraft.server.v1_7_R3.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
+    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        i2.l_();
+        inv = i2;
+        // close signal
+        inv.l_();
     }
 
     @Override
@@ -40,5 +44,4 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried, false);
         }
     }
-
 }

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

@@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import net.minecraft.server.v1_7_R3.EntityPlayer;
+// Volatile
 import net.minecraft.server.v1_7_R3.IInventory;
 import net.minecraft.server.v1_7_R3.InventoryEnderChest;
 import net.minecraft.server.v1_7_R3.InventorySubcontainer;
@@ -41,18 +41,16 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    private boolean playerOnline = false;
+    public boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
-    public SpecialEnderChest(Player player, Boolean online) {
+    public SpecialEnderChest(Player p, Boolean online) {
-        super(PlayerDataManager.getHandle(player).getEnderChest().getInventoryName(),
+        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-                PlayerDataManager.getHandle(player).getEnderChest().k_(),
+        CraftPlayer player = (CraftPlayer) p;
-                PlayerDataManager.getHandle(player).getEnderChest().getSize());
+        this.enderChest = player.getHandle().getEnderChest();
-        EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+        this.owner = player;
-        this.enderChest = nmsPlayer.getEnderChest();
-        this.owner = nmsPlayer.getBukkitEntity();
         this.items = enderChest.getContents();
     }
 
@@ -65,13 +63,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                owner = (CraftPlayer) player;
-                this.owner = nmsPlayer.getBukkitEntity();
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
-                InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            } catch (Exception e) {}
+            }
+            catch (Exception e) {}
             playerOnline = true;
         }
     }