Removed item wand functionality

Anyone who can use it has to be able to run the command anyway. If they can run the command, they can use tab completion to automatically fill in anyone online's name. There's no need to keep around a bunch of deprecated code for a function I sincerely doubt anyone actually uses.

src/com/lishid/openinv/OpenInv.java

@@ -31,7 +31,6 @@ import com.lishid.openinv.commands.OpenEnderPluginCommand;
 import com.lishid.openinv.commands.OpenInvPluginCommand;
 import com.lishid.openinv.commands.SearchInvPluginCommand;
 import com.lishid.openinv.commands.SilentChestPluginCommand;
-import com.lishid.openinv.commands.ToggleOpenInvPluginCommand;
 import com.lishid.openinv.internal.IAnySilentChest;
 import com.lishid.openinv.internal.IInventoryAccess;
 import com.lishid.openinv.internal.IPlayerDataManager;
@@ -79,21 +78,16 @@ public class OpenInv extends JavaPlugin {
         FileConfiguration config = getConfig();
         config.set("NotifySilentChest", config.getBoolean("NotifySilentChest", true));
         config.set("NotifyAnyChest", config.getBoolean("NotifyAnyChest", true));
-        config.set("ItemOpenInvItemID", config.getInt("ItemOpenInvItemID", 280));
-        config.addDefault("ItemOpenInvItemID", 280);
-        config.addDefault("CheckForUpdates", true);
         config.addDefault("NotifySilentChest", true);
         config.addDefault("NotifyAnyChest", true);
         config.options().copyDefaults(true);
         saveConfig();
 
         pm.registerEvents(new OpenInvPlayerListener(), this);
-        pm.registerEvents(new OpenInvEntityListener(), this);
         pm.registerEvents(new OpenInvInventoryListener(), this);
 
         getCommand("openinv").setExecutor(new OpenInvPluginCommand(this));
         getCommand("searchinv").setExecutor(new SearchInvPluginCommand());
-        getCommand("toggleopeninv").setExecutor(new ToggleOpenInvPluginCommand());
         getCommand("silentchest").setExecutor(new SilentChestPluginCommand(this));
         getCommand("anychest").setExecutor(new AnyChestPluginCommand(this));
         getCommand("openender").setExecutor(new OpenEnderPluginCommand(this));

src/com/lishid/openinv/OpenInvEntityListener.java

@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2011-2014 lishid.  All rights reserved.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation,  version 3.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-
-public class OpenInvEntityListener implements Listener {
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onEntityDamage(EntityDamageEvent event) {
-        if (event instanceof EntityDamageByEntityEvent) {
-            EntityDamageByEntityEvent evt = (EntityDamageByEntityEvent) event;
-            Entity attacker = evt.getDamager();
-            Entity defender = evt.getEntity();
-
-            if (!(attacker instanceof Player) || !(defender instanceof Player)) {
-                return;
-            }
-
-            Player player = (Player) attacker;
-
-            if (!(player.getItemInHand().getType().getId() == OpenInv.GetItemOpenInvItem()) || (!OpenInv.GetPlayerItemOpenInvStatus(player.getName())) || !OpenInv.hasPermission(player, "OpenInv.openinv")) {
-                return;
-            }
-
-            Player target = (Player) defender;
-            player.performCommand("openinv " + target.getName());
-
-            evt.setDamage(0);
-            evt.setCancelled(true);
-        }
-    }
-}

src/com/lishid/openinv/OpenInvInventoryListener.java

@@ -20,6 +20,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryDragEvent;
 
 public class OpenInvInventoryListener implements Listener {
     @EventHandler(priority = EventPriority.NORMAL)
@@ -32,4 +33,11 @@ public class OpenInvInventoryListener implements Listener {
         }
         // }
     }
+
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onInventoryDrag(InventoryDragEvent event) {
+        if (!OpenInv.inventoryAccess.check(event.getInventory(), event.getWhoClicked())) {
+            event.setCancelled(true);
+        }
+    }
 }

src/com/lishid/openinv/OpenInvPlayerListener.java

@@ -121,13 +121,5 @@ public class OpenInvPlayerListener implements Listener {
                 ex.printStackTrace();
             }
         }
-
-        if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-            if (!(player.getItemInHand().getType().getId() == OpenInv.GetItemOpenInvItem()) || (!OpenInv.GetPlayerItemOpenInvStatus(player.getName())) || !OpenInv.hasPermission(player, Permissions.PERM_OPENINV)) {
-                return;
-            }
-
-            player.performCommand("openinv");
-        }
     }
 }

src/com/lishid/openinv/commands/ToggleOpenInvPluginCommand.java

@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2011-2014 lishid.  All rights reserved.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation,  version 3.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.commands;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.lishid.openinv.OpenInv;
-
-public class ToggleOpenInvPluginCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (!(sender instanceof Player)) {
-            sender.sendMessage(ChatColor.RED + "You can't use this from the console.");
-            return true;
-        }
-
-        Player player = (Player) sender;
-        if (args.length > 0) {
-            if (args[0].equalsIgnoreCase("check")) {
-                if (OpenInv.GetPlayerItemOpenInvStatus(player.getName()))
-                    player.sendMessage("OpenInv with " + Material.getMaterial(OpenInv.GetItemOpenInvItem()).toString() + " is ON.");
-                else
-                    player.sendMessage("OpenInv with " + Material.getMaterial(OpenInv.GetItemOpenInvItem()).toString() + " is OFF.");
-            }
-        }
-        if (OpenInv.GetPlayerItemOpenInvStatus(player.getName())) {
-            OpenInv.SetPlayerItemOpenInvStatus(player.getName(), false);
-            player.sendMessage("OpenInv with " + Material.getMaterial(OpenInv.GetItemOpenInvItem()).toString() + " is OFF.");
-        }
-        else {
-            OpenInv.SetPlayerItemOpenInvStatus(player.getName(), true);
-            player.sendMessage("OpenInv with " + Material.getMaterial(OpenInv.GetItemOpenInvItem()).toString() + " is ON.");
-        }
-        return true;
-    }
-}

src/com/lishid/openinv/internal/v1_9_R1/AnySilentChest.java

@@ -25,8 +25,11 @@ import com.lishid.openinv.internal.IAnySilentChest;
 //Volatile
 import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
 
+import net.minecraft.server.v1_9_R1.AxisAlignedBB;
 import net.minecraft.server.v1_9_R1.Block;
 import net.minecraft.server.v1_9_R1.BlockPosition;
+import net.minecraft.server.v1_9_R1.Entity;
+import net.minecraft.server.v1_9_R1.EntityOcelot;
 import net.minecraft.server.v1_9_R1.EntityPlayer;
 import net.minecraft.server.v1_9_R1.IInventory;
 import net.minecraft.server.v1_9_R1.ITileInventory;
@@ -41,25 +44,50 @@ public class AnySilentChest implements IAnySilentChest {
         // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
         EntityPlayer player = ((CraftPlayer) p).getHandle();
         World world = player.world;
-        // If block on top
-        if (world.getType(new BlockPosition(x, y + 1, z)).l())
+        // 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 on top
-        if ((Block.getId(world.getType(new BlockPosition(x - 1, y, z)).getBlock()) == id) && (world.getType(new BlockPosition(x - 1, y + 1, z)).l()))
+        // 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 ((Block.getId(world.getType(new BlockPosition(x + 1, y, z)).getBlock()) == id) && (world.getType(new BlockPosition(x + 1, y + 1, z)).l()))
+        if (isBlockedChest(world, id, x + 1, y, z))
             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()))
+        if (isBlockedChest(world, id, x, y, z - 1))
             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()))
+        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();

src/com/lishid/openinv/internal/v1_9_R1/SpecialPlayerInventory.java

@@ -130,12 +130,19 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         if (i >= is.length) {
             i -= is.length;
-            is = this.extra;
+            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];
     }
 
@@ -153,12 +160,17 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         if (i >= is.length) {
             i -= is.length;
-            is = this.extra;
+            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;
 
@@ -195,12 +207,17 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         if (i >= is.length) {
             i -= is.length;
-            is = this.extra;
+            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];
 
@@ -226,12 +243,17 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         if (i >= is.length) {
             i -= is.length;
-            is = this.extra;
+            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) {
             owner.getHandle().drop(itemstack, true);

src/plugin.yml

@@ -1,6 +1,6 @@
 name: OpenInv
 main: com.lishid.openinv.OpenInv
-version: 2.2.10
+version: 2.3.0
 author: lishid
 authors: [Jikoo]
 description: >
@@ -25,12 +25,6 @@ commands:
     permission: 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
-    permission: OpenInv.openinv
-    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.