Fix potentially server-crashing NPE

Whoops.

.settings/org.eclipse.ltk.core.refactoring.prefs

@@ -1,3 +0,0 @@
-#Wed Jun 01 17:38:54 EDT 2011
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

OpenInv/pom.xml

@@ -0,0 +1,57 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinv</artifactId>
+  <name>OpenInv</name>
+  <version>2.5.2</version>
+
+  <build>
+    <directory>../target</directory>
+    <finalName>${project.name}</finalName>
+
+    <resources>
+      <resource>
+        <directory>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>

OpenInv/src/main/resources/plugin.yml

@@ -1,38 +1,39 @@
 name: OpenInv
 main: com.lishid.openinv.OpenInv
-version: 2.2.4
+version: ${project.version}
 author: lishid
+authors: [Jikoo]
 description: >
              This plugin allows you to open a player's inventory as a chest and interact with it in real time.
 commands:
   openinv:
     aliases: [oi, inv, open]
     description: Open a player's inventory
+    permission: OpenInv.*;OpenInv.openinv
     usage: |
            /<command> - Open last person's inventory
            /<command> <Player> - Open a player's inventory
   openender:
     aliases: [oe]
     description: Opens the enderchest of a player
+    permission: OpenInv.*;OpenInv.openender
     usage: |
            /<command> <Player> - Opens a player's enderchest
   searchinv:
     aliases: [si]
     description: Search and list players having a specific item
+    permission: OpenInv.*;OpenInv.search
     usage: |
            /<command> <Item> [MinAmount] - Item can be the Item ID or the CraftBukkit Item Name, MinAmount is the minimum amount to be considered.
-  toggleopeninv:
-    aliases: [toi, toggleoi, toggleinv]
-    description: Toggle item openinv function
-    usage: |
-           /<command> [Check] - Checks whether item openinv is enabled
   silentchest:
     aliases: [sc, silent]
     description: Toggle silent chest function, which hides the animation of a chest when opened or closed, and suppresses the sound.
+    permission: OpenInv.*;OpenInv.silent
     usage: |
            /<command> [Check] - Checks whether silent chest is enabled
   anychest:
     aliases: [ac]
     description: Toggle anychest function, which allows opening of blocked chests.
+    permission: OpenInv.*;OpenInv.anychest
     usage: |
            /<command> [Check] - Checks whether anychest is enabled

OpenInvCore/pom.xml

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

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

@@ -19,7 +19,7 @@ package com.lishid.openinv.internal;
 import org.bukkit.entity.Player;
 
 public interface IAnySilentChest {
-    public boolean IsAnyChestNeeded(Player p, int x, int y, int z);
+    public boolean isAnyChestNeeded(Player player, int x, int y, int z);
 
-    public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z);
+    public boolean activateChest(Player player, boolean anychest, boolean silentchest, int x, int y, int z);
 }

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

@@ -16,8 +16,27 @@
 
 package com.lishid.openinv.internal;
 
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 public interface IPlayerDataManager {
-    public Player loadPlayer(String name);
+
+    /**
+     * Loads a Player for an OfflinePlayer.
+     * </p>
+     * This method is potentially blocking, and should not be called on the main thread.
+     * 
+     * @param offline
+     * @return
+     */
+    public Player loadPlayer(OfflinePlayer offline);
+
+    /**
+     * Gets a unique identifying string for an OfflinePlayer.
+     * 
+     * @param player
+     * @return
+     */
+    public String getPlayerDataID(OfflinePlayer player);
+
 }

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

@@ -20,12 +20,26 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
 public interface ISpecialEnderChest {
+
     public Inventory getBukkitInventory();
 
-    public void InventoryRemovalCheck();
+    /**
+     * Sets the Player associated with this ISpecialEnderChest online.
+     * 
+     * @param player the Player coming online
+     */
+    public void setPlayerOnline(Player player);
 
-    public void PlayerGoOnline(Player p);
+    /**
+     * Sets the Player associated with this ISpecialEnderChest offline.
+     */
+    public void setPlayerOffline();
 
-    public void PlayerGoOffline();
+    /**
+     * Gets whether or not this ISpecialEnderChest is in use.
+     * 
+     * @return true if the ISpecialEnderChest is in use
+     */
+    public boolean isInUse();
 
 }

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

@@ -20,11 +20,26 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
 public interface ISpecialPlayerInventory {
+
     public Inventory getBukkitInventory();
 
-    public void InventoryRemovalCheck();
+    /**
+     * Sets the Player associated with this ISpecialPlayerInventory online.
+     * 
+     * @param player the Player coming online
+     */
+    public void setPlayerOnline(Player player);
 
-    public void PlayerGoOnline(Player p);
+    /**
+     * Sets the Player associated with this ISpecialPlayerInventory offline.
+     */
+    public void setPlayerOffline();
+
+    /**
+     * Gets whether or not this ISpecialPlayerInventory is in use.
+     * 
+     * @return true if the ISpecialPlayerInventory is in use
+     */
+    public boolean isInUse();
 
-    public void PlayerGoOffline();
 }

OpenInvCraftbukkit1_10_R1/pom.xml

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

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

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

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

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

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

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

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

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

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

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

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

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

OpenInvCraftbukkit1_11_R1/pom.xml

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

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

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

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

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

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

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

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

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

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

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

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

OpenInvCraftbukkit1_4_5/pom.xml

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

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

@@ -21,16 +21,22 @@ import java.lang.reflect.Field;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentChest;
 
 // Volatile
-import net.minecraft.server.v1_4_5.*;
+import net.minecraft.server.v1_4_5.Block;
+import net.minecraft.server.v1_4_5.EntityPlayer;
+import net.minecraft.server.v1_4_5.IInventory;
+import net.minecraft.server.v1_4_5.InventoryLargeChest;
+import net.minecraft.server.v1_4_5.Packet100OpenWindow;
+import net.minecraft.server.v1_4_5.TileEntityChest;
+import net.minecraft.server.v1_4_5.World;
 
-import org.bukkit.craftbukkit.v1_4_5.entity.*;
+import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
 
 public class AnySilentChest implements IAnySilentChest {
-    public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
@@ -51,10 +57,11 @@ public class AnySilentChest implements IAnySilentChest {
         return false;
     }
 
-    public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = (TileEntityChest) world.getTileEntity(x, y, z);
+        Object chest = world.getTileEntity(x, y, z);
         if (chest == null)
             return true;
 
@@ -100,9 +107,6 @@ public class AnySilentChest implements IAnySilentChest {
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
                 player.activeContainer.windowId = id;
                 player.activeContainer.addSlotListener(player);
-                if (OpenInv.NotifySilentChest()) {
-                    p.sendMessage("You are opening a chest silently.");
-                }
                 returnValue = false;
             }
             catch (Exception e) {
@@ -111,10 +115,6 @@ public class AnySilentChest implements IAnySilentChest {
             }
         }
 
-        if (anychest && OpenInv.NotifyAnyChest()) {
-            p.sendMessage("You are opening a blocked chest.");
-        }
-
         return returnValue;
     }
 }

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

@@ -24,10 +24,12 @@ import com.lishid.openinv.Permissions;
 import com.lishid.openinv.internal.IInventoryAccess;
 
 // Volatile
-import net.minecraft.server.v1_4_5.*;
+import net.minecraft.server.v1_4_5.IInventory;
-import org.bukkit.craftbukkit.v1_4_5.inventory.*;
+
+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();
 

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

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

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

@@ -17,7 +17,10 @@
 package com.lishid.openinv.internal.v1_4_5;
 
 // Volatile
-import net.minecraft.server.v1_4_5.*;
+import net.minecraft.server.v1_4_5.ContainerChest;
+import net.minecraft.server.v1_4_5.EntityHuman;
+import net.minecraft.server.v1_4_5.IInventory;
+import net.minecraft.server.v1_4_5.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -30,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

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

@@ -20,7 +20,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
 import org.bukkit.entity.HumanEntity;
@@ -29,17 +28,23 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
 // Volatile
-import net.minecraft.server.v1_4_5.*;
+import net.minecraft.server.v1_4_5.IInventory;
-import org.bukkit.craftbukkit.v1_4_5.entity.*;
+import net.minecraft.server.v1_4_5.InventoryEnderChest;
-import org.bukkit.craftbukkit.v1_4_5.inventory.*;
+import net.minecraft.server.v1_4_5.InventorySubcontainer;
+import net.minecraft.server.v1_4_5.ItemStack;
+
+import org.bukkit.craftbukkit.v1_4_5.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -47,80 +52,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
         this.items = enderChest.getContents();
-        OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
     }
 
+    @Override
     public Inventory getBukkitInventory() {
         return inventory;
     }
 
-    public void InventoryRemovalCheck() {
+    @Override
-        owner.saveData();
+    public void setPlayerOnline(Player player) {
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.enderChests.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    public void PlayerGoOnline(Player p) {
         if (!playerOnline) {
             try {
-                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
+                owner = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
             }
             catch (Exception e) {}
-            p.saveData();
             playerOnline = true;
         }
     }
 
-    public void PlayerGoOffline() {
+    @Override
+    public void setPlayerOffline() {
         playerOnline = false;
     }
 
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
     public ItemStack[] getContents() {
         return this.items;
     }
 
+    @Override
     public void onOpen(CraftHumanEntity who) {
         transaction.add(who);
     }
 
+    @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.InventoryRemovalCheck();
     }
 
+    @Override
     public List<HumanEntity> getViewers() {
         return transaction;
     }
 
+    @Override
     public InventoryHolder getOwner() {
         return this.owner;
     }
 
+    @Override
     public void setMaxStackSize(int size) {
         maxStack = size;
     }
 
+    @Override
     public int getMaxStackSize() {
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
+    @Override
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -0,0 +1,237 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_4_5;
+
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_4_5.ItemStack;
+import net.minecraft.server.v1_4_5.PlayerInventory;
+
+import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
+
+public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
+
+    private final ItemStack[] extra = new ItemStack[5];
+    private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
+
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
+        this.playerOnline = online;
+        this.items = player.inventory.items;
+        this.armor = player.inventory.armor;
+    }
+
+    @Override
+    public Inventory getBukkitInventory() {
+        return inventory;
+    }
+
+    @Override
+    public void setPlayerOnline(Player player) {
+        if (!playerOnline) {
+            this.player = ((CraftPlayer) player).getHandle();
+            this.player.inventory.items = this.items;
+            this.player.inventory.armor = this.armor;
+            playerOnline = true;
+        }
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        playerOnline = false;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public ItemStack[] getContents() {
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
+    }
+
+    @Override
+    public int getSize() {
+        return super.getSize() + 5;
+    }
+
+    @Override
+    public ItemStack getItem(int i) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        return is[i];
+    }
+
+    @Override
+    public ItemStack splitStack(int i, int j) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (is[i] != null) {
+            ItemStack itemstack;
+
+            if (is[i].count <= j) {
+                itemstack = is[i];
+                is[i] = null;
+                return itemstack;
+            }
+            else {
+                itemstack = is[i].a(j);
+                if (is[i].count == 0) {
+                    is[i] = null;
+                }
+
+                return itemstack;
+            }
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Override
+    public ItemStack splitWithoutUpdate(int i) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (is[i] != null) {
+            ItemStack itemstack = is[i];
+
+            is[i] = null;
+            return itemstack;
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Override
+    public void setItem(int i, ItemStack itemstack) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        // Effects
+        if (is == this.extra) {
+            player.drop(itemstack);
+            itemstack = null;
+        }
+
+        is[i] = itemstack;
+
+        player.defaultContainer.b();
+    }
+
+    private int getReversedItemSlotNum(int i) {
+        if (i >= 27)
+            return i - 27;
+        else
+            return i + 9;
+    }
+
+    private int getReversedArmorSlotNum(int i) {
+        if (i == 0)
+            return 3;
+        if (i == 1)
+            return 2;
+        if (i == 2)
+            return 1;
+        if (i == 3)
+            return 0;
+        else
+            return i;
+    }
+
+    @Override
+    public String getName() {
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
+        }
+        return player.getName();
+    }
+
+}

OpenInvCraftbukkit1_4_6/pom.xml

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

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

@@ -21,16 +21,22 @@ import java.lang.reflect.Field;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentChest;
 
-//Volatile
+import net.minecraft.server.v1_4_6.Block;
-import net.minecraft.server.v1_4_6.*;
+import net.minecraft.server.v1_4_6.EntityPlayer;
+import net.minecraft.server.v1_4_6.IInventory;
+import net.minecraft.server.v1_4_6.InventoryLargeChest;
+import net.minecraft.server.v1_4_6.Packet100OpenWindow;
+import net.minecraft.server.v1_4_6.TileEntityChest;
+import net.minecraft.server.v1_4_6.World;
 
-import org.bukkit.craftbukkit.v1_4_6.entity.*;
+// Volatile
+import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
 
 public class AnySilentChest implements IAnySilentChest {
-    public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
@@ -51,10 +57,11 @@ public class AnySilentChest implements IAnySilentChest {
         return false;
     }
 
-    public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = (TileEntityChest) world.getTileEntity(x, y, z);
+        Object chest = world.getTileEntity(x, y, z);
         if (chest == null)
             return true;
 
@@ -100,9 +107,6 @@ public class AnySilentChest implements IAnySilentChest {
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
                 player.activeContainer.windowId = id;
                 player.activeContainer.addSlotListener(player);
-                if (OpenInv.NotifySilentChest()) {
-                    p.sendMessage("You are opening a chest silently.");
-                }
                 returnValue = false;
             }
             catch (Exception e) {
@@ -111,10 +115,6 @@ public class AnySilentChest implements IAnySilentChest {
             }
         }
 
-        if (anychest && OpenInv.NotifyAnyChest()) {
-            p.sendMessage("You are opening a blocked chest.");
-        }
-
         return returnValue;
     }
 }

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

@@ -23,11 +23,13 @@ import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.Permissions;
 import com.lishid.openinv.internal.IInventoryAccess;
 
+import net.minecraft.server.v1_4_6.IInventory;
+
 // Volatile
-import net.minecraft.server.v1_4_6.*;
+import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
-import org.bukkit.craftbukkit.v1_4_6.inventory.*;
 
 public class InventoryAccess implements IInventoryAccess {
+    @Override
     public boolean check(Inventory inventory, HumanEntity player) {
         IInventory inv = ((CraftInventory) inventory).getInventory();
 

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

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

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

@@ -17,7 +17,10 @@
 package com.lishid.openinv.internal.v1_4_6;
 
 // Volatile
-import net.minecraft.server.v1_4_6.*;
+import net.minecraft.server.v1_4_6.ContainerChest;
+import net.minecraft.server.v1_4_6.EntityHuman;
+import net.minecraft.server.v1_4_6.IInventory;
+import net.minecraft.server.v1_4_6.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -30,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

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

@@ -20,7 +20,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
 import org.bukkit.entity.HumanEntity;
@@ -29,17 +28,23 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
 // Volatile
-import net.minecraft.server.v1_4_6.*;
+import net.minecraft.server.v1_4_6.IInventory;
-import org.bukkit.craftbukkit.v1_4_6.entity.*;
+import net.minecraft.server.v1_4_6.InventoryEnderChest;
-import org.bukkit.craftbukkit.v1_4_6.inventory.*;
+import net.minecraft.server.v1_4_6.InventorySubcontainer;
+import net.minecraft.server.v1_4_6.ItemStack;
+
+import org.bukkit.craftbukkit.v1_4_6.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -47,80 +52,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
         this.items = enderChest.getContents();
-        OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
     }
 
+    @Override
     public Inventory getBukkitInventory() {
         return inventory;
     }
 
-    public void InventoryRemovalCheck() {
+    @Override
-        owner.saveData();
+    public void setPlayerOnline(Player player) {
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.enderChests.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    public void PlayerGoOnline(Player p) {
         if (!playerOnline) {
             try {
-                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
+                owner = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
             }
             catch (Exception e) {}
-            p.saveData();
             playerOnline = true;
         }
     }
 
-    public void PlayerGoOffline() {
+    @Override
+    public void setPlayerOffline() {
         playerOnline = false;
     }
 
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
     public ItemStack[] getContents() {
         return this.items;
     }
 
+    @Override
     public void onOpen(CraftHumanEntity who) {
         transaction.add(who);
     }
 
+    @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.InventoryRemovalCheck();
     }
 
+    @Override
     public List<HumanEntity> getViewers() {
         return transaction;
     }
 
+    @Override
     public InventoryHolder getOwner() {
         return this.owner;
     }
 
+    @Override
     public void setMaxStackSize(int size) {
         maxStack = size;
     }
 
+    @Override
     public int getMaxStackSize() {
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
+    @Override
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -0,0 +1,237 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_4_6;
+
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_4_6.ItemStack;
+import net.minecraft.server.v1_4_6.PlayerInventory;
+
+import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
+
+public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
+
+    private final ItemStack[] extra = new ItemStack[5];
+    private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
+
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
+        this.playerOnline = online;
+        this.items = player.inventory.items;
+        this.armor = player.inventory.armor;
+    }
+
+    @Override
+    public Inventory getBukkitInventory() {
+        return inventory;
+    }
+
+    @Override
+    public void setPlayerOnline(Player player) {
+        if (!playerOnline) {
+            this.player = ((CraftPlayer) player).getHandle();
+            this.player.inventory.items = this.items;
+            this.player.inventory.armor = this.armor;
+            playerOnline = true;
+        }
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        playerOnline = false;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public ItemStack[] getContents() {
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
+    }
+
+    @Override
+    public int getSize() {
+        return super.getSize() + 5;
+    }
+
+    @Override
+    public ItemStack getItem(int i) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        return is[i];
+    }
+
+    @Override
+    public ItemStack splitStack(int i, int j) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (is[i] != null) {
+            ItemStack itemstack;
+
+            if (is[i].count <= j) {
+                itemstack = is[i];
+                is[i] = null;
+                return itemstack;
+            }
+            else {
+                itemstack = is[i].a(j);
+                if (is[i].count == 0) {
+                    is[i] = null;
+                }
+
+                return itemstack;
+            }
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Override
+    public ItemStack splitWithoutUpdate(int i) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (is[i] != null) {
+            ItemStack itemstack = is[i];
+
+            is[i] = null;
+            return itemstack;
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Override
+    public void setItem(int i, ItemStack itemstack) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        // Effects
+        if (is == this.extra) {
+            player.drop(itemstack);
+            itemstack = null;
+        }
+
+        is[i] = itemstack;
+
+        player.defaultContainer.b();
+    }
+
+    private int getReversedItemSlotNum(int i) {
+        if (i >= 27)
+            return i - 27;
+        else
+            return i + 9;
+    }
+
+    private int getReversedArmorSlotNum(int i) {
+        if (i == 0)
+            return 3;
+        if (i == 1)
+            return 2;
+        if (i == 2)
+            return 1;
+        if (i == 3)
+            return 0;
+        else
+            return i;
+    }
+
+    @Override
+    public String getName() {
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
+        }
+        return player.getName();
+    }
+
+}

OpenInvCraftbukkit1_4_R1/pom.xml

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

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

@@ -21,16 +21,22 @@ import java.lang.reflect.Field;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentChest;
 
-//Volatile
+import net.minecraft.server.v1_4_R1.Block;
-import net.minecraft.server.v1_4_R1.*;
+import net.minecraft.server.v1_4_R1.EntityPlayer;
+import net.minecraft.server.v1_4_R1.IInventory;
+import net.minecraft.server.v1_4_R1.InventoryLargeChest;
+import net.minecraft.server.v1_4_R1.Packet100OpenWindow;
+import net.minecraft.server.v1_4_R1.TileEntityChest;
+import net.minecraft.server.v1_4_R1.World;
 
-import org.bukkit.craftbukkit.v1_4_R1.entity.*;
+// Volatile
+import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
 
 public class AnySilentChest implements IAnySilentChest {
-    public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
@@ -51,10 +57,11 @@ public class AnySilentChest implements IAnySilentChest {
         return false;
     }
 
-    public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = (TileEntityChest) world.getTileEntity(x, y, z);
+        Object chest = world.getTileEntity(x, y, z);
         if (chest == null)
             return true;
 
@@ -100,9 +107,6 @@ public class AnySilentChest implements IAnySilentChest {
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
                 player.activeContainer.windowId = id;
                 player.activeContainer.addSlotListener(player);
-                if (OpenInv.NotifySilentChest()) {
-                    p.sendMessage("You are opening a chest silently.");
-                }
                 returnValue = false;
             }
             catch (Exception e) {
@@ -111,10 +115,6 @@ public class AnySilentChest implements IAnySilentChest {
             }
         }
 
-        if (anychest && OpenInv.NotifyAnyChest()) {
-            p.sendMessage("You are opening a blocked chest.");
-        }
-
         return returnValue;
     }
 }

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

@@ -23,11 +23,13 @@ import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.Permissions;
 import com.lishid.openinv.internal.IInventoryAccess;
 
+import net.minecraft.server.v1_4_R1.IInventory;
+
 // Volatile
-import net.minecraft.server.v1_4_R1.*;
+import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
-import org.bukkit.craftbukkit.v1_4_R1.inventory.*;
 
 public class InventoryAccess implements IInventoryAccess {
+    @Override
     public boolean check(Inventory inventory, HumanEntity player) {
         IInventory inv = ((CraftInventory) inventory).getInventory();
 

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

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

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

@@ -17,7 +17,10 @@
 package com.lishid.openinv.internal.v1_4_R1;
 
 // Volatile
-import net.minecraft.server.v1_4_R1.*;
+import net.minecraft.server.v1_4_R1.ContainerChest;
+import net.minecraft.server.v1_4_R1.EntityHuman;
+import net.minecraft.server.v1_4_R1.IInventory;
+import net.minecraft.server.v1_4_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -30,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

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

@@ -20,7 +20,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
 import org.bukkit.entity.HumanEntity;
@@ -29,17 +28,23 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
 // Volatile
-import net.minecraft.server.v1_4_R1.*;
+import net.minecraft.server.v1_4_R1.IInventory;
-import org.bukkit.craftbukkit.v1_4_R1.entity.*;
+import net.minecraft.server.v1_4_R1.InventoryEnderChest;
-import org.bukkit.craftbukkit.v1_4_R1.inventory.*;
+import net.minecraft.server.v1_4_R1.InventorySubcontainer;
+import net.minecraft.server.v1_4_R1.ItemStack;
+
+import org.bukkit.craftbukkit.v1_4_R1.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -47,80 +52,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
         this.items = enderChest.getContents();
-        OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
     }
 
+    @Override
     public Inventory getBukkitInventory() {
         return inventory;
     }
 
-    public void InventoryRemovalCheck() {
+    @Override
-        owner.saveData();
+    public void setPlayerOnline(Player player) {
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.enderChests.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    public void PlayerGoOnline(Player p) {
         if (!playerOnline) {
             try {
-                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
+                owner = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
             }
             catch (Exception e) {}
-            p.saveData();
             playerOnline = true;
         }
     }
 
-    public void PlayerGoOffline() {
+    @Override
+    public void setPlayerOffline() {
         playerOnline = false;
     }
 
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
     public ItemStack[] getContents() {
         return this.items;
     }
 
+    @Override
     public void onOpen(CraftHumanEntity who) {
         transaction.add(who);
     }
 
+    @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.InventoryRemovalCheck();
     }
 
+    @Override
     public List<HumanEntity> getViewers() {
         return transaction;
     }
 
+    @Override
     public InventoryHolder getOwner() {
         return this.owner;
     }
 
+    @Override
     public void setMaxStackSize(int size) {
         maxStack = size;
     }
 
+    @Override
     public int getMaxStackSize() {
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
+    @Override
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -0,0 +1,237 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_4_R1;
+
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_4_R1.ItemStack;
+import net.minecraft.server.v1_4_R1.PlayerInventory;
+
+import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
+
+public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
+
+    private final ItemStack[] extra = new ItemStack[5];
+    private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
+
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
+        this.playerOnline = online;
+        this.items = player.inventory.items;
+        this.armor = player.inventory.armor;
+    }
+
+    @Override
+    public Inventory getBukkitInventory() {
+        return inventory;
+    }
+
+    @Override
+    public void setPlayerOnline(Player player) {
+        if (!playerOnline) {
+            this.player = ((CraftPlayer) player).getHandle();
+            this.player.inventory.items = this.items;
+            this.player.inventory.armor = this.armor;
+            playerOnline = true;
+        }
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        playerOnline = false;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public ItemStack[] getContents() {
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
+    }
+
+    @Override
+    public int getSize() {
+        return super.getSize() + 5;
+    }
+
+    @Override
+    public ItemStack getItem(int i) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        return is[i];
+    }
+
+    @Override
+    public ItemStack splitStack(int i, int j) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (is[i] != null) {
+            ItemStack itemstack;
+
+            if (is[i].count <= j) {
+                itemstack = is[i];
+                is[i] = null;
+                return itemstack;
+            }
+            else {
+                itemstack = is[i].a(j);
+                if (is[i].count == 0) {
+                    is[i] = null;
+                }
+
+                return itemstack;
+            }
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Override
+    public ItemStack splitWithoutUpdate(int i) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (is[i] != null) {
+            ItemStack itemstack = is[i];
+
+            is[i] = null;
+            return itemstack;
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Override
+    public void setItem(int i, ItemStack itemstack) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        // Effects
+        if (is == this.extra) {
+            player.drop(itemstack);
+            itemstack = null;
+        }
+
+        is[i] = itemstack;
+
+        player.defaultContainer.b();
+    }
+
+    private int getReversedItemSlotNum(int i) {
+        if (i >= 27)
+            return i - 27;
+        else
+            return i + 9;
+    }
+
+    private int getReversedArmorSlotNum(int i) {
+        if (i == 0)
+            return 3;
+        if (i == 1)
+            return 2;
+        if (i == 2)
+            return 1;
+        if (i == 3)
+            return 0;
+        else
+            return i;
+    }
+
+    @Override
+    public String getName() {
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
+        }
+        return player.getName();
+    }
+
+}

OpenInvCraftbukkit1_5_R2/pom.xml

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

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

@@ -21,16 +21,21 @@ import java.lang.reflect.Field;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentChest;
 
 // Volatile
-import net.minecraft.server.v1_5_R2.*;
+import net.minecraft.server.v1_5_R2.EntityPlayer;
+import net.minecraft.server.v1_5_R2.IInventory;
+import net.minecraft.server.v1_5_R2.InventoryLargeChest;
+import net.minecraft.server.v1_5_R2.Packet100OpenWindow;
+import net.minecraft.server.v1_5_R2.TileEntityChest;
+import net.minecraft.server.v1_5_R2.World;
 
-import org.bukkit.craftbukkit.v1_5_R2.entity.*;
+import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
 
 public class AnySilentChest implements IAnySilentChest {
-    public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
@@ -53,10 +58,11 @@ public class AnySilentChest implements IAnySilentChest {
         return false;
     }
 
-    public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = (TileEntityChest) world.getTileEntity(x, y, z);
+        Object chest = world.getTileEntity(x, y, z);
         if (chest == null)
             return true;
 
@@ -104,9 +110,6 @@ public class AnySilentChest implements IAnySilentChest {
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
                 player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
-                if (OpenInv.NotifySilentChest()) {
-                    p.sendMessage("You are opening a chest silently.");
-                }
                 returnValue = false;
             }
             catch (Exception e) {
@@ -115,10 +118,6 @@ public class AnySilentChest implements IAnySilentChest {
             }
         }
 
-        if (anychest && OpenInv.NotifyAnyChest()) {
-            p.sendMessage("You are opening a blocked chest.");
-        }
-
         return returnValue;
     }
 }

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

@@ -24,10 +24,12 @@ import com.lishid.openinv.Permissions;
 import com.lishid.openinv.internal.IInventoryAccess;
 
 // Volatile
-import net.minecraft.server.v1_5_R2.*;
+import net.minecraft.server.v1_5_R2.IInventory;
-import org.bukkit.craftbukkit.v1_5_R2.inventory.*;
+
+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();
 

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

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

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

@@ -17,7 +17,10 @@
 package com.lishid.openinv.internal.v1_5_R2;
 
 // Volatile
-import net.minecraft.server.v1_5_R2.*;
+import net.minecraft.server.v1_5_R2.ContainerChest;
+import net.minecraft.server.v1_5_R2.EntityHuman;
+import net.minecraft.server.v1_5_R2.IInventory;
+import net.minecraft.server.v1_5_R2.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -30,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

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

@@ -20,7 +20,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
 import org.bukkit.entity.HumanEntity;
@@ -29,17 +28,23 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
 // Volatile
-import net.minecraft.server.v1_5_R2.*;
+import net.minecraft.server.v1_5_R2.IInventory;
-import org.bukkit.craftbukkit.v1_5_R2.entity.*;
+import net.minecraft.server.v1_5_R2.InventoryEnderChest;
-import org.bukkit.craftbukkit.v1_5_R2.inventory.*;
+import net.minecraft.server.v1_5_R2.InventorySubcontainer;
+import net.minecraft.server.v1_5_R2.ItemStack;
+
+import org.bukkit.craftbukkit.v1_5_R2.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -47,80 +52,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
         this.items = enderChest.getContents();
-        OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
     }
 
+    @Override
     public Inventory getBukkitInventory() {
         return inventory;
     }
 
-    public void InventoryRemovalCheck() {
+    @Override
-        owner.saveData();
+    public void setPlayerOnline(Player player) {
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.enderChests.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    public void PlayerGoOnline(Player p) {
         if (!playerOnline) {
             try {
-                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
+                owner = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
             }
             catch (Exception e) {}
-            p.saveData();
             playerOnline = true;
         }
     }
 
-    public void PlayerGoOffline() {
+    @Override
+    public void setPlayerOffline() {
         playerOnline = false;
     }
 
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
     public ItemStack[] getContents() {
         return this.items;
     }
 
+    @Override
     public void onOpen(CraftHumanEntity who) {
         transaction.add(who);
     }
 
+    @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.InventoryRemovalCheck();
     }
 
+    @Override
     public List<HumanEntity> getViewers() {
         return transaction;
     }
 
+    @Override
     public InventoryHolder getOwner() {
         return this.owner;
     }
 
+    @Override
     public void setMaxStackSize(int size) {
         maxStack = size;
     }
 
+    @Override
     public int getMaxStackSize() {
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
+    @Override
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -0,0 +1,237 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_5_R2;
+
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_5_R2.ItemStack;
+import net.minecraft.server.v1_5_R2.PlayerInventory;
+
+import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
+
+public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
+
+    private final ItemStack[] extra = new ItemStack[5];
+    private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
+
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
+        this.playerOnline = online;
+        this.items = player.inventory.items;
+        this.armor = player.inventory.armor;
+    }
+
+    @Override
+    public Inventory getBukkitInventory() {
+        return inventory;
+    }
+
+    @Override
+    public void setPlayerOnline(Player player) {
+        if (!playerOnline) {
+            this.player = ((CraftPlayer) player).getHandle();
+            this.player.inventory.items = this.items;
+            this.player.inventory.armor = this.armor;
+            playerOnline = true;
+        }
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        playerOnline = false;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public ItemStack[] getContents() {
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
+    }
+
+    @Override
+    public int getSize() {
+        return super.getSize() + 5;
+    }
+
+    @Override
+    public ItemStack getItem(int i) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        return is[i];
+    }
+
+    @Override
+    public ItemStack splitStack(int i, int j) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (is[i] != null) {
+            ItemStack itemstack;
+
+            if (is[i].count <= j) {
+                itemstack = is[i];
+                is[i] = null;
+                return itemstack;
+            }
+            else {
+                itemstack = is[i].a(j);
+                if (is[i].count == 0) {
+                    is[i] = null;
+                }
+
+                return itemstack;
+            }
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Override
+    public ItemStack splitWithoutUpdate(int i) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (is[i] != null) {
+            ItemStack itemstack = is[i];
+
+            is[i] = null;
+            return itemstack;
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Override
+    public void setItem(int i, ItemStack itemstack) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        // Effects
+        if (is == this.extra) {
+            player.drop(itemstack);
+            itemstack = null;
+        }
+
+        is[i] = itemstack;
+
+        player.defaultContainer.b();
+    }
+
+    private int getReversedItemSlotNum(int i) {
+        if (i >= 27)
+            return i - 27;
+        else
+            return i + 9;
+    }
+
+    private int getReversedArmorSlotNum(int i) {
+        if (i == 0)
+            return 3;
+        if (i == 1)
+            return 2;
+        if (i == 2)
+            return 1;
+        if (i == 3)
+            return 0;
+        else
+            return i;
+    }
+
+    @Override
+    public String getName() {
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
+        }
+        return player.getName();
+    }
+
+}

OpenInvCraftbukkit1_5_R3/pom.xml

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

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

@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_5_R3;
+
+import java.lang.reflect.Field;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.internal.IAnySilentChest;
+
+//Volatile
+import net.minecraft.server.v1_5_R3.EntityPlayer;
+import net.minecraft.server.v1_5_R3.IInventory;
+import net.minecraft.server.v1_5_R3.InventoryLargeChest;
+import net.minecraft.server.v1_5_R3.Packet100OpenWindow;
+import net.minecraft.server.v1_5_R3.TileEntityChest;
+import net.minecraft.server.v1_5_R3.World;
+
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
+
+public class AnySilentChest implements IAnySilentChest {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        // If block on top
+        if (world.t(x, y + 1, z))
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        // If block next to chest is chest and has a block on top
+        if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x + 1, y, z) == id) && (world.t(x + 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x, y, z - 1) == id) && (world.t(x, y + 1, z - 1)))
+            return true;
+        if ((world.getTypeId(x, y, z + 1) == id) && (world.t(x, y + 1, z + 1)))
+            return true;
+
+        return false;
+    }
+
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        Object chest = world.getTileEntity(x, y, z);
+        if (chest == null)
+            return true;
+
+        int id = world.getTypeId(x, y, z);
+
+        if (!anychest) {
+            if (world.t(x, y + 1, z))
+                return true;
+            if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x + 1, y, z) == id) && (world.t(x + 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x, y, z - 1) == id) && (world.t(x, y + 1, z - 1)))
+                return true;
+            if ((world.getTypeId(x, y, z + 1) == id) && (world.t(x, y + 1, z + 1)))
+                return true;
+        }
+
+        if (world.getTypeId(x - 1, y, z) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        if (world.getTypeId(x + 1, y, z) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        if (world.getTypeId(x, y, z - 1) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        if (world.getTypeId(x, y, z + 1) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+
+        boolean returnValue = true;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+        }
+        else {
+            try {
+                int windowId = 0;
+                try {
+                    Field windowID = player.getClass().getDeclaredField("containerCounter");
+                    windowID.setAccessible(true);
+                    windowId = windowID.getInt(player);
+                    windowId = windowId % 100 + 1;
+                    windowID.setInt(player, windowId);
+                }
+                catch (NoSuchFieldException e) {}
+
+                player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = false;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+}

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

@@ -24,10 +24,12 @@ import com.lishid.openinv.Permissions;
 import com.lishid.openinv.internal.IInventoryAccess;
 
 // Volatile
-import net.minecraft.server.v1_5_R3.*;
+import net.minecraft.server.v1_5_R3.IInventory;
-import org.bukkit.craftbukkit.v1_5_R3.inventory.*;
+
+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();
 

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

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

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

@@ -17,7 +17,10 @@
 package com.lishid.openinv.internal.v1_5_R3;
 
 // Volatile
-import net.minecraft.server.v1_5_R3.*;
+import net.minecraft.server.v1_5_R3.ContainerChest;
+import net.minecraft.server.v1_5_R3.EntityHuman;
+import net.minecraft.server.v1_5_R3.IInventory;
+import net.minecraft.server.v1_5_R3.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -30,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

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

@@ -20,7 +20,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
 import org.bukkit.entity.HumanEntity;
@@ -29,17 +28,23 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
 // Volatile
-import net.minecraft.server.v1_5_R3.*;
+import net.minecraft.server.v1_5_R3.IInventory;
-import org.bukkit.craftbukkit.v1_5_R3.entity.*;
+import net.minecraft.server.v1_5_R3.InventoryEnderChest;
-import org.bukkit.craftbukkit.v1_5_R3.inventory.*;
+import net.minecraft.server.v1_5_R3.InventorySubcontainer;
+import net.minecraft.server.v1_5_R3.ItemStack;
+
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -47,80 +52,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
         this.items = enderChest.getContents();
-        OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
     }
 
+    @Override
     public Inventory getBukkitInventory() {
         return inventory;
     }
 
-    public void InventoryRemovalCheck() {
+    @Override
-        owner.saveData();
+    public void setPlayerOnline(Player player) {
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.enderChests.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    public void PlayerGoOnline(Player p) {
         if (!playerOnline) {
             try {
-                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
+                owner = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
             }
             catch (Exception e) {}
-            p.saveData();
             playerOnline = true;
         }
     }
 
-    public void PlayerGoOffline() {
+    @Override
+    public void setPlayerOffline() {
         playerOnline = false;
     }
 
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
     public ItemStack[] getContents() {
         return this.items;
     }
 
+    @Override
     public void onOpen(CraftHumanEntity who) {
         transaction.add(who);
     }
 
+    @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.InventoryRemovalCheck();
     }
 
+    @Override
     public List<HumanEntity> getViewers() {
         return transaction;
     }
 
+    @Override
     public InventoryHolder getOwner() {
         return this.owner;
     }
 
+    @Override
     public void setMaxStackSize(int size) {
         maxStack = size;
     }
 
+    @Override
     public int getMaxStackSize() {
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
+    @Override
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -0,0 +1,237 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_5_R3;
+
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_5_R3.ItemStack;
+import net.minecraft.server.v1_5_R3.PlayerInventory;
+
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
+
+public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
+
+    private final ItemStack[] extra = new ItemStack[5];
+    private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
+
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
+        this.playerOnline = online;
+        this.items = player.inventory.items;
+        this.armor = player.inventory.armor;
+    }
+
+    @Override
+    public Inventory getBukkitInventory() {
+        return inventory;
+    }
+
+    @Override
+    public void setPlayerOnline(Player player) {
+        if (!playerOnline) {
+            this.player = ((CraftPlayer) player).getHandle();
+            this.player.inventory.items = this.items;
+            this.player.inventory.armor = this.armor;
+            playerOnline = true;
+        }
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        playerOnline = false;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public ItemStack[] getContents() {
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
+    }
+
+    @Override
+    public int getSize() {
+        return super.getSize() + 5;
+    }
+
+    @Override
+    public ItemStack getItem(int i) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        return is[i];
+    }
+
+    @Override
+    public ItemStack splitStack(int i, int j) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (is[i] != null) {
+            ItemStack itemstack;
+
+            if (is[i].count <= j) {
+                itemstack = is[i];
+                is[i] = null;
+                return itemstack;
+            }
+            else {
+                itemstack = is[i].a(j);
+                if (is[i].count == 0) {
+                    is[i] = null;
+                }
+
+                return itemstack;
+            }
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Override
+    public ItemStack splitWithoutUpdate(int i) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (is[i] != null) {
+            ItemStack itemstack = is[i];
+
+            is[i] = null;
+            return itemstack;
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Override
+    public void setItem(int i, ItemStack itemstack) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        // Effects
+        if (is == this.extra) {
+            player.drop(itemstack);
+            itemstack = null;
+        }
+
+        is[i] = itemstack;
+
+        player.defaultContainer.b();
+    }
+
+    private int getReversedItemSlotNum(int i) {
+        if (i >= 27)
+            return i - 27;
+        else
+            return i + 9;
+    }
+
+    private int getReversedArmorSlotNum(int i) {
+        if (i == 0)
+            return 3;
+        if (i == 1)
+            return 2;
+        if (i == 2)
+            return 1;
+        if (i == 3)
+            return 0;
+        else
+            return i;
+    }
+
+    @Override
+    public String getName() {
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
+        }
+        return player.getName();
+    }
+
+}

OpenInvCraftbukkit1_6_R1/pom.xml

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

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

@@ -21,16 +21,21 @@ import java.lang.reflect.Field;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentChest;
 
 // Volatile
-import net.minecraft.server.v1_6_R1.*;
+import net.minecraft.server.v1_6_R1.EntityPlayer;
+import net.minecraft.server.v1_6_R1.IInventory;
+import net.minecraft.server.v1_6_R1.InventoryLargeChest;
+import net.minecraft.server.v1_6_R1.Packet100OpenWindow;
+import net.minecraft.server.v1_6_R1.TileEntityChest;
+import net.minecraft.server.v1_6_R1.World;
 
-import org.bukkit.craftbukkit.v1_6_R1.entity.*;
+import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
 
 public class AnySilentChest implements IAnySilentChest {
-    public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
@@ -53,10 +58,11 @@ public class AnySilentChest implements IAnySilentChest {
         return false;
     }
 
-    public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = (TileEntityChest) world.getTileEntity(x, y, z);
+        Object chest = world.getTileEntity(x, y, z);
         if (chest == null)
             return true;
 
@@ -104,9 +110,6 @@ public class AnySilentChest implements IAnySilentChest {
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
                 player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
-                if (OpenInv.NotifySilentChest()) {
-                    p.sendMessage("You are opening a chest silently.");
-                }
                 returnValue = false;
             }
             catch (Exception e) {
@@ -115,10 +118,6 @@ public class AnySilentChest implements IAnySilentChest {
             }
         }
 
-        if (anychest && OpenInv.NotifyAnyChest()) {
-            p.sendMessage("You are opening a blocked chest.");
-        }
-
         return returnValue;
     }
 }

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

@@ -24,10 +24,12 @@ import com.lishid.openinv.Permissions;
 import com.lishid.openinv.internal.IInventoryAccess;
 
 // Volatile
-import net.minecraft.server.v1_6_R1.*;
+import net.minecraft.server.v1_6_R1.IInventory;
-import org.bukkit.craftbukkit.v1_6_R1.inventory.*;
+
+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();
 

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

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

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

@@ -17,7 +17,10 @@
 package com.lishid.openinv.internal.v1_6_R1;
 
 // Volatile
-import net.minecraft.server.v1_6_R1.*;
+import net.minecraft.server.v1_6_R1.ContainerChest;
+import net.minecraft.server.v1_6_R1.EntityHuman;
+import net.minecraft.server.v1_6_R1.IInventory;
+import net.minecraft.server.v1_6_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -30,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

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

@@ -20,7 +20,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
 import org.bukkit.entity.HumanEntity;
@@ -29,17 +28,23 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
 // Volatile
-import net.minecraft.server.v1_6_R1.*;
+import net.minecraft.server.v1_6_R1.IInventory;
-import org.bukkit.craftbukkit.v1_6_R1.entity.*;
+import net.minecraft.server.v1_6_R1.InventoryEnderChest;
-import org.bukkit.craftbukkit.v1_6_R1.inventory.*;
+import net.minecraft.server.v1_6_R1.InventorySubcontainer;
+import net.minecraft.server.v1_6_R1.ItemStack;
+
+import org.bukkit.craftbukkit.v1_6_R1.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -47,80 +52,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
         this.items = enderChest.getContents();
-        OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
     }
 
+    @Override
     public Inventory getBukkitInventory() {
         return inventory;
     }
 
-    public void InventoryRemovalCheck() {
+    @Override
-        owner.saveData();
+    public void setPlayerOnline(Player player) {
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.enderChests.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    public void PlayerGoOnline(Player p) {
         if (!playerOnline) {
             try {
-                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
+                owner = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
             }
             catch (Exception e) {}
-            p.saveData();
             playerOnline = true;
         }
     }
 
-    public void PlayerGoOffline() {
+    @Override
+    public void setPlayerOffline() {
         playerOnline = false;
     }
 
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
     public ItemStack[] getContents() {
         return this.items;
     }
 
+    @Override
     public void onOpen(CraftHumanEntity who) {
         transaction.add(who);
     }
 
+    @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.InventoryRemovalCheck();
     }
 
+    @Override
     public List<HumanEntity> getViewers() {
         return transaction;
     }
 
+    @Override
     public InventoryHolder getOwner() {
         return this.owner;
     }
 
+    @Override
     public void setMaxStackSize(int size) {
         maxStack = size;
     }
 
+    @Override
     public int getMaxStackSize() {
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
+    @Override
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -16,30 +16,29 @@
 
 package com.lishid.openinv.internal.v1_6_R1;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_6_R1.*;
+import net.minecraft.server.v1_6_R1.ItemStack;
-import org.bukkit.craftbukkit.v1_6_R1.entity.*;
+import net.minecraft.server.v1_6_R1.PlayerInventory;
-import org.bukkit.craftbukkit.v1_6_R1.inventory.*;
+
+import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
-    private ItemStack[] extra = new ItemStack[5];
-    private CraftInventory inventory = new CraftInventory(this);
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
+    private final ItemStack[] extra = new ItemStack[5];
-        super(((CraftPlayer) p).getHandle());
+    private final CraftInventory inventory = new CraftInventory(this);
-        this.owner = ((CraftPlayer) p);
+    private boolean playerOnline = false;
+
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
-        OpenInv.inventories.put(owner.getName().toLowerCase(), this);
     }
 
     @Override
@@ -48,42 +47,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public void InventoryRemovalCheck() {
+    public void setPlayerOnline(Player player) {
-        owner.saveData();
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.inventories.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    @Override
-    public void PlayerGoOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            this.player = ((CraftPlayer) player).getHandle();
-            p.getHandle().inventory.items = this.items;
+            this.player.inventory.items = this.items;
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.armor = this.armor;
-            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void PlayerGoOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        this.InventoryRemovalCheck();
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
+    public boolean isInUse() {
-        super.onClose(who);
+        return !this.getViewers().isEmpty();
-        this.InventoryRemovalCheck();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
+        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
+        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return C;
+        return contents;
     }
 
     @Override
@@ -209,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -246,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_6_R2/pom.xml

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

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

@@ -21,16 +21,21 @@ import java.lang.reflect.Field;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentChest;
 
 // Volatile
-import net.minecraft.server.v1_6_R2.*;
+import net.minecraft.server.v1_6_R2.EntityPlayer;
+import net.minecraft.server.v1_6_R2.IInventory;
+import net.minecraft.server.v1_6_R2.InventoryLargeChest;
+import net.minecraft.server.v1_6_R2.Packet100OpenWindow;
+import net.minecraft.server.v1_6_R2.TileEntityChest;
+import net.minecraft.server.v1_6_R2.World;
 
-import org.bukkit.craftbukkit.v1_6_R2.entity.*;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
 
 public class AnySilentChest implements IAnySilentChest {
-    public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
@@ -53,10 +58,11 @@ public class AnySilentChest implements IAnySilentChest {
         return false;
     }
 
-    public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = (TileEntityChest) world.getTileEntity(x, y, z);
+        Object chest = world.getTileEntity(x, y, z);
         if (chest == null)
             return true;
 
@@ -104,9 +110,6 @@ public class AnySilentChest implements IAnySilentChest {
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
                 player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
-                if (OpenInv.NotifySilentChest()) {
-                    p.sendMessage("You are opening a chest silently.");
-                }
                 returnValue = false;
             }
             catch (Exception e) {
@@ -115,10 +118,6 @@ public class AnySilentChest implements IAnySilentChest {
             }
         }
 
-        if (anychest && OpenInv.NotifyAnyChest()) {
-            p.sendMessage("You are opening a blocked chest.");
-        }
-
         return returnValue;
     }
 }

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

@@ -24,10 +24,12 @@ import com.lishid.openinv.Permissions;
 import com.lishid.openinv.internal.IInventoryAccess;
 
 // Volatile
-import net.minecraft.server.v1_6_R2.*;
+import net.minecraft.server.v1_6_R2.IInventory;
-import org.bukkit.craftbukkit.v1_6_R2.inventory.*;
+
+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();
 

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

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

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

@@ -17,7 +17,10 @@
 package com.lishid.openinv.internal.v1_6_R2;
 
 // Volatile
-import net.minecraft.server.v1_6_R2.*;
+import net.minecraft.server.v1_6_R2.ContainerChest;
+import net.minecraft.server.v1_6_R2.EntityHuman;
+import net.minecraft.server.v1_6_R2.IInventory;
+import net.minecraft.server.v1_6_R2.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -30,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

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

@@ -20,7 +20,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
 import org.bukkit.entity.HumanEntity;
@@ -29,17 +28,23 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
 // Volatile
-import net.minecraft.server.v1_6_R2.*;
+import net.minecraft.server.v1_6_R2.IInventory;
-import org.bukkit.craftbukkit.v1_6_R2.entity.*;
+import net.minecraft.server.v1_6_R2.InventoryEnderChest;
-import org.bukkit.craftbukkit.v1_6_R2.inventory.*;
+import net.minecraft.server.v1_6_R2.InventorySubcontainer;
+import net.minecraft.server.v1_6_R2.ItemStack;
+
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -47,80 +52,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
         this.items = enderChest.getContents();
-        OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
     }
 
+    @Override
     public Inventory getBukkitInventory() {
         return inventory;
     }
 
-    public void InventoryRemovalCheck() {
+    @Override
-        owner.saveData();
+    public void setPlayerOnline(Player player) {
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.enderChests.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    public void PlayerGoOnline(Player p) {
         if (!playerOnline) {
             try {
-                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
+                owner = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
             }
             catch (Exception e) {}
-            p.saveData();
             playerOnline = true;
         }
     }
 
-    public void PlayerGoOffline() {
+    @Override
+    public void setPlayerOffline() {
         playerOnline = false;
     }
 
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
     public ItemStack[] getContents() {
         return this.items;
     }
 
+    @Override
     public void onOpen(CraftHumanEntity who) {
         transaction.add(who);
     }
 
+    @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.InventoryRemovalCheck();
     }
 
+    @Override
     public List<HumanEntity> getViewers() {
         return transaction;
     }
 
+    @Override
     public InventoryHolder getOwner() {
         return this.owner;
     }
 
+    @Override
     public void setMaxStackSize(int size) {
         maxStack = size;
     }
 
+    @Override
     public int getMaxStackSize() {
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
+    @Override
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -16,30 +16,29 @@
 
 package com.lishid.openinv.internal.v1_6_R2;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_6_R2.*;
+import net.minecraft.server.v1_6_R2.ItemStack;
-import org.bukkit.craftbukkit.v1_6_R2.entity.*;
+import net.minecraft.server.v1_6_R2.PlayerInventory;
-import org.bukkit.craftbukkit.v1_6_R2.inventory.*;
+
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
-    private ItemStack[] extra = new ItemStack[5];
-    private CraftInventory inventory = new CraftInventory(this);
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
+    private final ItemStack[] extra = new ItemStack[5];
-        super(((CraftPlayer) p).getHandle());
+    private final CraftInventory inventory = new CraftInventory(this);
-        this.owner = ((CraftPlayer) p);
+    private boolean playerOnline = false;
+
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
-        OpenInv.inventories.put(owner.getName().toLowerCase(), this);
     }
 
     @Override
@@ -48,42 +47,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public void InventoryRemovalCheck() {
+    public void setPlayerOnline(Player player) {
-        owner.saveData();
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.inventories.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    @Override
-    public void PlayerGoOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            this.player = ((CraftPlayer) player).getHandle();
-            p.getHandle().inventory.items = this.items;
+            this.player.inventory.items = this.items;
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.armor = this.armor;
-            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void PlayerGoOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        this.InventoryRemovalCheck();
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
+    public boolean isInUse() {
-        super.onClose(who);
+        return !this.getViewers().isEmpty();
-        this.InventoryRemovalCheck();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
+        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
+        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return C;
+        return contents;
     }
 
     @Override
@@ -209,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -246,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_6_R3/pom.xml

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

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

@@ -21,16 +21,21 @@ import java.lang.reflect.Field;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentChest;
 
 // Volatile
-import net.minecraft.server.v1_6_R3.*;
+import net.minecraft.server.v1_6_R3.EntityPlayer;
+import net.minecraft.server.v1_6_R3.IInventory;
+import net.minecraft.server.v1_6_R3.InventoryLargeChest;
+import net.minecraft.server.v1_6_R3.Packet100OpenWindow;
+import net.minecraft.server.v1_6_R3.TileEntityChest;
+import net.minecraft.server.v1_6_R3.World;
 
-import org.bukkit.craftbukkit.v1_6_R3.entity.*;
+import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
 
 public class AnySilentChest implements IAnySilentChest {
-    public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
@@ -53,10 +58,11 @@ public class AnySilentChest implements IAnySilentChest {
         return false;
     }
 
-    public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = (TileEntityChest) world.getTileEntity(x, y, z);
+        Object chest = world.getTileEntity(x, y, z);
         if (chest == null)
             return true;
 
@@ -104,9 +110,6 @@ public class AnySilentChest implements IAnySilentChest {
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
                 player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
-                if (OpenInv.NotifySilentChest()) {
-                    p.sendMessage("You are opening a chest silently.");
-                }
                 returnValue = false;
             }
             catch (Exception e) {
@@ -115,10 +118,6 @@ public class AnySilentChest implements IAnySilentChest {
             }
         }
 
-        if (anychest && OpenInv.NotifyAnyChest()) {
-            p.sendMessage("You are opening a blocked chest.");
-        }
-
         return returnValue;
     }
 }

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

@@ -24,10 +24,12 @@ import com.lishid.openinv.Permissions;
 import com.lishid.openinv.internal.IInventoryAccess;
 
 // Volatile
-import net.minecraft.server.v1_6_R3.*;
+import net.minecraft.server.v1_6_R3.IInventory;
-import org.bukkit.craftbukkit.v1_6_R3.inventory.*;
+
+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();
 

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

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

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

@@ -17,7 +17,10 @@
 package com.lishid.openinv.internal.v1_6_R3;
 
 // Volatile
-import net.minecraft.server.v1_6_R3.*;
+import net.minecraft.server.v1_6_R3.ContainerChest;
+import net.minecraft.server.v1_6_R3.EntityHuman;
+import net.minecraft.server.v1_6_R3.IInventory;
+import net.minecraft.server.v1_6_R3.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -30,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

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

@@ -20,7 +20,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
 import org.bukkit.entity.HumanEntity;
@@ -29,17 +28,23 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
 // Volatile
-import net.minecraft.server.v1_6_R3.*;
+import net.minecraft.server.v1_6_R3.IInventory;
-import org.bukkit.craftbukkit.v1_6_R3.entity.*;
+import net.minecraft.server.v1_6_R3.InventoryEnderChest;
-import org.bukkit.craftbukkit.v1_6_R3.inventory.*;
+import net.minecraft.server.v1_6_R3.InventorySubcontainer;
+import net.minecraft.server.v1_6_R3.ItemStack;
+
+import org.bukkit.craftbukkit.v1_6_R3.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -47,80 +52,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
         this.items = enderChest.getContents();
-        OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
     }
 
+    @Override
     public Inventory getBukkitInventory() {
         return inventory;
     }
 
-    public void InventoryRemovalCheck() {
+    @Override
-        owner.saveData();
+    public void setPlayerOnline(Player player) {
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.enderChests.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    public void PlayerGoOnline(Player p) {
         if (!playerOnline) {
             try {
-                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
+                owner = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
             }
             catch (Exception e) {}
-            p.saveData();
             playerOnline = true;
         }
     }
 
-    public void PlayerGoOffline() {
+    @Override
+    public void setPlayerOffline() {
         playerOnline = false;
     }
 
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
     public ItemStack[] getContents() {
         return this.items;
     }
 
+    @Override
     public void onOpen(CraftHumanEntity who) {
         transaction.add(who);
     }
 
+    @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.InventoryRemovalCheck();
     }
 
+    @Override
     public List<HumanEntity> getViewers() {
         return transaction;
     }
 
+    @Override
     public InventoryHolder getOwner() {
         return this.owner;
     }
 
+    @Override
     public void setMaxStackSize(int size) {
         maxStack = size;
     }
 
+    @Override
     public int getMaxStackSize() {
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
+    @Override
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -16,30 +16,29 @@
 
 package com.lishid.openinv.internal.v1_6_R3;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_6_R3.*;
+import net.minecraft.server.v1_6_R3.ItemStack;
-import org.bukkit.craftbukkit.v1_6_R3.entity.*;
+import net.minecraft.server.v1_6_R3.PlayerInventory;
-import org.bukkit.craftbukkit.v1_6_R3.inventory.*;
+
+import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
-    private ItemStack[] extra = new ItemStack[5];
-    private CraftInventory inventory = new CraftInventory(this);
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
+    private final ItemStack[] extra = new ItemStack[5];
-        super(((CraftPlayer) p).getHandle());
+    private final CraftInventory inventory = new CraftInventory(this);
-        this.owner = ((CraftPlayer) p);
+    private boolean playerOnline = false;
+
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
-        OpenInv.inventories.put(owner.getName().toLowerCase(), this);
     }
 
     @Override
@@ -48,42 +47,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public void InventoryRemovalCheck() {
+    public void setPlayerOnline(Player player) {
-        owner.saveData();
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.inventories.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    @Override
-    public void PlayerGoOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            this.player = ((CraftPlayer) player).getHandle();
-            p.getHandle().inventory.items = this.items;
+            this.player.inventory.items = this.items;
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.armor = this.armor;
-            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void PlayerGoOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        this.InventoryRemovalCheck();
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
+    public boolean isInUse() {
-        super.onClose(who);
+        return !this.getViewers().isEmpty();
-        this.InventoryRemovalCheck();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
+        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
+        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return C;
+        return contents;
     }
 
     @Override
@@ -209,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -246,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_7_R1/pom.xml

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

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

@@ -21,16 +21,22 @@ import java.lang.reflect.Field;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentChest;
 
 //Volatile
-import net.minecraft.server.v1_7_R1.*;
+import net.minecraft.server.v1_7_R1.Block;
+import net.minecraft.server.v1_7_R1.EntityPlayer;
+import net.minecraft.server.v1_7_R1.IInventory;
+import net.minecraft.server.v1_7_R1.InventoryLargeChest;
+import net.minecraft.server.v1_7_R1.PacketPlayOutOpenWindow;
+import net.minecraft.server.v1_7_R1.TileEntityChest;
+import net.minecraft.server.v1_7_R1.World;
 
-import org.bukkit.craftbukkit.v1_7_R1.entity.*;
+import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
 
 public class AnySilentChest implements IAnySilentChest {
-    public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
@@ -53,10 +59,11 @@ public class AnySilentChest implements IAnySilentChest {
         return false;
     }
 
-    public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = (TileEntityChest) world.getTileEntity(x, y, z);
+        Object chest = world.getTileEntity(x, y, z);
         if (chest == null)
             return true;
 
@@ -104,9 +111,6 @@ public class AnySilentChest implements IAnySilentChest {
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
                 player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
-                if (OpenInv.NotifySilentChest()) {
-                    p.sendMessage("You are opening a chest silently.");
-                }
                 returnValue = false;
             }
             catch (Exception e) {
@@ -115,10 +119,6 @@ public class AnySilentChest implements IAnySilentChest {
             }
         }
 
-        if (anychest && OpenInv.NotifyAnyChest()) {
-            p.sendMessage("You are opening a blocked chest.");
-        }
-
         return returnValue;
     }
 }

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

@@ -24,10 +24,12 @@ import com.lishid.openinv.Permissions;
 import com.lishid.openinv.internal.IInventoryAccess;
 
 // Volatile
-import net.minecraft.server.v1_7_R1.*;
+import net.minecraft.server.v1_7_R1.IInventory;
-import org.bukkit.craftbukkit.v1_7_R1.inventory.*;
+
+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();
 

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

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

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

@@ -17,7 +17,10 @@
 package com.lishid.openinv.internal.v1_7_R1;
 
 // Volatile
-import net.minecraft.server.v1_7_R1.*;
+import net.minecraft.server.v1_7_R1.ContainerChest;
+import net.minecraft.server.v1_7_R1.EntityHuman;
+import net.minecraft.server.v1_7_R1.IInventory;
+import net.minecraft.server.v1_7_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -30,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried(), false);
+            playerinventory.setCarried(null);
+        }
     }
 }

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

@@ -20,7 +20,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
 import org.bukkit.entity.HumanEntity;
@@ -29,17 +28,23 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
 // Volatile
-import net.minecraft.server.v1_7_R1.*;
+import net.minecraft.server.v1_7_R1.IInventory;
-import org.bukkit.craftbukkit.v1_7_R1.entity.*;
+import net.minecraft.server.v1_7_R1.InventoryEnderChest;
-import org.bukkit.craftbukkit.v1_7_R1.inventory.*;
+import net.minecraft.server.v1_7_R1.InventorySubcontainer;
+import net.minecraft.server.v1_7_R1.ItemStack;
+
+import org.bukkit.craftbukkit.v1_7_R1.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -47,80 +52,76 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
         this.items = enderChest.getContents();
-        OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
     }
 
+    @Override
     public Inventory getBukkitInventory() {
         return inventory;
     }
 
-    public void InventoryRemovalCheck() {
+    @Override
-        owner.saveData();
+    public void setPlayerOnline(Player player) {
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.enderChests.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    public void PlayerGoOnline(Player p) {
         if (!playerOnline) {
             try {
-                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
+                owner = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
             }
             catch (Exception e) {}
-            p.saveData();
             playerOnline = true;
         }
     }
 
-    public void PlayerGoOffline() {
+    @Override
+    public void setPlayerOffline() {
         playerOnline = false;
     }
 
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
     public ItemStack[] getContents() {
         return this.items;
     }
 
+    @Override
     public void onOpen(CraftHumanEntity who) {
         transaction.add(who);
     }
 
+    @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.InventoryRemovalCheck();
     }
 
+    @Override
     public List<HumanEntity> getViewers() {
         return transaction;
     }
 
+    @Override
     public InventoryHolder getOwner() {
         return this.owner;
     }
 
+    @Override
     public void setMaxStackSize(int size) {
         maxStack = size;
     }
 
+    @Override
     public int getMaxStackSize() {
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
+    @Override
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     public void update() {
+        super.update();
         enderChest.update();
     }
 }

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

@@ -16,30 +16,29 @@
 
 package com.lishid.openinv.internal.v1_7_R1;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_7_R1.*;
+import net.minecraft.server.v1_7_R1.ItemStack;
-import org.bukkit.craftbukkit.v1_7_R1.entity.*;
+import net.minecraft.server.v1_7_R1.PlayerInventory;
-import org.bukkit.craftbukkit.v1_7_R1.inventory.*;
+
+import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
-    private ItemStack[] extra = new ItemStack[5];
-    private CraftInventory inventory = new CraftInventory(this);
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
+    private final ItemStack[] extra = new ItemStack[5];
-        super(((CraftPlayer) p).getHandle());
+    private final CraftInventory inventory = new CraftInventory(this);
-        this.owner = ((CraftPlayer) p);
+    private boolean playerOnline = false;
+
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
-        OpenInv.inventories.put(owner.getName().toLowerCase(), this);
     }
 
     @Override
@@ -48,42 +47,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public void InventoryRemovalCheck() {
+    public void setPlayerOnline(Player player) {
-        owner.saveData();
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.inventories.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    @Override
-    public void PlayerGoOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            this.player = ((CraftPlayer) player).getHandle();
-            p.getHandle().inventory.items = this.items;
+            this.player.inventory.items = this.items;
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.armor = this.armor;
-            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void PlayerGoOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        this.InventoryRemovalCheck();
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
+    public boolean isInUse() {
-        super.onClose(who);
+        return !this.getViewers().isEmpty();
-        this.InventoryRemovalCheck();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
+        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
+        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return C;
+        return contents;
     }
 
     @Override
@@ -209,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -246,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_7_R2/pom.xml

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

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

@@ -21,16 +21,22 @@ import java.lang.reflect.Field;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentChest;
 
+import net.minecraft.server.v1_7_R2.Block;
 //Volatile
-import net.minecraft.server.v1_7_R2.*;
+import net.minecraft.server.v1_7_R2.EntityPlayer;
+import net.minecraft.server.v1_7_R2.IInventory;
+import net.minecraft.server.v1_7_R2.InventoryLargeChest;
+import net.minecraft.server.v1_7_R2.PacketPlayOutOpenWindow;
+import net.minecraft.server.v1_7_R2.TileEntityChest;
+import net.minecraft.server.v1_7_R2.World;
 
-import org.bukkit.craftbukkit.v1_7_R2.entity.*;
+import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
 
 public class AnySilentChest implements IAnySilentChest {
-    public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
@@ -53,10 +59,11 @@ public class AnySilentChest implements IAnySilentChest {
         return false;
     }
 
-    public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = (TileEntityChest) world.getTileEntity(x, y, z);
+        Object chest = world.getTileEntity(x, y, z);
         if (chest == null)
             return true;
 
@@ -104,9 +111,6 @@ public class AnySilentChest implements IAnySilentChest {
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
                 player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
-                if (OpenInv.NotifySilentChest()) {
-                    p.sendMessage("You are opening a chest silently.");
-                }
                 returnValue = false;
             }
             catch (Exception e) {
@@ -115,10 +119,6 @@ public class AnySilentChest implements IAnySilentChest {
             }
         }
 
-        if (anychest && OpenInv.NotifyAnyChest()) {
-            p.sendMessage("You are opening a blocked chest.");
-        }
-
         return returnValue;
     }
 }

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

@@ -24,10 +24,12 @@ import com.lishid.openinv.Permissions;
 import com.lishid.openinv.internal.IInventoryAccess;
 
 // Volatile
-import net.minecraft.server.v1_7_R2.*;
+import net.minecraft.server.v1_7_R2.IInventory;
-import org.bukkit.craftbukkit.v1_7_R2.inventory.*;
+
+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();
 

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

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

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

@@ -17,7 +17,10 @@
 package com.lishid.openinv.internal.v1_7_R2;
 
 // Volatile
-import net.minecraft.server.v1_7_R2.*;
+import net.minecraft.server.v1_7_R2.ContainerChest;
+import net.minecraft.server.v1_7_R2.EntityHuman;
+import net.minecraft.server.v1_7_R2.IInventory;
+import net.minecraft.server.v1_7_R2.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -30,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried(), false);
+            playerinventory.setCarried(null);
+        }
     }
 }

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

@@ -20,7 +20,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
 import org.bukkit.entity.HumanEntity;
@@ -29,17 +28,23 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
 // Volatile
-import net.minecraft.server.v1_7_R2.*;
+import net.minecraft.server.v1_7_R2.IInventory;
-import org.bukkit.craftbukkit.v1_7_R2.entity.*;
+import net.minecraft.server.v1_7_R2.InventoryEnderChest;
-import org.bukkit.craftbukkit.v1_7_R2.inventory.*;
+import net.minecraft.server.v1_7_R2.InventorySubcontainer;
+import net.minecraft.server.v1_7_R2.ItemStack;
+
+import org.bukkit.craftbukkit.v1_7_R2.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_7_R2.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -47,80 +52,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
         this.items = enderChest.getContents();
-        OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
     }
 
+    @Override
     public Inventory getBukkitInventory() {
         return inventory;
     }
 
-    public void InventoryRemovalCheck() {
+    @Override
-        owner.saveData();
+    public void setPlayerOnline(Player player) {
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.enderChests.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    public void PlayerGoOnline(Player p) {
         if (!playerOnline) {
             try {
-                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
+                owner = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
             }
             catch (Exception e) {}
-            p.saveData();
             playerOnline = true;
         }
     }
 
-    public void PlayerGoOffline() {
+    @Override
+    public void setPlayerOffline() {
         playerOnline = false;
     }
 
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
     public ItemStack[] getContents() {
         return this.items;
     }
 
+    @Override
     public void onOpen(CraftHumanEntity who) {
         transaction.add(who);
     }
 
+    @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.InventoryRemovalCheck();
     }
 
+    @Override
     public List<HumanEntity> getViewers() {
         return transaction;
     }
 
+    @Override
     public InventoryHolder getOwner() {
         return this.owner;
     }
 
+    @Override
     public void setMaxStackSize(int size) {
         maxStack = size;
     }
 
+    @Override
     public int getMaxStackSize() {
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
+    @Override
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -16,30 +16,29 @@
 
 package com.lishid.openinv.internal.v1_7_R2;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_7_R2.*;
+import net.minecraft.server.v1_7_R2.ItemStack;
-import org.bukkit.craftbukkit.v1_7_R2.entity.*;
+import net.minecraft.server.v1_7_R2.PlayerInventory;
-import org.bukkit.craftbukkit.v1_7_R2.inventory.*;
+
+import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_7_R2.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
-    private ItemStack[] extra = new ItemStack[5];
-    private CraftInventory inventory = new CraftInventory(this);
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
+    private final ItemStack[] extra = new ItemStack[5];
-        super(((CraftPlayer) p).getHandle());
+    private final CraftInventory inventory = new CraftInventory(this);
-        this.owner = ((CraftPlayer) p);
+    private boolean playerOnline = false;
+
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
-        OpenInv.inventories.put(owner.getName().toLowerCase(), this);
     }
 
     @Override
@@ -48,42 +47,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public void InventoryRemovalCheck() {
+    public void setPlayerOnline(Player player) {
-        owner.saveData();
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.inventories.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    @Override
-    public void PlayerGoOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            this.player = ((CraftPlayer) player).getHandle();
-            p.getHandle().inventory.items = this.items;
+            this.player.inventory.items = this.items;
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.armor = this.armor;
-            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void PlayerGoOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        this.InventoryRemovalCheck();
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
+    public boolean isInUse() {
-        super.onClose(who);
+        return !this.getViewers().isEmpty();
-        this.InventoryRemovalCheck();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
+        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
+        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return C;
+        return contents;
     }
 
     @Override
@@ -209,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -246,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

OpenInvCraftbukkit1_7_R3/pom.xml

@@ -0,0 +1,32 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>OpenInvCraftbukkit1_7_R3</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>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.7.9-R0.2-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

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

@@ -21,16 +21,22 @@ import java.lang.reflect.Field;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentChest;
 
 // Volatile
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R3.Block;
+import net.minecraft.server.v1_7_R3.EntityPlayer;
+import net.minecraft.server.v1_7_R3.IInventory;
+import net.minecraft.server.v1_7_R3.InventoryLargeChest;
+import net.minecraft.server.v1_7_R3.PacketPlayOutOpenWindow;
+import net.minecraft.server.v1_7_R3.TileEntityChest;
+import net.minecraft.server.v1_7_R3.World;
 
-import org.bukkit.craftbukkit.v1_7_R3.entity.*;
+import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer;
 
 public class AnySilentChest implements IAnySilentChest {
-    public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
@@ -53,10 +59,11 @@ public class AnySilentChest implements IAnySilentChest {
         return false;
     }
 
-    public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        Object chest = (TileEntityChest) world.getTileEntity(x, y, z);
+        Object chest = world.getTileEntity(x, y, z);
         if (chest == null)
             return true;
 
@@ -104,9 +111,6 @@ public class AnySilentChest implements IAnySilentChest {
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
                 player.activeContainer.windowId = windowId;
                 player.activeContainer.addSlotListener(player);
-                if (OpenInv.NotifySilentChest()) {
-                    p.sendMessage("You are opening a chest silently.");
-                }
                 returnValue = false;
             }
             catch (Exception e) {
@@ -115,10 +119,6 @@ public class AnySilentChest implements IAnySilentChest {
             }
         }
 
-        if (anychest && OpenInv.NotifyAnyChest()) {
-            p.sendMessage("You are opening a blocked chest.");
-        }
-
         return returnValue;
     }
 }

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

@@ -24,10 +24,12 @@ import com.lishid.openinv.Permissions;
 import com.lishid.openinv.internal.IInventoryAccess;
 
 // Volatile
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R3.IInventory;
-import org.bukkit.craftbukkit.v1_7_R3.inventory.*;
+
+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();
 

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

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

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

@@ -17,7 +17,10 @@
 package com.lishid.openinv.internal.v1_7_R3;
 
 // Volatile
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R3.ContainerChest;
+import net.minecraft.server.v1_7_R3.EntityHuman;
+import net.minecraft.server.v1_7_R3.IInventory;
+import net.minecraft.server.v1_7_R3.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -30,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried(), false);
+            playerinventory.setCarried(null);
+        }
     }
 }

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

@@ -20,7 +20,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
 import org.bukkit.entity.HumanEntity;
@@ -29,17 +28,23 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
 // Volatile
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R3.IInventory;
-import org.bukkit.craftbukkit.v1_7_R3.entity.*;
+import net.minecraft.server.v1_7_R3.InventoryEnderChest;
-import org.bukkit.craftbukkit.v1_7_R3.inventory.*;
+import net.minecraft.server.v1_7_R3.InventorySubcontainer;
+import net.minecraft.server.v1_7_R3.ItemStack;
+
+import org.bukkit.craftbukkit.v1_7_R3.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -47,80 +52,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         this.enderChest = player.getHandle().getEnderChest();
         this.owner = player;
         this.items = enderChest.getContents();
-        OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
     }
 
+    @Override
     public Inventory getBukkitInventory() {
         return inventory;
     }
 
-    public void InventoryRemovalCheck() {
+    @Override
-        owner.saveData();
+    public void setPlayerOnline(Player player) {
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.enderChests.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    public void PlayerGoOnline(Player p) {
         if (!playerOnline) {
             try {
-                InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
+                owner = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
             }
             catch (Exception e) {}
-            p.saveData();
             playerOnline = true;
         }
     }
 
-    public void PlayerGoOffline() {
+    @Override
+    public void setPlayerOffline() {
         playerOnline = false;
     }
 
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
     public ItemStack[] getContents() {
         return this.items;
     }
 
+    @Override
     public void onOpen(CraftHumanEntity who) {
         transaction.add(who);
     }
 
+    @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.InventoryRemovalCheck();
     }
 
+    @Override
     public List<HumanEntity> getViewers() {
         return transaction;
     }
 
+    @Override
     public InventoryHolder getOwner() {
         return this.owner;
     }
 
+    @Override
     public void setMaxStackSize(int size) {
         maxStack = size;
     }
 
+    @Override
     public int getMaxStackSize() {
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
+    @Override
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

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

@@ -16,30 +16,29 @@
 
 package com.lishid.openinv.internal.v1_7_R3;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R3.ItemStack;
-import org.bukkit.craftbukkit.v1_7_R3.entity.*;
+import net.minecraft.server.v1_7_R3.PlayerInventory;
-import org.bukkit.craftbukkit.v1_7_R3.inventory.*;
+
+import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
-    private ItemStack[] extra = new ItemStack[5];
-    private CraftInventory inventory = new CraftInventory(this);
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
+    private final ItemStack[] extra = new ItemStack[5];
-        super(((CraftPlayer) p).getHandle());
+    private final CraftInventory inventory = new CraftInventory(this);
-        this.owner = ((CraftPlayer) p);
+    private boolean playerOnline = false;
+
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
-        OpenInv.inventories.put(owner.getName().toLowerCase(), this);
     }
 
     @Override
@@ -48,42 +47,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public void InventoryRemovalCheck() {
+    public void setPlayerOnline(Player player) {
-        owner.saveData();
-        if (transaction.isEmpty() && !playerOnline) {
-            OpenInv.inventories.remove(owner.getName().toLowerCase());
-        }
-    }
-
-    @Override
-    public void PlayerGoOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            this.player = ((CraftPlayer) player).getHandle();
-            p.getHandle().inventory.items = this.items;
+            this.player.inventory.items = this.items;
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.armor = this.armor;
-            p.saveData();
             playerOnline = true;
         }
     }
 
     @Override
-    public void PlayerGoOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        this.InventoryRemovalCheck();
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
+    public boolean isInUse() {
-        super.onClose(who);
+        return !this.getViewers().isEmpty();
-        this.InventoryRemovalCheck();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
+        ItemStack[] contents = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
+        System.arraycopy(items, 0, contents, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
-        return C;
+        return contents;
     }
 
     @Override
@@ -209,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -246,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }