Clarify the current state of OpenInv

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

OpenInv/pom.xml

@@ -3,13 +3,12 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
+    <artifactId>openinvparent-jikoo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinv</artifactId>
+  <artifactId>openinv-jikoo</artifactId>
   <name>OpenInv</name>
-  <version>2.5.4</version>
 
   <profiles>
 
@@ -18,7 +17,7 @@
       <dependencies>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_11_R1</artifactId>
+          <artifactId>openinvcraftbukkit1_11_R1-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
       </dependencies>
@@ -29,42 +28,42 @@
       <dependencies>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_7_R4</artifactId>
+          <artifactId>openinvcraftbukkit1_7_R4-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_8_R1</artifactId>
+          <artifactId>openinvcraftbukkit1_8_R1-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_8_R2</artifactId>
+          <artifactId>openinvcraftbukkit1_8_R2-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_8_R3</artifactId>
+          <artifactId>openinvcraftbukkit1_8_R3-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_9_R1</artifactId>
+          <artifactId>openinvcraftbukkit1_9_R1-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_9_R2</artifactId>
+          <artifactId>openinvcraftbukkit1_9_R2-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_10_R1</artifactId>
+          <artifactId>openinvcraftbukkit1_10_R1-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_11_R1</artifactId>
+          <artifactId>openinvcraftbukkit1_11_R1-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
       </dependencies>
@@ -75,97 +74,97 @@
       <dependencies>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_4_5</artifactId>
+          <artifactId>openinvcraftbukkit1_4_5-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_4_6</artifactId>
+          <artifactId>openinvcraftbukkit1_4_6-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_4_R1</artifactId>
+          <artifactId>openinvcraftbukkit1_4_R1-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_5_R2</artifactId>
+          <artifactId>openinvcraftbukkit1_5_R2-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_5_R3</artifactId>
+          <artifactId>openinvcraftbukkit1_5_R3-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_6_R1</artifactId>
+          <artifactId>openinvcraftbukkit1_6_R1-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_6_R2</artifactId>
+          <artifactId>openinvcraftbukkit1_6_R2-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_6_R3</artifactId>
+          <artifactId>openinvcraftbukkit1_6_R3-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_7_R1</artifactId>
+          <artifactId>openinvcraftbukkit1_7_R1-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_7_R2</artifactId>
+          <artifactId>openinvcraftbukkit1_7_R2-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_7_R3</artifactId>
+          <artifactId>openinvcraftbukkit1_7_R3-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_7_R4</artifactId>
+          <artifactId>openinvcraftbukkit1_7_R4-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_8_R1</artifactId>
+          <artifactId>openinvcraftbukkit1_8_R1-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_8_R2</artifactId>
+          <artifactId>openinvcraftbukkit1_8_R2-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_8_R3</artifactId>
+          <artifactId>openinvcraftbukkit1_8_R3-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_9_R1</artifactId>
+          <artifactId>openinvcraftbukkit1_9_R1-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_9_R2</artifactId>
+          <artifactId>openinvcraftbukkit1_9_R2-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_10_R1</artifactId>
+          <artifactId>openinvcraftbukkit1_10_R1-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>com.lishid</groupId>
-          <artifactId>openinvcraftbukkit1_11_R1</artifactId>
+          <artifactId>openinvcraftbukkit1_11_R1-jikoo</artifactId>
           <version>1.0-SNAPSHOT</version>
         </dependency>
       </dependencies>
@@ -175,45 +174,6 @@
   <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/src/main/java/com/lishid/openinv/internal/IAnySilentChest.java

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

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

OpenInvCraftbukkit1_10_R1/pom.xml

@@ -4,22 +4,17 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
+    <artifactId>openinvparent-jikoo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>OpenInvCraftbukkit1_10_R1</artifactId>
+  <artifactId>openinvcraftbukkit1_10_R1-jikoo</artifactId>
   <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>
+      <artifactId>openinvplugin-jikoo</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

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

@@ -25,15 +25,23 @@ import org.bukkit.entity.Player;
 // Volatile
 import net.minecraft.server.v1_10_R1.AxisAlignedBB;
 import net.minecraft.server.v1_10_R1.Block;
+import net.minecraft.server.v1_10_R1.BlockChest;
+import net.minecraft.server.v1_10_R1.BlockChest.Type;
+import net.minecraft.server.v1_10_R1.BlockEnderChest;
 import net.minecraft.server.v1_10_R1.BlockPosition;
 import net.minecraft.server.v1_10_R1.Entity;
 import net.minecraft.server.v1_10_R1.EntityOcelot;
 import net.minecraft.server.v1_10_R1.EntityPlayer;
+import net.minecraft.server.v1_10_R1.EnumDirection;
 import net.minecraft.server.v1_10_R1.IInventory;
 import net.minecraft.server.v1_10_R1.ITileInventory;
+import net.minecraft.server.v1_10_R1.InventoryEnderChest;
 import net.minecraft.server.v1_10_R1.InventoryLargeChest;
 import net.minecraft.server.v1_10_R1.PacketPlayOutOpenWindow;
+import net.minecraft.server.v1_10_R1.StatisticList;
+import net.minecraft.server.v1_10_R1.TileEntity;
 import net.minecraft.server.v1_10_R1.TileEntityChest;
+import net.minecraft.server.v1_10_R1.TileEntityEnderChest;
 import net.minecraft.server.v1_10_R1.World;
 
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
@@ -46,36 +54,142 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, int x, int y, int z) {
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block b) {
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = world.getTileEntity(new BlockPosition(x, y, z));
+        BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
+        Block block = world.getType(blockPosition).getBlock();
 
-        if (chest == null) {
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.getType(blockPosition.up()).m();
+        }
+
+        // Check if chest is blocked or has an ocelot on top
+        if (isBlockedChest(world, blockPosition)) {
+            return true;
+        }
+
+        // Check for matching adjacent chests that are blocked or have an ocelot on top
+        for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
+            BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
+            Block localBlock = world.getType(localBlockPosition).getBlock();
+
+            if (localBlock != block) {
+                continue;
+            }
+
+            TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
+            if (!(localTileEntity instanceof TileEntityChest)) {
+                continue;
+            }
+
+            if (isBlockedChest(world, localBlockPosition)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, BlockPosition blockPosition) {
+        // For reference, loot at net.minecraft.server.BlockChest
+        return world.getType(blockPosition.up()).l() || hasOcelotOnTop(world, blockPosition);
+    }
+
+    private boolean hasOcelotOnTop(World world, BlockPosition blockPosition) {
+        for (Entity localEntity : world.a(EntityOcelot.class,
+                new AxisAlignedBB(blockPosition.getX(), blockPosition.getY() + 1,
+                        blockPosition.getZ(), blockPosition.getX() + 1, blockPosition.getY() + 2,
+                        blockPosition.getZ() + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block b) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is pretty much API-only
+        if (silentchest && b.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            player.b(StatisticList.X);
+            return true;
+        }
+
+        World world = player.world;
+        BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
+        Object tile = world.getTileEntity(blockPosition);
+
+        if (tile == null) {
             return false;
         }
 
-        int id = Block.getId(world.getType(new BlockPosition(x, y, z)).getBlock());
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            player.b(StatisticList.X);
+            return true;
+        }
 
-        if (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);
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        Block block = world.getType(blockPosition).getBlock();
+
+        if (block instanceof BlockChest) {
+            for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
+                BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
+                Block localBlock = world.getType(localBlockPosition).getBlock();
+
+                if (localBlock != block) {
+                    continue;
+                }
+
+                TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
+                if (!(localTileEntity instanceof TileEntityChest)) {
+                    continue;
+                }
+
+                if ((localEnumDirection == EnumDirection.WEST) || (localEnumDirection == EnumDirection.NORTH)) {
+                    tile = new InventoryLargeChest("container.chestDouble",
+                            (TileEntityChest) localTileEntity, (ITileInventory) tile);
+                } else {
+                    tile = new InventoryLargeChest("container.chestDouble",
+                            (ITileInventory) tile, (TileEntityChest) localTileEntity);
+                }
+                break;
+            }
+
+            if (silentchest) {
+                tile = new SilentContainerChest(player.inventory, ((IInventory) tile), player);
+            }
+
+            if (((BlockChest) block).g == Type.BASIC)
+                player.b(StatisticList.ac);
+            else if (((BlockChest) block).g == Type.TRAP) {
+                player.b(StatisticList.W);
+            }
         }
 
         boolean returnValue = false;
         if (!silentchest) {
-            player.openContainer((IInventory) chest);
+            player.openContainer((IInventory) tile);
             returnValue = true;
         } else {
             try {
-                SilentContainerChest silentContainerChest = new SilentContainerChest(player.inventory, ((IInventory) chest), player);
+                SilentContainerChest silentContainerChest = new SilentContainerChest(player.inventory, ((IInventory) tile), player);
                 int windowId = player.nextContainerCounter();
-                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, "minecraft:chest", ((IInventory) chest).getScoreboardDisplayName(), ((IInventory) chest).getSize()));
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, "minecraft:chest", ((IInventory) tile).getScoreboardDisplayName(), ((IInventory) tile).getSize()));
                 player.activeContainer = silentContainerChest;
                 player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
@@ -89,65 +203,4 @@ public class AnySilentContainer implements IAnySilentContainer {
         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

@@ -16,13 +16,11 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.InternalAccessor;
 
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.Inventory;
 
 // Volatile
@@ -33,43 +31,49 @@ 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;
-            }
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
         }
-
-        else if (inv instanceof SpecialEnderChest) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
-                return false;
-            }
-        }
-
-        return true;
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
     }
 
-    private IInventory grabInventory(Inventory inventory) {
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+        IInventory inv;
         if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory();
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
         }
 
-        // 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();
-                }
-            }
+        if (inv instanceof SpecialPlayerInventory) {
+            return (SpecialPlayerInventory) inv;
         }
-        return result;
+        return null;
+    }
+
+    @Override
+    public boolean isSpecialEnderChest(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
+        }
+        return null;
     }
 
 }

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

@@ -35,23 +35,25 @@ 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();
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override

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

@@ -24,13 +24,11 @@ import net.minecraft.server.v1_10_R1.ItemStack;
 import net.minecraft.server.v1_10_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2, EntityHuman e1) {
         super(i1, i2, e1);
-        inv = i2;
-        // close signal
-        inv.closeContainer(e1);
+        // Send close signal
+        i2.closeContainer(e1);
     }
 
     @Override
@@ -44,4 +42,5 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried, false);
         }
     }
+
 }

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

@@ -37,10 +37,12 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public boolean playerOnline = false;
+    private boolean playerOnline = false;
 
     public SpecialEnderChest(Player player, Boolean online) {
-        super(((CraftPlayer) player).getHandle().getEnderChest().getName(), ((CraftPlayer) player).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) player).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) player).getHandle().getEnderChest().hasCustomName(),
+                ((CraftPlayer) player).getHandle().getEnderChest().getSize());
         CraftPlayer craftPlayer = (CraftPlayer) player;
         this.enderChest = craftPlayer.getHandle().getEnderChest();
         this.bukkitOwner = craftPlayer;
@@ -79,8 +81,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 this.bukkitOwner = player;
                 CraftPlayer craftPlayer = (CraftPlayer) player;
                 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

@@ -126,16 +126,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extraSlots;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -156,16 +154,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extraSlots;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -181,8 +177,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].cloneAndSubtract(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -191,9 +186,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -203,16 +197,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extraSlots;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -227,9 +219,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -239,16 +230,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extraSlots;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -269,23 +258,26 @@ 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
@@ -300,4 +292,5 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     public boolean a(EntityHuman entityhuman) {
         return true;
     }
+
 }

OpenInvCraftbukkit1_11_R1/pom.xml

@@ -4,22 +4,17 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
+    <artifactId>openinvparent-jikoo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>OpenInvCraftbukkit1_11_R1</artifactId>
+  <artifactId>openinvcraftbukkit1_11_R1-jikoo</artifactId>
   <name>OpenInvCraftbukkit1_11_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>
+      <artifactId>openinvplugin-jikoo</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

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

@@ -41,11 +41,13 @@ 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;
 
@@ -63,125 +65,10 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, int x, int y, int z) {
-
-        // TODO backport to all modules? TODO change new API to activateContainer(Player, Block)? Use BlockState instead?
-        if (silentchest && p.getWorld().getBlockAt(x, y, z).getType() == Material.ENDER_CHEST) {
-            p.openInventory(p.getEnderChest());
-            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) {
-            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) {
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block b) {
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        BlockPosition blockPosition = new BlockPosition(x, y, z);
+        BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
         Block block = world.getType(blockPosition).getBlock();
 
         if (block instanceof BlockShulkerBox) {
@@ -190,7 +77,7 @@ public class AnySilentContainer implements IAnySilentContainer {
 
         if (block instanceof BlockEnderChest) {
             // Ender chests are not blocked by ocelots.
-            return world.getType(new BlockPosition(x, y + 1, z)).m();
+            return world.getType(blockPosition.up()).m();
         }
 
         // Check if chest is blocked or has an ocelot on top
@@ -262,22 +149,128 @@ public class AnySilentContainer implements IAnySilentContainer {
         return false;
     }
 
-    /**
-     * @deprecated Use {@link #activateContainer(Player, boolean, 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);
-    }
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block b) {
 
-    /**
-     * @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);
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is pretty much API-only
+        if (silentchest && b.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            player.b(StatisticList.X);
+            return true;
+        }
+
+        final World world = player.world;
+        final BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
+        Object tile = world.getTileEntity(blockPosition);
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest.  See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            player.b(StatisticList.X);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        Block block = world.getType(blockPosition).getBlock();
+        Container container = null;
+
+        if (block instanceof BlockChest) {
+            BlockChest blockChest = (BlockChest) block;
+
+            for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
+                BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
+                Block localBlock = world.getType(localBlockPosition).getBlock();
+
+                if (localBlock != block) {
+                    continue;
+                }
+
+                TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
+                if (!(localTileEntity instanceof TileEntityChest)) {
+                    continue;
+                }
+
+                if ((localEnumDirection == EnumDirection.WEST) || (localEnumDirection == EnumDirection.NORTH)) {
+                    tile = new InventoryLargeChest("container.chestDouble",
+                            (TileEntityChest) localTileEntity, (ITileInventory) tile);
+                } else {
+                    tile = new InventoryLargeChest("container.chestDouble",
+                            (ITileInventory) tile, (TileEntityChest) localTileEntity);
+                }
+                break;
+            }
+
+            if (blockChest.g == Type.BASIC)
+                player.b(StatisticList.ac);
+            else if (blockChest.g == Type.TRAP) {
+                player.b(StatisticList.W);
+            }
+
+            if (silentchest) {
+                container = new SilentContainerChest(player.inventory, ((IInventory) tile), player);
+            }
+        }
+
+        if (block instanceof BlockShulkerBox) {
+            player.b(StatisticList.ae);
+
+            if (silentchest && tile instanceof TileEntityShulkerBox) {
+                // Set value to current + 1. Ensures consistency later when resetting.
+                SilentContainerShulkerBox.setOpenValue((TileEntityShulkerBox) tile,
+                        SilentContainerShulkerBox.getOpenValue((TileEntityShulkerBox) tile) + 1);
+
+                container = new SilentContainerShulkerBox(player.inventory, (IInventory) tile, player);
+            }
+        }
+
+        boolean returnValue = false;
+        final IInventory iInventory = (IInventory) tile;
+
+        if (!silentchest || container == null) {
+            player.openContainer(iInventory);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, iInventory.getName(), iInventory.getScoreboardDisplayName(), iInventory.getSize()));
+                player.activeContainer = container;
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+                if (tile instanceof TileEntityShulkerBox) {
+                    new BukkitRunnable() {
+                        @Override
+                        public void run() {
+                            // TODO hacky
+                            Object tile = world.getTileEntity(blockPosition);
+                            if (!(tile instanceof TileEntityShulkerBox)) {
+                                return;
+                            }
+                            TileEntityShulkerBox box = (TileEntityShulkerBox) tile;
+                            // Reset back - we added 1, and calling TileEntityShulkerBox#startOpen adds 1 more.
+                            SilentContainerShulkerBox.setOpenValue(box,
+                                    SilentContainerShulkerBox.getOpenValue((TileEntityShulkerBox) tile) - 2);
+                        }
+                    }.runTaskLater(Bukkit.getPluginManager().getPlugin("OpenInv"), 2);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
     }
 
 }

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

@@ -16,13 +16,11 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.InternalAccessor;
 
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.Inventory;
 
 // Volatile
@@ -33,40 +31,49 @@ 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);
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
 
         if (inv instanceof SpecialPlayerInventory) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
-                return false;
-            }
-        } else if (inv instanceof SpecialEnderChest) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
-                return false;
-            }
+            return (SpecialPlayerInventory) inv;
         }
-
-        return true;
+        return null;
     }
 
-    private IInventory grabInventory(Inventory inventory) {
+    @Override
+    public boolean isSpecialEnderChest(Inventory inventory) {
         if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory();
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
         }
 
-        // 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();
-                }
-            }
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
         }
-        return result;
+        return null;
     }
+
 }

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

@@ -35,23 +35,25 @@ 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();
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override

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

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

@@ -38,10 +38,12 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public boolean playerOnline = false;
+    private boolean playerOnline = false;
 
     public SpecialEnderChest(Player player, Boolean online) {
-        super(((CraftPlayer) player).getHandle().getEnderChest().getName(), ((CraftPlayer) player).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) player).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) player).getHandle().getEnderChest().hasCustomName(),
+                ((CraftPlayer) player).getHandle().getEnderChest().getSize());
         CraftPlayer craftPlayer = (CraftPlayer) player;
         this.enderChest = craftPlayer.getHandle().getEnderChest();
         this.bukkitOwner = craftPlayer;
@@ -80,8 +82,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 this.bukkitOwner = player;
                 CraftPlayer craftPlayer = (CraftPlayer) player;
                 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

@@ -187,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);
-             return itemstack;
+            list.set(i, ItemStack.a);
+            return itemstack;
         }
 
         return ItemStack.a;
@@ -218,28 +218,31 @@ 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
@@ -254,4 +257,5 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     public boolean a(EntityHuman entityhuman) {
         return true;
     }
+
 }

OpenInvCraftbukkit1_4_5/pom.xml

@@ -4,22 +4,17 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
+    <artifactId>openinvparent-jikoo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>OpenInvCraftbukkit1_4_5</artifactId>
+  <artifactId>openinvcraftbukkit1_4_5-jikoo</artifactId>
   <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>
+      <artifactId>openinvplugin-jikoo</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

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

@@ -26,13 +26,15 @@ 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.BlockEnderChest;
 import net.minecraft.server.v1_4_5.EntityOcelot;
 import net.minecraft.server.v1_4_5.EntityPlayer;
 import net.minecraft.server.v1_4_5.IInventory;
+import net.minecraft.server.v1_4_5.InventoryEnderChest;
 import net.minecraft.server.v1_4_5.InventoryLargeChest;
 import net.minecraft.server.v1_4_5.Packet100OpenWindow;
 import net.minecraft.server.v1_4_5.TileEntityChest;
+import net.minecraft.server.v1_4_5.TileEntityEnderChest;
 import net.minecraft.server.v1_4_5.World;
 
 import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
@@ -45,43 +47,113 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, int x, int y, int z) {
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = world.getTileEntity(x, y, z);
 
-        if (chest == null) {
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        // If block next to chest is chest and has a block or ocelot on top
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
+        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
             return false;
         }
 
-        if (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);
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
         }
 
         boolean returnValue = false;
         if (!silentchest) {
-            player.openContainer((IInventory) chest);
+            player.openContainer((IInventory) tile);
             returnValue = true;
         } else {
             try {
-                int id = 0;
+                int windowId = 0;
                 try {
                     Field windowID = player.getClass().getDeclaredField("containerCounter");
                     windowID.setAccessible(true);
-                    id = windowID.getInt(player);
-                    id = id % 100 + 1;
-                    windowID.setInt(player, id);
+                    windowId = windowID.getInt(player);
+                    windowId = windowId % 100 + 1;
+                    windowID.setInt(player, windowId);
                 } 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.netServerHandler.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize()));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
                 returnValue = true;
             } catch (Exception e) {
@@ -93,61 +165,4 @@ public class AnySilentContainer implements IAnySilentContainer {
         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

@@ -16,12 +16,12 @@
 
 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;
+import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.InternalAccessor;
+
+import org.bukkit.inventory.Inventory;
 
 // Volatile
 import net.minecraft.server.v1_4_5.IInventory;
@@ -29,22 +29,51 @@ 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();
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
 
         if (inv instanceof SpecialPlayerInventory) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
-                return false;
-            }
+            return (SpecialPlayerInventory) inv;
         }
-
-        else if (inv instanceof SpecialEnderChest) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
-                return false;
-            }
-        }
-
-        return true;
+        return null;
     }
+
+    @Override
+    public boolean isSpecialEnderChest(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
+        }
+        return null;
+    }
+
 }

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

@@ -33,20 +33,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new ItemInWorldManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new ItemInWorldManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override

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

@@ -24,13 +24,11 @@ import net.minecraft.server.v1_4_5.ItemStack;
 import net.minecraft.server.v1_4_5.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.f();
+        // Send close signal
+        i2.f();
     }
 
     @Override
@@ -44,4 +42,5 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,14 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +69,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }

OpenInvCraftbukkit1_4_6/pom.xml

@@ -4,22 +4,17 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
+    <artifactId>openinvparent-jikoo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>OpenInvCraftbukkit1_4_6</artifactId>
+  <artifactId>openinvcraftbukkit1_4_6-jikoo</artifactId>
   <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>
+      <artifactId>openinvplugin-jikoo</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

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

@@ -26,13 +26,15 @@ 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.BlockEnderChest;
 import net.minecraft.server.v1_4_6.EntityOcelot;
 import net.minecraft.server.v1_4_6.EntityPlayer;
 import net.minecraft.server.v1_4_6.IInventory;
+import net.minecraft.server.v1_4_6.InventoryEnderChest;
 import net.minecraft.server.v1_4_6.InventoryLargeChest;
 import net.minecraft.server.v1_4_6.Packet100OpenWindow;
 import net.minecraft.server.v1_4_6.TileEntityChest;
+import net.minecraft.server.v1_4_6.TileEntityEnderChest;
 import net.minecraft.server.v1_4_6.World;
 
 import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
@@ -45,42 +47,113 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, int x, int y, int z) {
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = world.getTileEntity(x, y, z);
-        if (chest == null) {
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        // If block next to chest is chest and has a block or ocelot on top
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
+        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
             return false;
         }
 
-        if (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);
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
         }
 
         boolean returnValue = false;
         if (!silentchest) {
-            player.openContainer((IInventory) chest);
+            player.openContainer((IInventory) tile);
             returnValue = true;
         } else {
             try {
-                int id = 0;
+                int windowId = 0;
                 try {
                     Field windowID = player.getClass().getDeclaredField("containerCounter");
                     windowID.setAccessible(true);
-                    id = windowID.getInt(player);
-                    id = id % 100 + 1;
-                    windowID.setInt(player, id);
+                    windowId = windowID.getInt(player);
+                    windowId = windowId % 100 + 1;
+                    windowID.setInt(player, windowId);
                 } 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.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize()));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
                 returnValue = true;
             } catch (Exception e) {
@@ -92,61 +165,4 @@ public class AnySilentContainer implements IAnySilentContainer {
         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

@@ -16,12 +16,12 @@
 
 package com.lishid.openinv.internal.v1_4_6;
 
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.inventory.Inventory;
-
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.Permissions;
 import com.lishid.openinv.internal.IInventoryAccess;
+import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.InternalAccessor;
+
+import org.bukkit.inventory.Inventory;
 
 // Volatile
 import net.minecraft.server.v1_4_6.IInventory;
@@ -29,22 +29,51 @@ 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();
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
 
         if (inv instanceof SpecialPlayerInventory) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
-                return false;
-            }
+            return (SpecialPlayerInventory) inv;
         }
-
-        else if (inv instanceof SpecialEnderChest) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
-                return false;
-            }
-        }
-
-        return true;
+        return null;
     }
+
+    @Override
+    public boolean isSpecialEnderChest(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
+        }
+        return null;
+    }
+
 }

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

@@ -33,20 +33,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override

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

@@ -24,13 +24,11 @@ import net.minecraft.server.v1_4_6.ItemStack;
 import net.minecraft.server.v1_4_6.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.f();
+        // Send close signal
+        i2.f();
     }
 
     @Override
@@ -44,4 +42,5 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,14 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +69,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -207,23 +196,26 @@ 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,22 +4,17 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
+    <artifactId>openinvparent-jikoo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>OpenInvCraftbukkit1_4_R1</artifactId>
+  <artifactId>openinvcraftbukkit1_4_R1-jikoo</artifactId>
   <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>
+      <artifactId>openinvplugin-jikoo</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

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

@@ -26,13 +26,15 @@ 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.BlockEnderChest;
 import net.minecraft.server.v1_4_R1.EntityOcelot;
 import net.minecraft.server.v1_4_R1.EntityPlayer;
 import net.minecraft.server.v1_4_R1.IInventory;
+import net.minecraft.server.v1_4_R1.InventoryEnderChest;
 import net.minecraft.server.v1_4_R1.InventoryLargeChest;
 import net.minecraft.server.v1_4_R1.Packet100OpenWindow;
 import net.minecraft.server.v1_4_R1.TileEntityChest;
+import net.minecraft.server.v1_4_R1.TileEntityEnderChest;
 import net.minecraft.server.v1_4_R1.World;
 
 import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
@@ -45,43 +47,113 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, int x, int y, int z) {
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = world.getTileEntity(x, y, z);
 
-        if (chest == null) {
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        // If block next to chest is chest and has a block or ocelot on top
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
+        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
             return false;
         }
 
-        if (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);
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
         }
 
         boolean returnValue = false;
         if (!silentchest) {
-            player.openContainer((IInventory) chest);
+            player.openContainer((IInventory) tile);
             returnValue = true;
         } else {
             try {
-                int id = 0;
+                int windowId = 0;
                 try {
                     Field windowID = player.getClass().getDeclaredField("containerCounter");
                     windowID.setAccessible(true);
-                    id = windowID.getInt(player);
-                    id = id % 100 + 1;
-                    windowID.setInt(player, id);
+                    windowId = windowID.getInt(player);
+                    windowId = windowId % 100 + 1;
+                    windowID.setInt(player, windowId);
                 } 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.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize()));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
                 returnValue = true;
             } catch (Exception e) {
@@ -93,61 +165,4 @@ public class AnySilentContainer implements IAnySilentContainer {
         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

@@ -16,11 +16,11 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.InternalAccessor;
 
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.Inventory;
 
 // Volatile
@@ -29,22 +29,51 @@ 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();
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
 
         if (inv instanceof SpecialPlayerInventory) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
-                return false;
-            }
+            return (SpecialPlayerInventory) inv;
         }
-
-        else if (inv instanceof SpecialEnderChest) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
-                return false;
-            }
-        }
-
-        return true;
+        return null;
     }
+
+    @Override
+    public boolean isSpecialEnderChest(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
+        }
+        return null;
+    }
+
 }

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

@@ -34,20 +34,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override

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

@@ -24,13 +24,11 @@ import net.minecraft.server.v1_4_R1.ItemStack;
 import net.minecraft.server.v1_4_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.f();
+        // Send close signal
+        i2.f();
     }
 
     @Override
@@ -44,4 +42,5 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,14 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +69,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }

OpenInvCraftbukkit1_5_R2/pom.xml

@@ -4,22 +4,17 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
+    <artifactId>openinvparent-jikoo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>OpenInvCraftbukkit1_5_R2</artifactId>
+  <artifactId>openinvcraftbukkit1_5_R2-jikoo</artifactId>
   <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>
+      <artifactId>openinvplugin-jikoo</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

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

@@ -26,12 +26,15 @@ import org.bukkit.entity.Player;
 
 // Volatile
 import net.minecraft.server.v1_5_R2.AxisAlignedBB;
+import net.minecraft.server.v1_5_R2.BlockEnderChest;
 import net.minecraft.server.v1_5_R2.EntityOcelot;
 import net.minecraft.server.v1_5_R2.EntityPlayer;
 import net.minecraft.server.v1_5_R2.IInventory;
+import net.minecraft.server.v1_5_R2.InventoryEnderChest;
 import net.minecraft.server.v1_5_R2.InventoryLargeChest;
 import net.minecraft.server.v1_5_R2.Packet100OpenWindow;
 import net.minecraft.server.v1_5_R2.TileEntityChest;
+import net.minecraft.server.v1_5_R2.TileEntityEnderChest;
 import net.minecraft.server.v1_5_R2.World;
 
 import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
@@ -44,30 +47,98 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, int x, int y, int z) {
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = world.getTileEntity(x, y, z);
 
-        if (chest == null) {
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        // If block next to chest is chest and has a block or ocelot on top
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
+        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
             return false;
         }
 
-        int id = world.getTypeId(x, y, z);
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
 
-        if (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);
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
         }
 
         boolean returnValue = false;
         if (!silentchest) {
-            player.openContainer((IInventory) chest);
+            player.openContainer((IInventory) tile);
             returnValue = true;
         } else {
             try {
@@ -80,8 +151,8 @@ public class AnySilentContainer implements IAnySilentContainer {
                     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.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
                 returnValue = true;
@@ -94,63 +165,4 @@ public class AnySilentContainer implements IAnySilentContainer {
         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

@@ -16,11 +16,11 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.InternalAccessor;
 
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.Inventory;
 
 // Volatile
@@ -29,22 +29,51 @@ 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();
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
 
         if (inv instanceof SpecialPlayerInventory) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
-                return false;
-            }
+            return (SpecialPlayerInventory) inv;
         }
-
-        else if (inv instanceof SpecialEnderChest) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
-                return false;
-            }
-        }
-
-        return true;
+        return null;
     }
+
+    @Override
+    public boolean isSpecialEnderChest(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
+        }
+        return null;
+    }
+
 }

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

@@ -33,20 +33,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override

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

@@ -24,13 +24,11 @@ import net.minecraft.server.v1_5_R2.ItemStack;
 import net.minecraft.server.v1_5_R2.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.g();
+        // Send close signal
+        i2.g();
     }
 
     @Override
@@ -44,4 +42,5 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,15 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().c(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +70,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -207,23 +196,26 @@ 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,22 +4,17 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
+    <artifactId>openinvparent-jikoo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>OpenInvCraftbukkit1_5_R3</artifactId>
+  <artifactId>openinvcraftbukkit1_5_R3-jikoo</artifactId>
   <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>
+      <artifactId>openinvplugin-jikoo</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

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

@@ -26,12 +26,15 @@ import org.bukkit.entity.Player;
 
 //Volatile
 import net.minecraft.server.v1_5_R3.AxisAlignedBB;
+import net.minecraft.server.v1_5_R3.BlockEnderChest;
 import net.minecraft.server.v1_5_R3.EntityOcelot;
 import net.minecraft.server.v1_5_R3.EntityPlayer;
 import net.minecraft.server.v1_5_R3.IInventory;
+import net.minecraft.server.v1_5_R3.InventoryEnderChest;
 import net.minecraft.server.v1_5_R3.InventoryLargeChest;
 import net.minecraft.server.v1_5_R3.Packet100OpenWindow;
 import net.minecraft.server.v1_5_R3.TileEntityChest;
+import net.minecraft.server.v1_5_R3.TileEntityEnderChest;
 import net.minecraft.server.v1_5_R3.World;
 
 import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
@@ -44,30 +47,98 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, int x, int y, int z) {
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = world.getTileEntity(x, y, z);
 
-        if (chest == null) {
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        // If block next to chest is chest and has a block or ocelot on top
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
+        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
             return false;
         }
 
-        int id = world.getTypeId(x, y, z);
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
 
-        if (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);
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
         }
 
         boolean returnValue = false;
         if (!silentchest) {
-            player.openContainer((IInventory) chest);
+            player.openContainer((IInventory) tile);
             returnValue = true;
         } else {
             try {
@@ -80,8 +151,8 @@ public class AnySilentContainer implements IAnySilentContainer {
                     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.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
                 returnValue = true;
@@ -94,63 +165,4 @@ public class AnySilentContainer implements IAnySilentContainer {
         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

@@ -16,11 +16,11 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.InternalAccessor;
 
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.Inventory;
 
 // Volatile
@@ -29,22 +29,51 @@ 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();
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
 
         if (inv instanceof SpecialPlayerInventory) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
-                return false;
-            }
+            return (SpecialPlayerInventory) inv;
         }
-
-        else if (inv instanceof SpecialEnderChest) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
-                return false;
-            }
-        }
-
-        return true;
+        return null;
     }
+
+    @Override
+    public boolean isSpecialEnderChest(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
+        }
+        return null;
+    }
+
 }

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

@@ -33,20 +33,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override

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

@@ -23,14 +23,12 @@ import net.minecraft.server.v1_5_R3.IInventory;
 import net.minecraft.server.v1_5_R3.ItemStack;
 import net.minecraft.server.v1_5_R3.PlayerInventory;
 
-public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
+public class SilentContainerChest extends ContainerChest {    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.g();
+        // Send close signal
+        i2.g();
     }
 
     @Override
@@ -44,4 +42,5 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,15 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().c(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +70,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -207,23 +196,26 @@ 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,22 +4,17 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
+    <artifactId>openinvparent-jikoo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>OpenInvCraftbukkit1_6_R1</artifactId>
+  <artifactId>openinvcraftbukkit1_6_R1-jikoo</artifactId>
   <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>
+      <artifactId>openinvplugin-jikoo</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

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

@@ -26,12 +26,15 @@ import org.bukkit.entity.Player;
 
 // Volatile
 import net.minecraft.server.v1_6_R1.AxisAlignedBB;
+import net.minecraft.server.v1_6_R1.BlockEnderChest;
 import net.minecraft.server.v1_6_R1.EntityOcelot;
 import net.minecraft.server.v1_6_R1.EntityPlayer;
 import net.minecraft.server.v1_6_R1.IInventory;
+import net.minecraft.server.v1_6_R1.InventoryEnderChest;
 import net.minecraft.server.v1_6_R1.InventoryLargeChest;
 import net.minecraft.server.v1_6_R1.Packet100OpenWindow;
 import net.minecraft.server.v1_6_R1.TileEntityChest;
+import net.minecraft.server.v1_6_R1.TileEntityEnderChest;
 import net.minecraft.server.v1_6_R1.World;
 
 import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
@@ -44,30 +47,98 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, int x, int y, int z) {
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = world.getTileEntity(x, y, z);
 
-        if (chest == null) {
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        // If block next to chest is chest and has a block or ocelot on top
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
+        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
             return false;
         }
 
-        int id = world.getTypeId(x, y, z);
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
 
-        if (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);
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
         }
 
         boolean returnValue = false;
         if (!silentchest) {
-            player.openContainer((IInventory) chest);
+            player.openContainer((IInventory) tile);
             returnValue = true;
         } else {
             try {
@@ -80,8 +151,8 @@ public class AnySilentContainer implements IAnySilentContainer {
                     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.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
                 returnValue = true;
@@ -94,63 +165,4 @@ public class AnySilentContainer implements IAnySilentContainer {
         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

@@ -16,11 +16,11 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.InternalAccessor;
 
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.Inventory;
 
 // Volatile
@@ -29,22 +29,51 @@ 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();
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
 
         if (inv instanceof SpecialPlayerInventory) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
-                return false;
-            }
+            return (SpecialPlayerInventory) inv;
         }
-
-        else if (inv instanceof SpecialEnderChest) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
-                return false;
-            }
-        }
-
-        return true;
+        return null;
     }
+
+    @Override
+    public boolean isSpecialEnderChest(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
+        }
+        return null;
+    }
+
 }

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

@@ -33,20 +33,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override

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

@@ -24,13 +24,11 @@ import net.minecraft.server.v1_6_R1.ItemStack;
 import net.minecraft.server.v1_6_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.g();
+        // Send close signal
+        i2.g();
     }
 
     @Override
@@ -44,4 +42,5 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,15 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().c(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +70,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -207,23 +196,26 @@ 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,22 +4,17 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
+    <artifactId>openinvparent-jikoo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>OpenInvCraftbukkit1_6_R2</artifactId>
+  <artifactId>openinvcraftbukkit1_6_R2-jikoo</artifactId>
   <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>
+      <artifactId>openinvplugin-jikoo</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

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

@@ -26,12 +26,15 @@ import org.bukkit.entity.Player;
 
 // Volatile
 import net.minecraft.server.v1_6_R2.AxisAlignedBB;
+import net.minecraft.server.v1_6_R2.BlockEnderChest;
 import net.minecraft.server.v1_6_R2.EntityOcelot;
 import net.minecraft.server.v1_6_R2.EntityPlayer;
 import net.minecraft.server.v1_6_R2.IInventory;
+import net.minecraft.server.v1_6_R2.InventoryEnderChest;
 import net.minecraft.server.v1_6_R2.InventoryLargeChest;
 import net.minecraft.server.v1_6_R2.Packet100OpenWindow;
 import net.minecraft.server.v1_6_R2.TileEntityChest;
+import net.minecraft.server.v1_6_R2.TileEntityEnderChest;
 import net.minecraft.server.v1_6_R2.World;
 
 import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
@@ -44,30 +47,98 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, int x, int y, int z) {
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = world.getTileEntity(x, y, z);
 
-        if (chest == null) {
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        // If block next to chest is chest and has a block or ocelot on top
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
+        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
             return false;
         }
 
-        int id = world.getTypeId(x, y, z);
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
 
-        if (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);
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
         }
 
         boolean returnValue = false;
         if (!silentchest) {
-            player.openContainer((IInventory) chest);
+            player.openContainer((IInventory) tile);
             returnValue = true;
         } else {
             try {
@@ -80,8 +151,8 @@ public class AnySilentContainer implements IAnySilentContainer {
                     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.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
                 returnValue = true;
@@ -94,63 +165,4 @@ public class AnySilentContainer implements IAnySilentContainer {
         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

@@ -16,11 +16,11 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.InternalAccessor;
 
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.Inventory;
 
 // Volatile
@@ -29,22 +29,51 @@ 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();
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
 
         if (inv instanceof SpecialPlayerInventory) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
-                return false;
-            }
+            return (SpecialPlayerInventory) inv;
         }
-
-        else if (inv instanceof SpecialEnderChest) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
-                return false;
-            }
-        }
-
-        return true;
+        return null;
     }
+
+    @Override
+    public boolean isSpecialEnderChest(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
+        }
+        return null;
+    }
+
 }

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

@@ -33,20 +33,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override

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

@@ -24,13 +24,11 @@ import net.minecraft.server.v1_6_R2.ItemStack;
 import net.minecraft.server.v1_6_R2.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.g();
+        // Send close signal
+        i2.g();
     }
 
     @Override
@@ -44,4 +42,5 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,15 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().c(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +70,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -207,23 +196,26 @@ 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,22 +4,17 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
+    <artifactId>openinvparent-jikoo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>OpenInvCraftbukkit1_6_R3</artifactId>
+  <artifactId>openinvcraftbukkit1_6_R3-jikoo</artifactId>
   <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>
+      <artifactId>openinvplugin-jikoo</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

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

@@ -26,12 +26,15 @@ import org.bukkit.entity.Player;
 
 // Volatile
 import net.minecraft.server.v1_6_R3.AxisAlignedBB;
+import net.minecraft.server.v1_6_R3.BlockEnderChest;
 import net.minecraft.server.v1_6_R3.EntityOcelot;
 import net.minecraft.server.v1_6_R3.EntityPlayer;
 import net.minecraft.server.v1_6_R3.IInventory;
+import net.minecraft.server.v1_6_R3.InventoryEnderChest;
 import net.minecraft.server.v1_6_R3.InventoryLargeChest;
 import net.minecraft.server.v1_6_R3.Packet100OpenWindow;
 import net.minecraft.server.v1_6_R3.TileEntityChest;
+import net.minecraft.server.v1_6_R3.TileEntityEnderChest;
 import net.minecraft.server.v1_6_R3.World;
 
 import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
@@ -44,30 +47,98 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, int x, int y, int z) {
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = world.getTileEntity(x, y, z);
 
-        if (chest == null) {
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        // If block next to chest is chest and has a block or ocelot on top
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
+        } else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
             return false;
         }
 
-        int id = world.getTypeId(x, y, z);
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
 
-        if (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);
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
+
+        if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
         }
 
         boolean returnValue = false;
         if (!silentchest) {
-            player.openContainer((IInventory) chest);
+            player.openContainer((IInventory) tile);
             returnValue = true;
         } else {
             try {
@@ -80,8 +151,8 @@ public class AnySilentContainer implements IAnySilentContainer {
                     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.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
                 returnValue = true;
@@ -94,63 +165,4 @@ public class AnySilentContainer implements IAnySilentContainer {
         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

@@ -16,11 +16,11 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.InternalAccessor;
 
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.Inventory;
 
 // Volatile
@@ -29,22 +29,51 @@ 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();
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
 
         if (inv instanceof SpecialPlayerInventory) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
-                return false;
-            }
+            return (SpecialPlayerInventory) inv;
         }
-
-        else if (inv instanceof SpecialEnderChest) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
-                return false;
-            }
-        }
-
-        return true;
+        return null;
     }
+
+    @Override
+    public boolean isSpecialEnderChest(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
+        }
+        return null;
+    }
+
 }

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

@@ -33,20 +33,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(), new PlayerInteractManager(server.getWorldServer(0)));
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override

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

@@ -24,13 +24,11 @@ import net.minecraft.server.v1_6_R3.ItemStack;
 import net.minecraft.server.v1_6_R3.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.g();
+        // Send close signal
+        i2.g();
     }
 
     @Override
@@ -44,4 +42,5 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried);
         }
     }
+
 }

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

@@ -41,13 +41,15 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().c(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +70,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 

OpenInvCraftbukkit1_7_R1/pom.xml

@@ -4,22 +4,17 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
+    <artifactId>openinvparent-jikoo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>OpenInvCraftbukkit1_7_R1</artifactId>
+  <artifactId>openinvcraftbukkit1_7_R1-jikoo</artifactId>
   <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>
+      <artifactId>openinvplugin-jikoo</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

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

@@ -27,12 +27,15 @@ import org.bukkit.entity.Player;
 //Volatile
 import net.minecraft.server.v1_7_R1.AxisAlignedBB;
 import net.minecraft.server.v1_7_R1.Block;
+import net.minecraft.server.v1_7_R1.BlockEnderChest;
 import net.minecraft.server.v1_7_R1.EntityOcelot;
 import net.minecraft.server.v1_7_R1.EntityPlayer;
 import net.minecraft.server.v1_7_R1.IInventory;
+import net.minecraft.server.v1_7_R1.InventoryEnderChest;
 import net.minecraft.server.v1_7_R1.InventoryLargeChest;
 import net.minecraft.server.v1_7_R1.PacketPlayOutOpenWindow;
 import net.minecraft.server.v1_7_R1.TileEntityChest;
+import net.minecraft.server.v1_7_R1.TileEntityEnderChest;
 import net.minecraft.server.v1_7_R1.World;
 
 import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
@@ -45,30 +48,98 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @Override
-    public boolean activateContainer(Player p, boolean silentchest, int x, int y, int z) {
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = world.getTileEntity(x, y, z);
 
-        if (chest == null) {
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
+
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ()));
+
+        // If block next to chest is chest and has a block or ocelot on top
+        if (Block.b(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
+        } else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
+        } else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
+            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
+        } else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
+            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Object localEntity : world.a(EntityOcelot.class,
+                AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
+
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
             return false;
         }
 
-        int id = Block.b(world.getType(x, y, z));
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
 
-        if (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);
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ()));
+
+        if (Block.b(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
         }
 
         boolean returnValue = false;
         if (!silentchest) {
-            player.openContainer((IInventory) chest);
+            player.openContainer((IInventory) tile);
             returnValue = true;
         } else {
             try {
@@ -81,8 +152,8 @@ public class AnySilentContainer implements IAnySilentContainer {
                     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.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) tile).getInventoryName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
                 returnValue = true;
@@ -95,63 +166,4 @@ public class AnySilentContainer implements IAnySilentContainer {
         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

@@ -16,11 +16,11 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.InternalAccessor;
 
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.Inventory;
 
 // Volatile
@@ -29,22 +29,51 @@ 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();
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
 
         if (inv instanceof SpecialPlayerInventory) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
-                return false;
-            }
+            return (SpecialPlayerInventory) inv;
         }
-
-        else if (inv instanceof SpecialEnderChest) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
-                return false;
-            }
-        }
-
-        return true;
+        return null;
     }
+
+    @Override
+    public boolean isSpecialEnderChest(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
+        }
+        return null;
+    }
+
 }

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

@@ -34,21 +34,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
 
+        // Create a profile and entity to load the player data
         GameProfile profile = new GameProfile(null, offline.getName());
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override

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

@@ -24,13 +24,11 @@ import net.minecraft.server.v1_7_R1.ItemStack;
 import net.minecraft.server.v1_7_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.l_();
+        // Send close signal
+        i2.l_();
     }
 
     @Override
@@ -44,4 +42,5 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried, false);
         }
     }
+
 }

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

@@ -41,13 +41,15 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().k_(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +70,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }
@@ -124,4 +125,5 @@ 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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -207,23 +196,26 @@ 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,22 +4,17 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
+    <artifactId>openinvparent-jikoo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>OpenInvCraftbukkit1_7_R2</artifactId>
+  <artifactId>openinvcraftbukkit1_7_R2-jikoo</artifactId>
   <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>
+      <artifactId>openinvplugin-jikoo</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

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

@@ -27,12 +27,15 @@ import org.bukkit.entity.Player;
 //Volatile
 import net.minecraft.server.v1_7_R2.AxisAlignedBB;
 import net.minecraft.server.v1_7_R2.Block;
+import net.minecraft.server.v1_7_R2.BlockEnderChest;
 import net.minecraft.server.v1_7_R2.EntityOcelot;
 import net.minecraft.server.v1_7_R2.EntityPlayer;
 import net.minecraft.server.v1_7_R2.IInventory;
+import net.minecraft.server.v1_7_R2.InventoryEnderChest;
 import net.minecraft.server.v1_7_R2.InventoryLargeChest;
 import net.minecraft.server.v1_7_R2.PacketPlayOutOpenWindow;
 import net.minecraft.server.v1_7_R2.TileEntityChest;
+import net.minecraft.server.v1_7_R2.TileEntityEnderChest;
 import net.minecraft.server.v1_7_R2.World;
 
 import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
@@ -45,83 +48,39 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @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) {
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
 
-        // If block or ocelot on top
-        if (world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z))
-            return true;
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
 
-        int id = Block.b(world.getType(x, y, z));
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ()));
 
         // If block next to chest is chest and has a block or ocelot on top
-        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);
+        if (Block.b(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
+        } else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
+        } else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
+            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
+        } else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
+            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        }
+
+        return false;
     }
 
-    private boolean isBlockedChest(World world, int 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 isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
     }
 
     private boolean hasOcelotOnTop(World world, int x, int y, int z) {
@@ -136,22 +95,75 @@ public class AnySilentContainer implements IAnySilentContainer {
         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);
-    }
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
 
-    /**
-     * @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);
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ()));
+
+        if (Block.b(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) tile);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = 0;
+                try {
+                    Field windowID = player.getClass().getDeclaredField("containerCounter");
+                    windowID.setAccessible(true);
+                    windowId = windowID.getInt(player);
+                    windowId = windowId % 100 + 1;
+                    windowID.setInt(player, windowId);
+                } catch (NoSuchFieldException e) {}
+
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) tile).getInventoryName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
     }
 
 }

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

@@ -16,11 +16,11 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.InternalAccessor;
 
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.Inventory;
 
 // Volatile
@@ -29,22 +29,51 @@ 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();
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
 
         if (inv instanceof SpecialPlayerInventory) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
-                return false;
-            }
+            return (SpecialPlayerInventory) inv;
         }
-
-        else if (inv instanceof SpecialEnderChest) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
-                return false;
-            }
-        }
-
-        return true;
+        return null;
     }
+
+    @Override
+    public boolean isSpecialEnderChest(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
+        }
+        return null;
+    }
+
 }

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

@@ -35,21 +35,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
 
+        // Create a profile and entity to load the player data
         GameProfile profile = new GameProfile(null, offline.getName());
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override

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

@@ -24,13 +24,11 @@ import net.minecraft.server.v1_7_R2.ItemStack;
 import net.minecraft.server.v1_7_R2.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.l_();
+        // Send close signal
+        i2.l_();
     }
 
     @Override
@@ -44,4 +42,5 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried, false);
         }
     }
+
 }

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

@@ -41,13 +41,15 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().k_(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +70,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -207,23 +196,26 @@ 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,22 +4,17 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
+    <artifactId>openinvparent-jikoo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>OpenInvCraftbukkit1_7_R3</artifactId>
+  <artifactId>openinvcraftbukkit1_7_R3-jikoo</artifactId>
   <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>
+      <artifactId>openinvplugin-jikoo</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

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

@@ -27,12 +27,15 @@ import org.bukkit.entity.Player;
 // Volatile
 import net.minecraft.server.v1_7_R3.AxisAlignedBB;
 import net.minecraft.server.v1_7_R3.Block;
+import net.minecraft.server.v1_7_R3.BlockEnderChest;
 import net.minecraft.server.v1_7_R3.EntityOcelot;
 import net.minecraft.server.v1_7_R3.EntityPlayer;
 import net.minecraft.server.v1_7_R3.IInventory;
+import net.minecraft.server.v1_7_R3.InventoryEnderChest;
 import net.minecraft.server.v1_7_R3.InventoryLargeChest;
 import net.minecraft.server.v1_7_R3.PacketPlayOutOpenWindow;
 import net.minecraft.server.v1_7_R3.TileEntityChest;
+import net.minecraft.server.v1_7_R3.TileEntityEnderChest;
 import net.minecraft.server.v1_7_R3.World;
 
 import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer;
@@ -45,83 +48,39 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @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) {
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
 
-        // If block or ocelot on top
-        if (world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z))
-            return true;
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
 
-        int id = Block.b(world.getType(x, y, z));
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ()));
 
         // If block next to chest is chest and has a block or ocelot on top
-        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);
+        if (Block.b(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
+        } else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
+        } else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
+            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
+        } else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
+            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        }
+
+        return false;
     }
 
-    private boolean isBlockedChest(World world, int 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 isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
     }
 
     private boolean hasOcelotOnTop(World world, int x, int y, int z) {
@@ -136,22 +95,75 @@ public class AnySilentContainer implements IAnySilentContainer {
         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);
-    }
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
 
-    /**
-     * @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);
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ()));
+
+        if (Block.b(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) tile);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = 0;
+                try {
+                    Field windowID = player.getClass().getDeclaredField("containerCounter");
+                    windowID.setAccessible(true);
+                    windowId = windowID.getInt(player);
+                    windowId = windowId % 100 + 1;
+                    windowID.setInt(player, windowId);
+                } catch (NoSuchFieldException e) {}
+
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) tile).getInventoryName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
     }
 
 }

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

@@ -16,11 +16,11 @@
 
 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 com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.InternalAccessor;
 
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.Inventory;
 
 // Volatile
@@ -29,22 +29,51 @@ 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();
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
 
         if (inv instanceof SpecialPlayerInventory) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
-                return false;
-            }
+            return (SpecialPlayerInventory) inv;
         }
-
-        else if (inv instanceof SpecialEnderChest) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
-                return false;
-            }
-        }
-
-        return true;
+        return null;
     }
+
+    @Override
+    public boolean isSpecialEnderChest(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
+        }
+        return null;
+    }
+
 }

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

@@ -34,21 +34,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
 
+        // Create a profile and entity to load the player data
         GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override

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

@@ -24,13 +24,10 @@ import net.minecraft.server.v1_7_R3.ItemStack;
 import net.minecraft.server.v1_7_R3.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.l_();
+        i2.l_();
     }
 
     @Override
@@ -44,4 +41,5 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried, false);
         }
     }
+
 }

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

@@ -41,13 +41,15 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
 
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().k_(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +70,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -207,23 +196,26 @@ 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_R4/pom.xml

@@ -4,22 +4,17 @@
 
   <parent>
     <groupId>com.lishid</groupId>
-    <artifactId>openinvparent</artifactId>
+    <artifactId>openinvparent-jikoo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>OpenInvCraftbukkit1_7_R4</artifactId>
+  <artifactId>openinvcraftbukkit1_7_R4-jikoo</artifactId>
   <name>OpenInvCraftbukkit1_7_R4</name>
 
   <dependencies>
     <dependency>
       <groupId>com.lishid</groupId>
-      <artifactId>openinvcore</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvplugin</artifactId>
+      <artifactId>openinvplugin-jikoo</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

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

@@ -27,12 +27,15 @@ import org.bukkit.entity.Player;
 // Volatile
 import net.minecraft.server.v1_7_R4.AxisAlignedBB;
 import net.minecraft.server.v1_7_R4.Block;
+import net.minecraft.server.v1_7_R4.BlockEnderChest;
 import net.minecraft.server.v1_7_R4.EntityOcelot;
 import net.minecraft.server.v1_7_R4.EntityPlayer;
 import net.minecraft.server.v1_7_R4.IInventory;
+import net.minecraft.server.v1_7_R4.InventoryEnderChest;
 import net.minecraft.server.v1_7_R4.InventoryLargeChest;
 import net.minecraft.server.v1_7_R4.PacketPlayOutOpenWindow;
 import net.minecraft.server.v1_7_R4.TileEntityChest;
+import net.minecraft.server.v1_7_R4.TileEntityEnderChest;
 import net.minecraft.server.v1_7_R4.World;
 
 import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
@@ -45,83 +48,39 @@ public class AnySilentContainer implements IAnySilentContainer {
     }
 
     @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.getId(world.getType(x, y, z));
-
-        if (Block.getId(world.getType(x, y, z + 1)) == id) {
-            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
-        } else if(Block.getId(world.getType(x, y, z - 1)) == id) {
-            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
-        } else if (Block.getId(world.getType(x + 1, y, z)) == id) {
-            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
-        } else if (Block.getId(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) {
+    public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
 
-        // If block or ocelot on top
-        if (world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z))
-            return true;
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.t(block.getX(), block.getY() + 1, block.getZ());
+        }
 
-        int id = Block.getId(world.getType(x, y, z));
+        // If block or ocelot on top
+        if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
+            return true;
+        }
+
+        int id = Block.getId(world.getType(block.getX(), block.getY(), block.getZ()));
 
         // If block next to chest is chest and has a block or ocelot on top
-        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);
+        if (Block.getId(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
+        } else if(Block.getId(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
+            return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
+        } else if (Block.getId(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
+            return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
+        } else if (Block.getId(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
+            return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
+        }
+
+        return false;
     }
 
-    private boolean isBlockedChest(World world, int id, int x, int y, int z) {
-        if (Block.getId(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 isBlockedChest(World world, int x, int y, int z) {
+        return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
     }
 
     private boolean hasOcelotOnTop(World world, int x, int y, int z) {
@@ -136,22 +95,75 @@ public class AnySilentContainer implements IAnySilentContainer {
         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);
-    }
+    public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
 
-    /**
-     * @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);
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+
+        // Silent ender chest is API-only
+        if (silentchest && block.getType() == Material.ENDER_CHEST) {
+            p.openInventory(p.getEnderChest());
+            return true;
+        }
+
+        World world = player.world;
+        Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            return true;
+        }
+
+        if (!(tile instanceof IInventory)) {
+            return false;
+        }
+
+        int id = Block.getId(world.getType(block.getX(), block.getY(), block.getZ()));
+
+        if (Block.getId(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
+        } else if(Block.getId(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), (IInventory) tile);
+        } else if (Block.getId(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
+            tile = new InventoryLargeChest("Large chest", (IInventory) tile, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
+        } else if (Block.getId(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
+            tile = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), (IInventory) tile);
+        }
+
+        boolean returnValue = false;
+        if (!silentchest) {
+            player.openContainer((IInventory) tile);
+            returnValue = true;
+        } else {
+            try {
+                int windowId = 0;
+                try {
+                    Field windowID = player.getClass().getDeclaredField("containerCounter");
+                    windowID.setAccessible(true);
+                    windowId = windowID.getInt(player);
+                    windowId = windowId % 100 + 1;
+                    windowID.setInt(player, windowId);
+                } catch (NoSuchFieldException e) {}
+
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) tile).getInventoryName(), ((IInventory) tile).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
     }
 
 }

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

@@ -16,13 +16,11 @@
 
 package com.lishid.openinv.internal.v1_7_R4;
 
-import java.lang.reflect.Field;
-
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.Permissions;
 import com.lishid.openinv.internal.IInventoryAccess;
+import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.InternalAccessor;
 
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.Inventory;
 
 // Volatile
@@ -31,43 +29,51 @@ import net.minecraft.server.v1_7_R4.IInventory;
 import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventory;
 
 public class InventoryAccess implements IInventoryAccess {
+
     @Override
-    public boolean check(Inventory inventory, HumanEntity player) {
-        IInventory inv = grabInventory(inventory);
+    public boolean isSpecialPlayerInventory(Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
 
         if (inv instanceof SpecialPlayerInventory) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
-                return false;
-            }
+            return (SpecialPlayerInventory) inv;
         }
-
-        else if (inv instanceof SpecialEnderChest) {
-            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
-                return false;
-            }
-        }
-
-        return true;
+        return null;
     }
 
-    private IInventory grabInventory(Inventory inventory) {
+    @Override
+    public boolean isSpecialEnderChest(Inventory inventory) {
         if (inventory instanceof CraftInventory) {
-            return ((CraftInventory) inventory).getInventory();
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
         }
 
-        // Use reflection to find the iiventory
-        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();
-                }
-            }
+        if (inv instanceof SpecialEnderChest) {
+            return (SpecialEnderChest) inv;
         }
-        return result;
+        return null;
     }
+
 }

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

@@ -34,21 +34,25 @@ public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
     public Player loadPlayer(OfflinePlayer offline) {
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        // Ensure the player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
 
+        // Create a profile and entity to load the player data
         GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
-        // Create an entity to load the player data
-        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
         Player target = (entity == null) ? null : entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
-            // Return the entity
-            return target;
         }
-        return null;
+        // Return the entity
+        return target;
     }
 
     @Override

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

@@ -24,13 +24,11 @@ import net.minecraft.server.v1_7_R4.ItemStack;
 import net.minecraft.server.v1_7_R4.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
-    public IInventory inv;
 
     public SilentContainerChest(IInventory i1, IInventory i2) {
         super(i1, i2);
-        inv = i2;
-        // close signal
-        inv.closeContainer();
+        // Send close signal
+        i2.closeContainer();
     }
 
     @Override
@@ -44,4 +42,5 @@ public class SilentContainerChest extends ContainerChest {
             entityHuman.drop(carried, false);
         }
     }
+
 }

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

@@ -42,12 +42,14 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     private final InventoryEnderChest enderChest;
     private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
+    private boolean playerOnline = false;
     private CraftPlayer owner;
     private int maxStack = MAX_STACK;
 
     public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
+        super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(),
+                ((CraftPlayer) p).getHandle().getEnderChest().k_(),
+                ((CraftPlayer) p).getHandle().getEnderChest().getSize());
         CraftPlayer player = (CraftPlayer) p;
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
@@ -68,8 +70,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
-            }
-            catch (Exception e) {}
+            } catch (Exception e) {}
             playerOnline = true;
         }
     }

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

@@ -86,16 +86,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -109,16 +107,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -129,8 +125,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 itemstack = is[i];
                 is[i] = null;
                 return itemstack;
-            }
-            else {
+            } else {
                 itemstack = is[i].a(j);
                 if (is[i].count == 0) {
                     is[i] = null;
@@ -139,9 +134,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                 return itemstack;
             }
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -151,16 +145,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -170,9 +162,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             is[i] = null;
             return itemstack;
         }
-        else {
-            return null;
-        }
+
+        return null;
     }
 
     @Override
@@ -182,16 +173,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         if (i >= is.length) {
             i -= is.length;
             is = this.armor;
-        }
-        else {
+        } else {
             i = getReversedItemSlotNum(i);
         }
 
         if (i >= is.length) {
             i -= is.length;
             is = this.extra;
-        }
-        else if (is == this.armor) {
+        } else if (is == this.armor) {
             i = getReversedArmorSlotNum(i);
         }
 
@@ -207,23 +196,26 @@ 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