Added /searchenchant, fixed a couple little mistakes

Mistakes being breaking UUID-based lookups and /anychest's toggle.
MY BAD, SORRY.

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

@@ -16,8 +16,6 @@
 
 package com.lishid.openinv.internal.v1_4_5;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
 
 import org.bukkit.ChatColor;
@@ -142,15 +140,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             returnValue = true;
         } else {
             try {
-                int windowId = 0;
-                try {
-                    Field windowID = player.getClass().getDeclaredField("containerCounter");
-                    windowID.setAccessible(true);
-                    windowId = windowID.getInt(player);
-                    windowId = windowId % 100 + 1;
-                    windowID.setInt(player, windowId);
-                } catch (NoSuchFieldException e) {}
-
+                int windowId = player.nextContainerCounter();
                 player.netServerHandler.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize()));
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;

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

@@ -59,4 +59,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -16,8 +16,6 @@
 
 package com.lishid.openinv.internal.v1_4_6;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
 
 import org.bukkit.ChatColor;
@@ -142,15 +140,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             returnValue = true;
         } else {
             try {
-                int windowId = 0;
-                try {
-                    Field windowID = player.getClass().getDeclaredField("containerCounter");
-                    windowID.setAccessible(true);
-                    windowId = windowID.getInt(player);
-                    windowId = windowId % 100 + 1;
-                    windowID.setInt(player, windowId);
-                } catch (NoSuchFieldException e) {}
-
+                int windowId = player.nextContainerCounter();
                 player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize()));
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;

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

@@ -59,4 +59,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -39,4 +39,12 @@ public interface IPlayerDataManager {
      */
     public String getPlayerDataID(OfflinePlayer player);
 
+    /**
+     * Gets an OfflinePlayer by the given unique identifier.
+     * 
+     * @param identifier the unique identifier
+     * @return the OfflinePlayer, or null if no exact match was found
+     */
+    public OfflinePlayer getPlayerByID(String identifier);
+
 }

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

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

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

@@ -27,6 +27,7 @@ import java.util.concurrent.Future;
 import com.lishid.openinv.commands.AnyChestPluginCommand;
 import com.lishid.openinv.commands.OpenEnderPluginCommand;
 import com.lishid.openinv.commands.OpenInvPluginCommand;
+import com.lishid.openinv.commands.SearchEnchantPluginCommand;
 import com.lishid.openinv.commands.SearchInvPluginCommand;
 import com.lishid.openinv.commands.SilentChestPluginCommand;
 import com.lishid.openinv.internal.IAnySilentContainer;
@@ -41,7 +42,6 @@ import com.lishid.openinv.util.Function;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.PluginCommand;
-import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
@@ -118,38 +118,19 @@ public class OpenInv extends JavaPlugin {
         inventoryAccess = accessor.newInventoryAccess();
         anySilentContainer = accessor.newAnySilentContainer();
 
-        FileConfiguration config = getConfig();
-        boolean dirtyConfig = false;
-        if (!config.isBoolean("NotifySilentChest")) {
-            config.set("NotifySilentChest", true);
-            dirtyConfig = true;
-        }
-        if (!config.isBoolean("NotifyAnyChest")) {
-            config.set("NotifyAnyChest", true);
-            dirtyConfig = true;
-        }
-        if (!config.isBoolean("DisableSaving")) {
-            config.set("DisableSaving", false);
-            dirtyConfig = true;
-        }
-        config.addDefault("NotifySilentChest", true);
-        config.addDefault("NotifyAnyChest", true);
-        config.addDefault("DisableSaving", false);
-        config.options().copyDefaults(true);
-        if (dirtyConfig) {
-            saveConfig();
-        }
+        new ConfigUpdater(this).checkForUpdates();
 
         pm.registerEvents(new OpenInvPlayerListener(this), this);
         pm.registerEvents(new OpenInvInventoryListener(this), this);
 
         getCommand("openinv").setExecutor(new OpenInvPluginCommand(this));
+        getCommand("openender").setExecutor(new OpenEnderPluginCommand(this));
         SearchInvPluginCommand searchInv = new SearchInvPluginCommand();
         getCommand("searchinv").setExecutor(searchInv);
         getCommand("searchender").setExecutor(searchInv);
+        getCommand("searchenchant").setExecutor(new SearchEnchantPluginCommand());
         getCommand("silentchest").setExecutor(new SilentChestPluginCommand(this));
         getCommand("anychest").setExecutor(new AnyChestPluginCommand(this));
-        getCommand("openender").setExecutor(new OpenEnderPluginCommand(this));
 
     }
 
@@ -169,7 +150,7 @@ public class OpenInv extends JavaPlugin {
      * @return true if the server version is supported
      */
     public boolean isSupportedVersion() {
-        return accessor.isSupported();
+        return this.accessor.isSupported();
     }
 
     /**
@@ -246,7 +227,7 @@ public class OpenInv extends JavaPlugin {
      * @return false unless configured otherwise
      */
     public boolean disableSaving() {
-        return getConfig().getBoolean("DisableSaving", false);
+        return getConfig().getBoolean("settings.disable-saving", false);
     }
 
     /**
@@ -256,7 +237,7 @@ public class OpenInv extends JavaPlugin {
      * @return true unless configured otherwise
      */
     public boolean notifySilentChest() {
-        return getConfig().getBoolean("NotifySilentChest", true);
+        return getConfig().getBoolean("notify.silent-chest", true);
     }
 
     /**
@@ -266,7 +247,7 @@ public class OpenInv extends JavaPlugin {
      * @return true unless configured otherwise
      */
     public boolean notifyAnyChest() {
-        return getConfig().getBoolean("NotifyAnyChest", true);
+        return getConfig().getBoolean("notify.any-chest", true);
     }
 
     /**
@@ -276,7 +257,7 @@ public class OpenInv extends JavaPlugin {
      * @return true if SilentChest is enabled
      */
     public boolean getPlayerSilentChestStatus(OfflinePlayer player) {
-        return getConfig().getBoolean("SilentChest." + playerLoader.getPlayerDataID(player) + ".toggle", false);
+        return getConfig().getBoolean("toggles.silent-chest." + playerLoader.getPlayerDataID(player), false);
     }
 
     /**
@@ -286,7 +267,7 @@ public class OpenInv extends JavaPlugin {
      * @param status the status
      */
     public void setPlayerSilentChestStatus(OfflinePlayer player, boolean status) {
-        getConfig().set("SilentChest." + playerLoader.getPlayerDataID(player) + ".toggle", status);
+        getConfig().set("toggles.silent-chest." + playerLoader.getPlayerDataID(player), status);
         saveConfig();
     }
 
@@ -297,7 +278,7 @@ public class OpenInv extends JavaPlugin {
      * @return true if AnyChest is enabled
      */
     public boolean getPlayerAnyChestStatus(OfflinePlayer player) {
-        return getConfig().getBoolean("AnyChest." + playerLoader.getPlayerDataID(player) + ".toggle", true);
+        return getConfig().getBoolean("toggles.any-chest." + playerLoader.getPlayerDataID(player), false);
     }
 
     /**
@@ -307,10 +288,21 @@ public class OpenInv extends JavaPlugin {
      * @param status the status
      */
     public void setPlayerAnyChestStatus(OfflinePlayer player, boolean status) {
-        getConfig().set("AnyChest." + playerLoader.getPlayerDataID(player) + ".toggle", status);
+        getConfig().set("toggles.any-chest." + playerLoader.getPlayerDataID(player), status);
         saveConfig();
     }
 
+    /**
+     * Gets a unique identifier by which the OfflinePlayer can be referenced. Using the value
+     * returned to look up a Player will generally be much faster for later implementations.
+     * 
+     * @param offline the OfflinePlayer
+     * @return the identifier
+     */
+    public String getPlayerID(OfflinePlayer offline) {
+        return this.playerLoader.getPlayerDataID(offline);
+    }
+
     /**
      * Get an OfflinePlayer by name.
      * <p>
@@ -333,12 +325,19 @@ public class OpenInv extends JavaPlugin {
             }
         }
 
+        // Attempt exact offline match first - adds UUID support for later versions
+        OfflinePlayer player = this.playerLoader.getPlayerByID(name);
+
+        if (player != null) {
+            return player;
+        }
+
         // Ensure name is valid if server is in online mode to avoid unnecessary searching
         if (getServer().getOnlineMode() && !name.matches("[a-zA-Z0-9_]{3,16}")) {
             return null;
         }
 
-        OfflinePlayer player = getServer().getPlayerExact(name);
+        player = getServer().getPlayerExact(name);
 
         if (player != null) {
             return player;

plugin/src/main/java/com/lishid/openinv/commands/SearchEnchantPluginCommand.java

@@ -0,0 +1,111 @@
+package com.lishid.openinv.commands;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+/**
+ * Command adding the ability to search online players' inventories for enchantments of a specific
+ * type at or above the level specified.
+ * 
+ * @author Jikoo
+ */
+public class SearchEnchantPluginCommand implements CommandExecutor {
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (args.length == 0) {
+            return false;
+        }
+
+        Enchantment enchant = null;
+        int level = 0;
+
+        for (String argument : args) {
+            Enchantment localEnchant = Enchantment.getByName(argument.toUpperCase());
+            if (localEnchant != null) {
+                enchant = localEnchant;
+                continue;
+            }
+            try {
+                level = Integer.parseInt(argument);
+            } catch (NumberFormatException ignored) {}
+        }
+
+        // Arguments not set correctly
+        if (level == 0 && enchant == null) {
+            return false;
+        }
+
+        StringBuilder players = new StringBuilder();
+        for (Player player : Bukkit.getServer().getOnlinePlayers()) {
+            boolean flagInventory = containsEnchantment(player.getInventory(), enchant, level);
+            boolean flagEnder = containsEnchantment(player.getEnderChest(), enchant, level);
+
+            // No matches, continue
+            if (!flagInventory && !flagEnder) {
+                continue;
+            }
+
+            // Matches, append details
+            players.append(player.getName()).append(" (");
+            if (flagInventory) {
+                players.append("inv");
+            }
+            if (flagEnder) {
+                if (flagInventory) {
+                    players.append(',');
+                }
+                players.append("ender");
+            }
+            players.append("), ");
+        }
+
+        if (players.length() > 0) {
+            // Matches found, delete trailing comma and space
+            players.delete(players.length() - 2, players.length());
+        } else {
+            sender.sendMessage("No players found with " + (enchant == null ? "any enchant" : enchant.getName())
+                    + " of level " + level + " or higher.");
+            return true;
+        }
+
+        sender.sendMessage("Players: " + players.toString());
+        return true;
+    }
+
+    private boolean containsEnchantment(Inventory inventory, Enchantment enchant, int minLevel) {
+        for (ItemStack item : inventory.getContents()) {
+            if (item == null || item.getType() == Material.AIR) {
+                continue;
+            }
+            if (enchant != null) {
+                if (item.containsEnchantment(enchant) && item.getEnchantmentLevel(enchant) >= minLevel) {
+                    return true;
+                }
+            } else {
+                if (!item.hasItemMeta()) {
+                    continue;
+                }
+                ItemMeta meta = item.getItemMeta();
+                if (!meta.hasEnchants()) {
+                    continue;
+                }
+                for (int enchLevel : meta.getEnchants().values()) {
+                    if (enchLevel >= minLevel) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+}

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

@@ -68,7 +68,7 @@ public class SearchInvPluginCommand implements CommandExecutor {
             sender.sendMessage("No players found with " + material.toString());
         }
 
-        sender.sendMessage("Players with the item " + material.toString() + ":  " + players.toString());
+        sender.sendMessage("Players with the item " + material.toString() + ": " + players.toString());
         return true;
     }
 

plugin/src/main/resources/plugin.yml

@@ -29,7 +29,7 @@ commands:
     permission: OpenInv.*;OpenInv.search
     description: Searches and lists players having a specific item in their ender chest
     usage: |-
-           /<command> <item> [minAmount] - Item is the ID or the Bukkit Material, MinAmount is the minimum amount required
+           /<command> <item> [MinAmount] - Item is the ID or the Bukkit Material, MinAmount is the minimum amount required
   silentchest:
     aliases: [sc, silent]
     description: Toggle silent chest function, which stops sounds and animations when using containers.
@@ -42,4 +42,9 @@ commands:
     permission: OpenInv.*;OpenInv.anychest
     usage: |-
            /<command> [Check] - Checks or toggle anychest
-
+  searchenchant:
+    aliases: [searchenchants]
+    description: Search and list players with a specific enchantment.
+    permission: OpenInv.*;OpenInv.searchenchant
+    usage: |-
+           /<command> <[enchantment] [MinLevel]> - Enchantment is the enchantment type, MinLevel is the minimum level. One is optional

pom.xml

@@ -10,7 +10,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <openinv.version>3.0.0-SNAPSHOT</openinv.version>
+    <openinv.version>3.0.2</openinv.version>
   </properties>
 
   <profiles>

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_10_R1;
 
+import java.util.UUID;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import com.mojang.authlib.GameProfile;
@@ -61,4 +63,20 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getUniqueId().toString();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        try {
+            UUID uuid = UUID.fromString(identifier);
+            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
+            // Ensure player is a real player, otherwise return null
+            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+                return null;
+            }
+            return player;
+        } catch (IllegalArgumentException e) {
+            // Not a UUID
+            return null;
+        }
+    }
+
 }

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_11_R1;
 
+import java.util.UUID;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import com.mojang.authlib.GameProfile;
@@ -61,4 +63,20 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getUniqueId().toString();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        try {
+            UUID uuid = UUID.fromString(identifier);
+            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
+            // Ensure player is a real player, otherwise return null
+            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+                return null;
+            }
+            return player;
+        } catch (IllegalArgumentException e) {
+            // Not a UUID
+            return null;
+        }
+    }
+
 }

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

@@ -16,8 +16,6 @@
 
 package com.lishid.openinv.internal.v1_4_R1;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
 
 import org.bukkit.ChatColor;
@@ -142,15 +140,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             returnValue = true;
         } else {
             try {
-                int windowId = 0;
-                try {
-                    Field windowID = player.getClass().getDeclaredField("containerCounter");
-                    windowID.setAccessible(true);
-                    windowId = windowID.getInt(player);
-                    windowId = windowId % 100 + 1;
-                    windowID.setInt(player, windowId);
-                } catch (NoSuchFieldException e) {}
-
+                int windowId = player.nextContainerCounter();
                 player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize()));
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;

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

@@ -60,4 +60,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -16,8 +16,6 @@
 
 package com.lishid.openinv.internal.v1_5_R2;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
 
 import org.bukkit.ChatColor;
@@ -142,15 +140,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             returnValue = true;
         } else {
             try {
-                int windowId = 0;
-                try {
-                    Field windowID = player.getClass().getDeclaredField("containerCounter");
-                    windowID.setAccessible(true);
-                    windowId = windowID.getInt(player);
-                    windowId = windowId % 100 + 1;
-                    windowID.setInt(player, windowId);
-                } catch (NoSuchFieldException e) {}
-
+                int windowId = player.nextContainerCounter();
                 player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize(), true));
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;

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

@@ -59,4 +59,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -16,8 +16,6 @@
 
 package com.lishid.openinv.internal.v1_5_R3;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
 
 import org.bukkit.ChatColor;
@@ -142,15 +140,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             returnValue = true;
         } else {
             try {
-                int windowId = 0;
-                try {
-                    Field windowID = player.getClass().getDeclaredField("containerCounter");
-                    windowID.setAccessible(true);
-                    windowId = windowID.getInt(player);
-                    windowId = windowId % 100 + 1;
-                    windowID.setInt(player, windowId);
-                } catch (NoSuchFieldException e) {}
-
+                int windowId = player.nextContainerCounter();
                 player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize(), true));
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;

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

@@ -59,4 +59,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -16,8 +16,6 @@
 
 package com.lishid.openinv.internal.v1_6_R1;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
 
 import org.bukkit.ChatColor;
@@ -142,15 +140,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             returnValue = true;
         } else {
             try {
-                int windowId = 0;
-                try {
-                    Field windowID = player.getClass().getDeclaredField("containerCounter");
-                    windowID.setAccessible(true);
-                    windowId = windowID.getInt(player);
-                    windowId = windowId % 100 + 1;
-                    windowID.setInt(player, windowId);
-                } catch (NoSuchFieldException e) {}
-
+                int windowId = player.nextContainerCounter();
                 player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize(), true));
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;

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

@@ -59,4 +59,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -16,8 +16,6 @@
 
 package com.lishid.openinv.internal.v1_6_R2;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
 
 import org.bukkit.ChatColor;
@@ -142,15 +140,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             returnValue = true;
         } else {
             try {
-                int windowId = 0;
-                try {
-                    Field windowID = player.getClass().getDeclaredField("containerCounter");
-                    windowID.setAccessible(true);
-                    windowId = windowID.getInt(player);
-                    windowId = windowId % 100 + 1;
-                    windowID.setInt(player, windowId);
-                } catch (NoSuchFieldException e) {}
-
+                int windowId = player.nextContainerCounter();
                 player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize(), true));
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;

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

@@ -59,4 +59,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -16,8 +16,6 @@
 
 package com.lishid.openinv.internal.v1_6_R3;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
 
 import org.bukkit.ChatColor;
@@ -142,15 +140,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             returnValue = true;
         } else {
             try {
-                int windowId = 0;
-                try {
-                    Field windowID = player.getClass().getDeclaredField("containerCounter");
-                    windowID.setAccessible(true);
-                    windowId = windowID.getInt(player);
-                    windowId = windowId % 100 + 1;
-                    windowID.setInt(player, windowId);
-                } catch (NoSuchFieldException e) {}
-
+                int windowId = player.nextContainerCounter();
                 player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) tile).getName(), ((IInventory) tile).getSize(), true));
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;

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

@@ -59,4 +59,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -16,8 +16,6 @@
 
 package com.lishid.openinv.internal.v1_7_R1;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
 
 import org.bukkit.ChatColor;
@@ -143,15 +141,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             returnValue = true;
         } else {
             try {
-                int windowId = 0;
-                try {
-                    Field windowID = player.getClass().getDeclaredField("containerCounter");
-                    windowID.setAccessible(true);
-                    windowId = windowID.getInt(player);
-                    windowId = windowId % 100 + 1;
-                    windowID.setInt(player, windowId);
-                } catch (NoSuchFieldException e) {}
-
+                int windowId = player.nextContainerCounter();
                 player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) tile).getInventoryName(), ((IInventory) tile).getSize(), true));
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;

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

@@ -60,4 +60,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -16,8 +16,6 @@
 
 package com.lishid.openinv.internal.v1_7_R2;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
 
 import org.bukkit.ChatColor;
@@ -143,15 +141,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             returnValue = true;
         } else {
             try {
-                int windowId = 0;
-                try {
-                    Field windowID = player.getClass().getDeclaredField("containerCounter");
-                    windowID.setAccessible(true);
-                    windowId = windowID.getInt(player);
-                    windowId = windowId % 100 + 1;
-                    windowID.setInt(player, windowId);
-                } catch (NoSuchFieldException e) {}
-
+                int windowId = player.nextContainerCounter();
                 player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) tile).getInventoryName(), ((IInventory) tile).getSize(), true));
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;

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

@@ -61,4 +61,14 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getName();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
+        // Ensure player is a real player, otherwise return null
+        if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+            return null;
+        }
+        return player;
+    }
+
 }

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

@@ -16,8 +16,6 @@
 
 package com.lishid.openinv.internal.v1_7_R3;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
 
 import org.bukkit.ChatColor;
@@ -143,15 +141,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             returnValue = true;
         } else {
             try {
-                int windowId = 0;
-                try {
-                    Field windowID = player.getClass().getDeclaredField("containerCounter");
-                    windowID.setAccessible(true);
-                    windowId = windowID.getInt(player);
-                    windowId = windowId % 100 + 1;
-                    windowID.setInt(player, windowId);
-                } catch (NoSuchFieldException e) {}
-
+                int windowId = player.nextContainerCounter();
                 player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) tile).getInventoryName(), ((IInventory) tile).getSize(), true));
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_7_R3;
 
+import java.util.UUID;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
@@ -60,4 +62,20 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getUniqueId().toString();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        try {
+            UUID uuid = UUID.fromString(identifier);
+            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
+            // Ensure player is a real player, otherwise return null
+            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+                return null;
+            }
+            return player;
+        } catch (IllegalArgumentException e) {
+            // Not a UUID
+            return null;
+        }
+    }
+
 }

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

@@ -16,8 +16,6 @@
 
 package com.lishid.openinv.internal.v1_7_R4;
 
-import java.lang.reflect.Field;
-
 import com.lishid.openinv.internal.IAnySilentContainer;
 
 import org.bukkit.ChatColor;
@@ -143,15 +141,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             returnValue = true;
         } else {
             try {
-                int windowId = 0;
-                try {
-                    Field windowID = player.getClass().getDeclaredField("containerCounter");
-                    windowID.setAccessible(true);
-                    windowId = windowID.getInt(player);
-                    windowId = windowId % 100 + 1;
-                    windowID.setInt(player, windowId);
-                } catch (NoSuchFieldException e) {}
-
+                int windowId = player.nextContainerCounter();
                 player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) tile).getInventoryName(), ((IInventory) tile).getSize(), true));
                 player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) tile));
                 player.activeContainer.windowId = windowId;

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_7_R4;
 
+import java.util.UUID;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import org.bukkit.Bukkit;
@@ -60,4 +62,20 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getUniqueId().toString();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        try {
+            UUID uuid = UUID.fromString(identifier);
+            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
+            // Ensure player is a real player, otherwise return null
+            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+                return null;
+            }
+            return player;
+        } catch (IllegalArgumentException e) {
+            // Not a UUID
+            return null;
+        }
+    }
+
 }

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_8_R1;
 
+import java.util.UUID;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import com.mojang.authlib.GameProfile;
@@ -61,4 +63,20 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getUniqueId().toString();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        try {
+            UUID uuid = UUID.fromString(identifier);
+            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
+            // Ensure player is a real player, otherwise return null
+            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+                return null;
+            }
+            return player;
+        } catch (IllegalArgumentException e) {
+            // Not a UUID
+            return null;
+        }
+    }
+
 }

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_8_R2;
 
+import java.util.UUID;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import com.mojang.authlib.GameProfile;
@@ -61,4 +63,20 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getUniqueId().toString();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        try {
+            UUID uuid = UUID.fromString(identifier);
+            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
+            // Ensure player is a real player, otherwise return null
+            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+                return null;
+            }
+            return player;
+        } catch (IllegalArgumentException e) {
+            // Not a UUID
+            return null;
+        }
+    }
+
 }

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_8_R3;
 
+import java.util.UUID;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import com.mojang.authlib.GameProfile;
@@ -61,4 +63,20 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getUniqueId().toString();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        try {
+            UUID uuid = UUID.fromString(identifier);
+            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
+            // Ensure player is a real player, otherwise return null
+            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+                return null;
+            }
+            return player;
+        } catch (IllegalArgumentException e) {
+            // Not a UUID
+            return null;
+        }
+    }
+
 }

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_9_R1;
 
+import java.util.UUID;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import com.mojang.authlib.GameProfile;
@@ -61,4 +63,20 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getUniqueId().toString();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        try {
+            UUID uuid = UUID.fromString(identifier);
+            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
+            // Ensure player is a real player, otherwise return null
+            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+                return null;
+            }
+            return player;
+        } catch (IllegalArgumentException e) {
+            // Not a UUID
+            return null;
+        }
+    }
+
 }

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

@@ -16,6 +16,8 @@
 
 package com.lishid.openinv.internal.v1_9_R2;
 
+import java.util.UUID;
+
 import com.lishid.openinv.internal.IPlayerDataManager;
 
 import com.mojang.authlib.GameProfile;
@@ -61,4 +63,20 @@ public class PlayerDataManager implements IPlayerDataManager {
         return player.getUniqueId().toString();
     }
 
+    @Override
+    public OfflinePlayer getPlayerByID(String identifier) {
+        try {
+            UUID uuid = UUID.fromString(identifier);
+            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
+            // Ensure player is a real player, otherwise return null
+            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+                return null;
+            }
+            return player;
+        } catch (IllegalArgumentException e) {
+            // Not a UUID
+            return null;
+        }
+    }
+
 }