From 6a2239415182ad67898fb4ae9b39ef5def0a074d Mon Sep 17 00:00:00 2001 From: TheCoder11 Date: Tue, 23 Mar 2021 16:59:41 -0700 Subject: [PATCH] Delete src/main/java/com/somemone/bigventories directory --- .../somemone/bigventories/StoragePlus.java | 325 ------------------ .../bigventories/command/AcceptCommand.java | 39 --- .../bigventories/command/AdminCommand.java | 293 ---------------- .../command/ChunkStorageCommand.java | 125 ------- .../command/GroupStorageCommand.java | 271 --------------- .../command/PersonalStorageCommand.java | 122 ------- .../inventory/VoucherInventory.java | 149 -------- .../bigventories/item/VoucherItem.java | 43 --- .../listener/InventoryListener.java | 168 --------- .../listener/VoucherListener.java | 171 --------- .../bigventories/storage/ChunkStorage.java | 33 -- .../bigventories/storage/GroupStorage.java | 52 --- .../bigventories/storage/OpenStorage.java | 43 --- .../bigventories/storage/PersonalStorage.java | 24 -- .../bigventories/storage/Storage.java | 140 -------- .../bigventories/storage/StorageType.java | 7 - .../bigventories/util/ConfigHandler.java | 52 --- .../bigventories/util/SearchHandler.java | 100 ------ .../bigventories/util/UtilityStuff.java | 14 - 19 files changed, 2171 deletions(-) delete mode 100644 src/main/java/com/somemone/bigventories/StoragePlus.java delete mode 100644 src/main/java/com/somemone/bigventories/command/AcceptCommand.java delete mode 100644 src/main/java/com/somemone/bigventories/command/AdminCommand.java delete mode 100644 src/main/java/com/somemone/bigventories/command/ChunkStorageCommand.java delete mode 100644 src/main/java/com/somemone/bigventories/command/GroupStorageCommand.java delete mode 100644 src/main/java/com/somemone/bigventories/command/PersonalStorageCommand.java delete mode 100644 src/main/java/com/somemone/bigventories/inventory/VoucherInventory.java delete mode 100644 src/main/java/com/somemone/bigventories/item/VoucherItem.java delete mode 100644 src/main/java/com/somemone/bigventories/listener/InventoryListener.java delete mode 100644 src/main/java/com/somemone/bigventories/listener/VoucherListener.java delete mode 100644 src/main/java/com/somemone/bigventories/storage/ChunkStorage.java delete mode 100644 src/main/java/com/somemone/bigventories/storage/GroupStorage.java delete mode 100644 src/main/java/com/somemone/bigventories/storage/OpenStorage.java delete mode 100644 src/main/java/com/somemone/bigventories/storage/PersonalStorage.java delete mode 100644 src/main/java/com/somemone/bigventories/storage/Storage.java delete mode 100644 src/main/java/com/somemone/bigventories/storage/StorageType.java delete mode 100644 src/main/java/com/somemone/bigventories/util/ConfigHandler.java delete mode 100644 src/main/java/com/somemone/bigventories/util/SearchHandler.java delete mode 100644 src/main/java/com/somemone/bigventories/util/UtilityStuff.java diff --git a/src/main/java/com/somemone/bigventories/StoragePlus.java b/src/main/java/com/somemone/bigventories/StoragePlus.java deleted file mode 100644 index 1e335a6..0000000 --- a/src/main/java/com/somemone/bigventories/StoragePlus.java +++ /dev/null @@ -1,325 +0,0 @@ -package com.somemone.bigventories; - -import com.somemone.bigventories.command.AdminCommand; -import com.somemone.bigventories.command.ChunkStorageCommand; -import com.somemone.bigventories.command.GroupStorageCommand; -import com.somemone.bigventories.command.PersonalStorageCommand; -import com.somemone.bigventories.listener.InventoryListener; -import com.somemone.bigventories.listener.VoucherListener; -import com.somemone.bigventories.storage.*; -import com.somemone.bigventories.util.ConfigHandler; -import net.milkbowl.vault.economy.Economy; -import org.bukkit.Bukkit; -import org.bukkit.OfflinePlayer; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemStack; -import org.bukkit.plugin.RegisteredServiceProvider; -import org.bukkit.plugin.java.JavaPlugin; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.UUID; -import java.util.logging.Logger; - -public final class StoragePlus extends JavaPlugin { - - public static ArrayList openStorages; - public static ConfigHandler configHandler; - - public static ArrayList personalStorages; - public static ArrayList chunkStorages; - public static ArrayList groupStorages; - public static StoragePlus plugin; - - public static ArrayList closedByPlugin; - - public static HashMap currentInvites; // Player UUID, Storage UUID - - public static File dataFolder; - - private static Economy econ = null; - - @Override - public void onEnable() { - - personalStorages = new ArrayList<>(); - chunkStorages = new ArrayList<>(); - groupStorages = new ArrayList<>(); - openStorages = new ArrayList<>(); - closedByPlugin = new ArrayList<>(); - dataFolder = this.getDataFolder(); - configHandler = new ConfigHandler(getConfig()); - currentInvites = new HashMap<>(); - plugin = this; - - getServer().getPluginManager().registerEvents(new InventoryListener(), this); - getServer().getPluginManager().registerEvents(new VoucherListener(), this); - - getCommand("pstorage").setExecutor(new PersonalStorageCommand()); - getCommand("cstorage").setExecutor(new ChunkStorageCommand()); - getCommand("gstorage").setExecutor(new GroupStorageCommand()); - getCommand("bvadmin").setExecutor(new AdminCommand()); - - try { - loadStorages(); - } catch (IOException | InvalidConfigurationException e) { - e.printStackTrace(); - } - - if (!setupEconomy()) { - Logger.getLogger("Minecraft").severe("Bigventories disabled due to no Vault dependency found!"); - getServer().getPluginManager().disablePlugin(this); - return; - } - - saveDefaultConfig(); - - } - - - @Override - public void onDisable() { - // Plugin shutdown logic - - try { - saveStorages(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - - - public static void saveStorages () throws IOException { - // Closing all OpenStorages to permanent storage - - for (OpenStorage os : StoragePlus.openStorages) { - - Storage st = null; - for (PersonalStorage ps : StoragePlus.personalStorages) { - if (ps.uuid == os.uuid) { - st = ps; - } - } - for (ChunkStorage cs : StoragePlus.chunkStorages) { - if (cs.uuid == os.uuid) { - st = cs; - } - } - for (GroupStorage gs : StoragePlus.groupStorages) { - if (gs.uuid == os.uuid) { - st = gs; - } - } - - if (st != null) { - - ArrayList totalItems = new ArrayList<>(); - - for (Inventory inv : os.inventory) { - ArrayList items = new ArrayList<>(); - if (inv.getContents().length > 0) { - for (ItemStack item : inv.getContents()) { - items.add(item); - } - } - - int removed = 0; - while (removed < 9) { - items.remove(items.size() - 1); - } - - totalItems.addAll(items); - } - - st.items = totalItems; - - } - - } - - YamlConfiguration con = new YamlConfiguration(); - - for ( PersonalStorage ps : StoragePlus.personalStorages) { - - ItemStack[] items = ps.items.toArray(new ItemStack[0]); - String uuid = ps.uuid.toString(); - String owner = ""; - try { - owner = ps.owner.getUniqueId().toString(); - } catch (NullPointerException ignored) {} - - con.set("pstorages." + uuid + ".contents", items); - con.set("pstorages." + uuid + ".owner", owner); - con.set("pstorages." + uuid + ".rows", ps.rows); - - } - - for ( ChunkStorage cs : StoragePlus.chunkStorages) { - - ItemStack[] items = cs.items.toArray(new ItemStack[0]); - String uuid = cs.uuid.toString(); - - con.set("cstorages." + uuid + ".contents", items); - con.set("cstorages." + uuid + ".xpos", cs.x); - con.set("cstorages." + uuid + ".zpos", cs.z); - con.set("cstorages." + uuid + ".rows", cs.rows); - - } - for ( GroupStorage gs : StoragePlus.groupStorages) { - - ItemStack[] items = gs.items.toArray(new ItemStack[0]); - String uuid = gs.uuid.toString(); - String owner = gs.owner.toString(); - - List uuids = new ArrayList<>(); - for (UUID puuid : gs.accessList) { - if (puuid != null) { - uuids.add(puuid.toString()); - } - } - - - con.set("gstorages." + uuid + ".contents", items); - con.set("gstorages." + uuid + ".rows", gs.rows); - con.set("gstorages." + uuid + ".name", gs.name); - con.set("gstorages." + uuid + ".players", uuids); - con.set("gstorages." + uuid + ".owner", owner); - - } - - con.save( new File (StoragePlus.dataFolder, "storages.yml")); - } - - public static void loadStorages () throws IOException, InvalidConfigurationException { - YamlConfiguration con = new YamlConfiguration(); - con.load( new File( StoragePlus.dataFolder, "storages.yml")); - ArrayList keys; - - // load PersonalStorages - - if (con.contains("pstorages")) { - ConfigurationSection pStorages = con.getConfigurationSection("pstorages"); - - keys = new ArrayList<>(); - if (pStorages.getKeys(false) != null) { - keys.addAll(pStorages.getKeys(false)); - - for (String key : keys) { - - UUID uuid = UUID.fromString(key); - - OfflinePlayer owner = Bukkit.getOfflinePlayer(UUID.fromString(pStorages.getString(key + ".owner"))); - - ArrayList contents = (ArrayList) pStorages.getList(key + ".contents"); - - int rows = pStorages.getInt(key + ".rows"); - - StoragePlus.personalStorages.add(new PersonalStorage(rows, uuid, owner, contents)); - - } - } - } - // load ChunkStorages - - if (con.contains("cstorages")) { - ConfigurationSection cStorages = con.getConfigurationSection("cstorages"); - - keys = new ArrayList<>(); - if (cStorages.getKeys(false) != null) { - keys.addAll(cStorages.getKeys(false)); - - for (String key : keys) { - - UUID uuid = UUID.fromString(key); - - ArrayList contents = (ArrayList) cStorages.getList(key + ".contents"); - - int rows = cStorages.getInt(key + ".rows"); - - int x = cStorages.getInt(key + ".xpos"); - - int z = cStorages.getInt(key + ".zpos"); - - StoragePlus.chunkStorages.add(new ChunkStorage(rows, uuid, contents, x, z)); - - } - } - } - // load GroupStorages - - ConfigurationSection gStorages = con.getConfigurationSection("gstorages"); - - if (con.contains("gstorages")) { - keys = new ArrayList<>(); - if (gStorages.getKeys(false) != null) { - keys.addAll(gStorages.getKeys(false)); - - for (String key : keys) { - - UUID uuid = UUID.fromString(key); - - ArrayList contents = (ArrayList) gStorages.getList(key + ".contents"); - - int rows = gStorages.getInt(key + ".rows"); - - UUID owner = UUID.fromString(gStorages.getString(key + ".owner")); - - ArrayList accessStringList = (ArrayList) gStorages.getStringList(key + ".players"); - - ArrayList accessList = new ArrayList<>(); - for (String player : accessStringList) { - if ( !(accessList.contains( UUID.fromString(player)))) { - accessList.add(UUID.fromString(player)); - } - } - - String name = gStorages.getString(key + ".name"); - - StoragePlus.groupStorages.add(new GroupStorage(name, rows, contents, owner, uuid, accessList)); - - } - } - } - - } - - public static Economy getEcon() { - return econ; - } - - public static int getInvitedGroupStorages ( UUID uuid ) { - - int invited = 0; - for (GroupStorage gs : StoragePlus.groupStorages) { - if (gs.accessList.contains( uuid )) { - invited++; - } - } - - return invited; - - } - - private boolean setupEconomy() { - - if (getServer().getPluginManager().getPlugin("Vault") == null) { - return false; - } - RegisteredServiceProvider rsp = getServer().getServicesManager().getRegistration(Economy.class); - if (rsp == null) { - return false; - } - econ = rsp.getProvider(); - return econ != null; - - } - -} diff --git a/src/main/java/com/somemone/bigventories/command/AcceptCommand.java b/src/main/java/com/somemone/bigventories/command/AcceptCommand.java deleted file mode 100644 index db83577..0000000 --- a/src/main/java/com/somemone/bigventories/command/AcceptCommand.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.somemone.bigventories.command; - -import com.somemone.bigventories.StoragePlus; -import com.somemone.bigventories.storage.GroupStorage; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -import java.util.UUID; - -public class AcceptCommand implements CommandExecutor { - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - - if (sender instanceof Player) { - Player player = (Player) sender; - - if (StoragePlus.currentInvites.containsKey(player.getUniqueId())) { - - UUID groupUUID = StoragePlus.currentInvites.get(player.getUniqueId()); - for (GroupStorage gs : StoragePlus.groupStorages) { - - if (gs.uuid == groupUUID) { - gs.addPlayer(player); - player.sendMessage(ChatColor.GOLD + "You have been added to group " + gs.name + "!"); - } - - } - - } else { - sender.sendMessage(ChatColor.GOLD + "You are not currently invited to any group storages!"); - } - } - - return true; - } -} diff --git a/src/main/java/com/somemone/bigventories/command/AdminCommand.java b/src/main/java/com/somemone/bigventories/command/AdminCommand.java deleted file mode 100644 index 9339225..0000000 --- a/src/main/java/com/somemone/bigventories/command/AdminCommand.java +++ /dev/null @@ -1,293 +0,0 @@ -package com.somemone.bigventories.command; - -import com.somemone.bigventories.StoragePlus; -import com.somemone.bigventories.item.VoucherItem; -import com.somemone.bigventories.storage.ChunkStorage; -import com.somemone.bigventories.storage.GroupStorage; -import com.somemone.bigventories.storage.OpenStorage; -import com.somemone.bigventories.storage.PersonalStorage; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemStack; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.UUID; - -public class AdminCommand implements CommandExecutor { - - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - - if (sender instanceof Player) { - - Player player = (Player) sender; - - if (args.length == 3) { - switch (args[1]) { - - case "ps": - PersonalStorage ps = null; - for (PersonalStorage pes : StoragePlus.personalStorages) { - if (pes.owner == Bukkit.getOfflinePlayer(args[2])) { - ps = pes; - } - } - - switch (args[0]) { - case "view": - if (sender.hasPermission("bva.view")) { - if (StoragePlus.openStorages.size() > 0) { - for (OpenStorage os : StoragePlus.openStorages) { - if (os.uuid == ps.uuid) { - player.openInventory(os.inventory.get(0)); - - return true; - } - } - } - - ArrayList inventories = ps.buildInventories(); - OpenStorage openStorage = new OpenStorage(inventories, ps.uuid); - StoragePlus.openStorages.add(openStorage); - player.openInventory(openStorage.inventory.get(0)); - - return true; - } else { - sender.sendMessage(ChatColor.RED + "You do not have access to this command."); - } - break; - - case "delete": - - if (sender.hasPermission("bva.delete")) { - if (StoragePlus.openStorages.size() > 0) { - - for (OpenStorage os : StoragePlus.openStorages) { - if (os.uuid == ps.uuid) { - for (Player viewer : os.getViewers()) { - viewer.closeInventory(); - } - } - } - } - StoragePlus.personalStorages.remove(ps); - sender.sendMessage(ChatColor.GREEN + args[2] + "'s Personal Storage has been wiped!"); - - } else { - sender.sendMessage(ChatColor.RED + "You do not have access to this command."); - } - break; - } - break; - case "cs": - - int x = 0; - int z = 0; - - if (args[2].equals("here")) { - x = ((Player) sender).getLocation().getChunk().getX(); - z = ((Player) sender).getLocation().getChunk().getZ(); - } else if (args.length == 4) { - try { - x = Integer.parseInt(args[2]); - z = Integer.parseInt(args[3]); - } catch (NumberFormatException e) { - return false; - } - } else { - return false; - } - - ChunkStorage cs = null; - for (ChunkStorage chs : StoragePlus.chunkStorages) { - if (chs.x == x && chs.z == z) { - cs = chs; - } - } - - if (cs == null) { - sender.sendMessage(ChatColor.RED + "A Chunk Storage does not exist on this "); - } - - switch (args[0]) { - case "view": - if (sender.hasPermission("bva.view")) { - if (StoragePlus.openStorages.size() > 0) { - for (OpenStorage os : StoragePlus.openStorages) { - if (os.uuid == cs.uuid) { - player.openInventory(os.inventory.get(0)); - - return true; - } - } - } - - ArrayList inventories = cs.buildInventories(); - OpenStorage openStorage = new OpenStorage(inventories, cs.uuid); - StoragePlus.openStorages.add(openStorage); - player.openInventory(openStorage.inventory.get(0)); - - return true; - } else { - sender.sendMessage(ChatColor.RED + "You do not have access to this command!"); - } - break; - case "delete": - - if (sender.hasPermission("bva.delete")) { - if (StoragePlus.openStorages.size() > 0) { - for (OpenStorage os : StoragePlus.openStorages) { - if (os.uuid == cs.uuid) { - for (Player viewer : os.getViewers()) { - viewer.closeInventory(); - } - } - } - } - StoragePlus.chunkStorages.remove(cs); - sender.sendMessage(ChatColor.GREEN + "Chunk Storage has been wiped!"); - - } else { - sender.sendMessage(ChatColor.RED + "You do not have access to this command."); - } - break; - } - break; - case "gs": - - if (args.length == 3) { - GroupStorage gs = null; - for (GroupStorage grs : StoragePlus.groupStorages) { - if (grs.name.equals(args[2])) { - gs = grs; - } - } - - switch (args[0]) { - case "view": - if (sender.hasPermission("bva.view")) { - if (StoragePlus.openStorages.size() > 0) { - for (OpenStorage os : StoragePlus.openStorages) { - if (os.uuid == gs.uuid) { - player.openInventory(os.inventory.get(0)); - - return true; - } - } - } - - ArrayList inventories = gs.buildInventories(); - OpenStorage openStorage = new OpenStorage(inventories, gs.uuid); - StoragePlus.openStorages.add(openStorage); - player.openInventory(openStorage.inventory.get(0)); - - return true; - } else { - sender.sendMessage(ChatColor.RED + "You do not have access to this command!"); - } - break; - - case "delete": - if (sender.hasPermission("bva.delete")) { - if (StoragePlus.openStorages.size() > 0) { - for (OpenStorage os : StoragePlus.openStorages) { - if (os.uuid == gs.uuid) { - for (Player viewer : os.getViewers()) { - viewer.closeInventory(); - } - } - } - } - - StoragePlus.groupStorages.remove(gs); - sender.sendMessage(ChatColor.GREEN + "Group Storage has been wiped!"); - - } else { - sender.sendMessage(ChatColor.RED + "You do not have access to this command."); - } - break; - case "getplayers": - if (sender.hasPermission("bva.getplayers")) { - - String playerList = "Players: " + ChatColor.GREEN + ""; - for (UUID uuid : gs.accessList) { - if (uuid != null) { - playerList = playerList + Bukkit.getOfflinePlayer(uuid).getName() + ", "; - } - } - - } - } - } else { - return false; - } - break; - - } - } else if (args.length == 1 || args.length == 2) { - switch (args[0]) { - case "save": - if (sender.hasPermission("bva.save")) { - try { - StoragePlus.saveStorages(); - sender.sendMessage(ChatColor.GREEN + "Storages successfully saved!"); - } catch (IOException e) { - e.printStackTrace(); - } - } else { - sender.sendMessage(ChatColor.RED + "You do not have permission!"); - } - break; - case "load": - if (sender.hasPermission("bva.load")) { - try { - sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + "Loading to last saved configuration..."); - - for (OpenStorage os : StoragePlus.openStorages) { - for (Player viewer : os.getViewers()) { - viewer.closeInventory(); - } - } - - StoragePlus.openStorages = new ArrayList<>(); - StoragePlus.personalStorages = new ArrayList<>(); - StoragePlus.chunkStorages = new ArrayList<>(); - StoragePlus.groupStorages = new ArrayList<>(); - - StoragePlus.loadStorages(); - } catch (InvalidConfigurationException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - } - break; - case "voucher": - sender.sendMessage(ChatColor.GOLD + "Created Voucher!"); - - if (sender.hasPermission("bva.voucher")) { - if (args.length == 2) { - ItemStack item = new VoucherItem( Integer.parseInt(args[1]) ).getItem(); - player.getInventory().addItem(item); - } else { - return false; - } - - } - } - } - - } else { - sender.sendMessage("Only players can use this command!"); - } - - return true; - } -} diff --git a/src/main/java/com/somemone/bigventories/command/ChunkStorageCommand.java b/src/main/java/com/somemone/bigventories/command/ChunkStorageCommand.java deleted file mode 100644 index 09ee0de..0000000 --- a/src/main/java/com/somemone/bigventories/command/ChunkStorageCommand.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.somemone.bigventories.command; - -import com.somemone.bigventories.StoragePlus; -import com.somemone.bigventories.storage.ChunkStorage; -import com.somemone.bigventories.storage.OpenStorage; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; - -import java.util.ArrayList; - -public class ChunkStorageCommand implements CommandExecutor { - - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - - if (sender instanceof Player) { - Player player = (Player) sender; - - if (args.length == 0) { - if (StoragePlus.chunkStorages.size() > 0) { - - for (ChunkStorage cs : StoragePlus.chunkStorages) { - - if (cs.checkChunk(player.getLocation().getChunk())) { - - for (OpenStorage os : StoragePlus.openStorages) { - if (os.uuid == cs.uuid) { - - player.openInventory(os.inventory.get(0)); - return true; - - } - } - - - ArrayList inventories = cs.buildInventories(); - OpenStorage os = new OpenStorage(inventories, cs.uuid); - StoragePlus.openStorages.add(os); - player.openInventory(os.inventory.get(0)); - - return true; - - } - - } - - sender.sendMessage(ChatColor.RED + "There is no Chunk Storage in this zone!"); - return true; - - } - } - - switch (args[0]) { - case "create": - - ChunkStorage newCS = new ChunkStorage(1, player.getLocation().getChunk().getX(), player.getLocation().getChunk().getZ()); - - for (ChunkStorage cs : StoragePlus.chunkStorages) { - - if (cs.x == newCS.x && cs.z == newCS.z) { - - sender.sendMessage(ChatColor.RED + "A Chunk Storage already exists in this area!"); - return true; - - } - - } - - if (StoragePlus.configHandler.getPersonalStoragePrice(1) < StoragePlus.getEcon().getBalance(player) && StoragePlus.configHandler.getPersonalStoragePrice(1) != 0) { - StoragePlus.getEcon().withdrawPlayer(player, StoragePlus.configHandler.getPersonalStoragePrice(1)); - StoragePlus.chunkStorages.add(newCS); - sender.sendMessage(ChatColor.GREEN + "Chunk Storage successfully created!"); - } else { - sender.sendMessage(ChatColor.RED + "Insufficient Funds"); - } - - break; - - case "upgrade": - - // NOTE: Must add Vault+Config! - - int rowsToAdd = 1; - try { - rowsToAdd = Integer.parseInt(args[1]); - } catch (NumberFormatException | ArrayIndexOutOfBoundsException ignored) { - } - - if (StoragePlus.chunkStorages.size() > 0) { - - for (ChunkStorage upcs : StoragePlus.chunkStorages) { - - if (upcs.checkChunk(player.getLocation().getChunk())) { - - if (StoragePlus.getEcon().getBalance(player) > StoragePlus.configHandler.getChunkStoragePrice(rowsToAdd) && StoragePlus.configHandler.getChunkStoragePrice(1) > 0) { - StoragePlus.getEcon().withdrawPlayer(player, StoragePlus.configHandler.getChunkStoragePrice(rowsToAdd)); - upcs.addRows(rowsToAdd); - sender.sendMessage(ChatColor.GREEN + "Chunk Storage successfully upgraded!"); - } else { - sender.sendMessage(ChatColor.RED + "Insufficient Funds"); - } - - return true; - } - - } - - sender.sendMessage(ChatColor.RED + "There is no Chunk Storage in this zone! Create one first!"); - - } - break; - - } - - } else { - sender.sendMessage("This is for players only"); - } - - return true; - } -} diff --git a/src/main/java/com/somemone/bigventories/command/GroupStorageCommand.java b/src/main/java/com/somemone/bigventories/command/GroupStorageCommand.java deleted file mode 100644 index db5491c..0000000 --- a/src/main/java/com/somemone/bigventories/command/GroupStorageCommand.java +++ /dev/null @@ -1,271 +0,0 @@ -package com.somemone.bigventories.command; - -import com.somemone.bigventories.StoragePlus; -import com.somemone.bigventories.storage.GroupStorage; -import com.somemone.bigventories.storage.OpenStorage; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; - -import java.util.ArrayList; - -public class GroupStorageCommand implements CommandExecutor { - - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - - if (sender instanceof Player) { - Player player = (Player) sender; - - if (args.length == 1) { - if (StoragePlus.groupStorages.size() > 0) { - - for (GroupStorage cs : StoragePlus.groupStorages) { - - if (cs.name.equals(args[0]) && cs.accessList.contains(player.getUniqueId())) { - - //Check if inventory is open - - for (OpenStorage os : StoragePlus.openStorages) { - - if (os.uuid == cs.uuid) { - player.openInventory(os.inventory.get(0)); - return true; - } - - } - - ArrayList inventories = cs.buildInventories(); - OpenStorage os = new OpenStorage(inventories, cs.uuid); - - StoragePlus.openStorages.add(os); - - player.openInventory(os.inventory.get(0)); - - return true; - - } - - } - - sender.sendMessage(ChatColor.RED + "You do not have access to this inventory!"); - - } - } - - switch (args[0]) { - - case "upgrade": // /gs upgrade group-name 3 - - int rowsToAdd = 1; - try { - rowsToAdd = Integer.parseInt(args[2]); - } catch (NumberFormatException | NullPointerException ignored) { - } catch (ArrayIndexOutOfBoundsException e) { - return false; - } - - if (StoragePlus.groupStorages.size() > 0) { - - for (GroupStorage upgs : StoragePlus.groupStorages) { - - if (upgs.name.equals(args[1])) { - if (StoragePlus.configHandler.getGroupStoragePrice(rowsToAdd) < StoragePlus.getEcon().getBalance(player) && StoragePlus.configHandler.getGroupStoragePrice(rowsToAdd) != 0) { - StoragePlus.getEcon().withdrawPlayer(player, StoragePlus.configHandler.getGroupStoragePrice(rowsToAdd)); - upgs.addRows(rowsToAdd); - sender.sendMessage(ChatColor.GREEN + "Group Storage was upgraded!"); - - return true; - } else { - sender.sendMessage(ChatColor.RED + "Insufficient funds!"); - } - - - } - - } - - sender.sendMessage(ChatColor.RED + "There is no Chunk Storage in this zone! Create one first!"); - - } - break; - - case "invite": // /gs invite [group-name] [players] - - if (args.length == 3) { - - if (StoragePlus.groupStorages.size() > 0) { - - if (Bukkit.getOfflinePlayer(args[2]) != null ) { - - for (GroupStorage fgs : StoragePlus.groupStorages) { - if (fgs.name.equals(args[1])) { - if (fgs.owner == player.getUniqueId()) { - - if (StoragePlus.getInvitedGroupStorages(Bukkit.getOfflinePlayer(args[2]).getUniqueId()) <= StoragePlus.configHandler.getGroupStorageNum()) { - - if (Bukkit.getOfflinePlayer(args[2]).isOnline()) { - - if (StoragePlus.currentInvites.containsKey(Bukkit.getPlayer(args[2]).getUniqueId())) { - - sender.sendMessage(ChatColor.RED + "This player already has an invitation!"); - - } else { - - sender.sendMessage(ChatColor.GREEN + args[2] + " was invited to the Group!"); - StoragePlus.currentInvites.put(Bukkit.getPlayer(args[2]).getUniqueId(), fgs.uuid); - - - Bukkit.getPlayer(args[2]).sendMessage("You have been invited to the group " + fgs.name + "! Use /staccept to accept this request"); - - } - - } - } else { - sender.sendMessage(ChatColor.RED + args[2] + " has too many group storages!"); - } - return true; - - } else { - - sender.sendMessage(ChatColor.RED + "You do not have access to this storage!"); - - } - - } - } - } else { - sender.sendMessage(ChatColor.RED + "This is "); - } - } - - } - break; - case "create": // /gs create group-name - - if (args.length == 2) { - GroupStorage newGS = new GroupStorage(args[1], 1, player.getUniqueId()); - - if (StoragePlus.groupStorages.size() > 0) { - for (GroupStorage fgs : StoragePlus.groupStorages) { - - if (fgs.name.equals(args[1])) { - - sender.sendMessage(ChatColor.RED + "A Group Storage with this name already exists!"); - return true; - - } - - } - } - - if (StoragePlus.configHandler.getGroupStoragePrice(1) < StoragePlus.getEcon().getBalance(player) && StoragePlus.configHandler.getGroupStoragePrice(1) != 0) { - StoragePlus.getEcon().withdrawPlayer(player, StoragePlus.configHandler.getGroupStoragePrice(1)); - newGS.accessList.add(player.getUniqueId()); - StoragePlus.groupStorages.add(newGS); - sender.sendMessage(ChatColor.GREEN + "Group Storage successfully created!"); - } else { - sender.sendMessage(ChatColor.RED + "Insufficient Funds!"); - } - - } - break; - case "remove": // /gs remove player123 - - if (args.length == 3) { - - if (StoragePlus.groupStorages.size() > 0) { - - for (GroupStorage fgs : StoragePlus.groupStorages) { - - if (fgs.name.equals(args[2]) && fgs.owner == player.getUniqueId()) { - - if (fgs.accessList.contains(Bukkit.getOfflinePlayer(args[1]).getUniqueId())) { - fgs.accessList.remove(Bukkit.getOfflinePlayer(args[1]).getUniqueId()); - sender.sendMessage(ChatColor.GREEN + args[1] + " has been removed from the Group!"); - return true; - } else { - sender.sendMessage(ChatColor.RED + "Player not in group"); - } - - } else { - - sender.sendMessage(ChatColor.RED + "You do not have access to this storage!"); - - } - - } - - } - - } - break; - case "setowner": // /gs setowner group-name player123 - - if (args.length == 3) { - - if (StoragePlus.groupStorages.size() > 0) { - for (GroupStorage fgs : StoragePlus.groupStorages) { - - if (fgs.name.equals(args[1]) && fgs.owner == player.getUniqueId()) { - - fgs.owner = Bukkit.getOfflinePlayer(args[2]).getUniqueId(); - sender.sendMessage(ChatColor.GREEN + args[2] + " is now the owner of the Group!"); - - } - - } - } - - } - break; - - case "delete": - - if (args.length == 2) { - - if (StoragePlus.groupStorages.size() > 0) { - GroupStorage storageToDelete = null; - for (GroupStorage fgs : StoragePlus.groupStorages) { - if (fgs.name.equals(args[1]) && fgs.owner == player.getUniqueId()) { - storageToDelete = fgs; - } - } - - if (storageToDelete != null) { - StoragePlus.groupStorages.remove(storageToDelete); - sender.sendMessage(ChatColor.GREEN + storageToDelete.name + " successfully removed!"); - } else { - sender.sendMessage(ChatColor.RED + "You do not have access to this group!"); - } - } - - } - break; - case "leave": - - if (args.length == 2) { - - if (StoragePlus.groupStorages.size() > 0) { - for (GroupStorage gs : StoragePlus.groupStorages) { - if (gs.name.equals(args[1]) && gs.accessList.contains( player.getUniqueId() )) { - gs.accessList.remove(player.getUniqueId()); - sender.sendMessage(ChatColor.GREEN + "You have left " + gs.name); - return true; - } - } - sender.sendMessage(ChatColor.RED + "You are not in this group!"); - } - } - } - - } else { - sender.sendMessage("This is for players only!"); - } - return true; - } -} diff --git a/src/main/java/com/somemone/bigventories/command/PersonalStorageCommand.java b/src/main/java/com/somemone/bigventories/command/PersonalStorageCommand.java deleted file mode 100644 index aa76ef3..0000000 --- a/src/main/java/com/somemone/bigventories/command/PersonalStorageCommand.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.somemone.bigventories.command; - -import com.somemone.bigventories.StoragePlus; -import com.somemone.bigventories.storage.OpenStorage; -import com.somemone.bigventories.storage.PersonalStorage; -import org.bukkit.ChatColor; -import org.bukkit.OfflinePlayer; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; - -import java.util.ArrayList; - -public class PersonalStorageCommand implements CommandExecutor { - - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - - if (sender instanceof Player) { - Player player = (Player) sender; - - if (args.length == 0) { - if (StoragePlus.personalStorages.size() > 0) { - - for (PersonalStorage ps : StoragePlus.personalStorages) { - - if (ps.owner == (OfflinePlayer) player) { - - // Check for open inventory - - if (StoragePlus.openStorages.size() > 0) { - for (OpenStorage os : StoragePlus.openStorages) { - if (os.uuid == ps.uuid) { - player.openInventory(os.inventory.get(0)); - - return true; - } - } - } - - ArrayList inventories = ps.buildInventories(); - - OpenStorage openStorage = new OpenStorage(inventories, ps.uuid); - - StoragePlus.openStorages.add(openStorage); - - player.openInventory(openStorage.inventory.get(0)); - - return true; - - } - - } - } - sender.sendMessage(ChatColor.RED + "You do not own a Personal Storage!"); - return true; - } - - switch (args[0]) { - case "create": - - if (StoragePlus.personalStorages.size() > 0) { - for (PersonalStorage ups : StoragePlus.personalStorages) { - if (ups.owner == player) { - sender.sendMessage(ChatColor.RED + "You already have a personal storage!"); - return true; - } - } - } - - if (StoragePlus.configHandler.getPersonalStoragePrice(1) < StoragePlus.getEcon().getBalance(player) && StoragePlus.configHandler.getPersonalStoragePrice(1) != 0) { - StoragePlus.getEcon().withdrawPlayer(player, StoragePlus.configHandler.getPersonalStoragePrice(1)); - PersonalStorage cps = new PersonalStorage(7, player); - StoragePlus.personalStorages.add(cps); - - sender.sendMessage(ChatColor.GREEN + "Personal Storage successfully created!"); - } else { - sender.sendMessage(ChatColor.RED + "Insufficient funds!"); - } - - break; - - case "upgrade": - int rowsToAdd = 1; - try { - rowsToAdd = Integer.parseInt(args[1]); - } catch (NumberFormatException | NullPointerException ignored) { - } - - if (StoragePlus.personalStorages.size() > 0) { - - for (PersonalStorage upps : StoragePlus.personalStorages) { - - if (upps.owner == player) { - - if (StoragePlus.configHandler.getPersonalStoragePrice(rowsToAdd) < StoragePlus.getEcon().getBalance(player) && StoragePlus.configHandler.getPersonalStoragePrice(1) != 0) { - StoragePlus.getEcon().withdrawPlayer(player, StoragePlus.configHandler.getPersonalStoragePrice(rowsToAdd)); - upps.addRows(rowsToAdd); - sender.sendMessage(ChatColor.GREEN + "Personal Storage successfully upgraded!"); - } else { - sender.sendMessage(ChatColor.RED + "Insufficient funds!"); - } - - } - - } - - } - - break; - - - } - } else { - sender.sendMessage("This is for players only!"); - } - - return true; - } -} diff --git a/src/main/java/com/somemone/bigventories/inventory/VoucherInventory.java b/src/main/java/com/somemone/bigventories/inventory/VoucherInventory.java deleted file mode 100644 index 0fa21dc..0000000 --- a/src/main/java/com/somemone/bigventories/inventory/VoucherInventory.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.somemone.bigventories.inventory; - -import com.somemone.bigventories.StoragePlus; -import com.somemone.bigventories.storage.ChunkStorage; -import com.somemone.bigventories.storage.GroupStorage; -import com.somemone.bigventories.storage.PersonalStorage; -import com.somemone.bigventories.util.SearchHandler; -import org.bukkit.*; -import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; -import org.bukkit.persistence.PersistentDataType; - -import java.util.ArrayList; -import java.util.List; - -public class VoucherInventory { - - private Player user; - private Chunk chunk; - private int rowsLeft; - - public static ItemStack upgradeOne; - public static ItemStack upgradeAll; - - /** - * - * @param rows Number of rows that voucher has - * @param user Player using voucher - */ - - public VoucherInventory (int rows, Player user) { - this.rowsLeft = rows; - this.user = user; - this.chunk = user.getLocation().getChunk(); - - upgradeOne = new ItemStack(Material.GREEN_STAINED_GLASS_PANE); - ItemMeta oneMeta = upgradeOne.getItemMeta(); - oneMeta.setDisplayName("Upgrade One Row"); - upgradeOne.setItemMeta(oneMeta); - - upgradeAll = new ItemStack(Material.GREEN_STAINED_GLASS); - ItemMeta allMeta = upgradeAll.getItemMeta(); - allMeta.setDisplayName("Upgrade All Rows"); - upgradeAll.setItemMeta(allMeta); - } - - public Inventory buildInventory () { - Inventory inv = Bukkit.createInventory(null, 45, "Voucher"); - - ItemStack paper = new ItemStack(Material.PAPER); - ItemMeta paperMeta = paper.getItemMeta(); - paperMeta.setDisplayName(ChatColor.GOLD + "Rows: " + rowsLeft); - paper.setItemMeta(paperMeta); - inv.setItem(4, paper); - - SearchHandler searchHandler = new SearchHandler(); - PersonalStorage ps = searchHandler.searchPersonalStorage(user); - if (ps != null) { - - ItemStack enderChest = new ItemStack(Material.ENDER_CHEST); - ItemMeta psMeta = enderChest.getItemMeta(); - psMeta.setDisplayName(ChatColor.GOLD + "Personal Storage"); - - List psLore = new ArrayList<>(); - psLore.add(ChatColor.RED + "Rows: " + ChatColor.RESET + ps.rows); - psMeta.setLore(psLore); - - enderChest.setItemMeta(psMeta); - inv.setItem(36, enderChest); - - upgradeAll.setAmount(rowsLeft); - inv.setItem(27, upgradeOne); - inv.setItem(18, upgradeAll); - - } - - ChunkStorage cs = searchHandler.searchChunkStorage(chunk); - if (cs != null) { - - ItemStack grassBlock = new ItemStack(Material.GRASS_BLOCK); - ItemMeta gbMeta = grassBlock.getItemMeta(); - - gbMeta.setDisplayName(ChatColor.GOLD + "Chunk Storage"); - - List gbLore = new ArrayList<>(); - gbLore.add(ChatColor.RED + "Rows: " + ChatColor.RESET + cs.rows); - gbMeta.setLore(gbLore); - - grassBlock.setItemMeta(gbMeta); - inv.setItem(37, grassBlock); - - upgradeAll.setAmount(rowsLeft); - inv.setItem(28, upgradeOne); - inv.setItem(19, upgradeAll); - - } - - int storageSlot = 38; - int upgradeOne = 29; - int upgradeAll = 20; - - for (GroupStorage gs : searchHandler.searchGroupStorages(user.getUniqueId())) { - - ItemStack groupStorage = new ItemStack(Material.CHEST); - ItemMeta gsMeta = groupStorage.getItemMeta(); - - gsMeta.setDisplayName(ChatColor.GOLD + gs.name); - - List gbLore = new ArrayList<>(); - gbLore.add(ChatColor.RED + "Rows: " + ChatColor.RESET + gs.rows); - gsMeta.setLore(gbLore); - - gsMeta.getPersistentDataContainer().set( new NamespacedKey( StoragePlus.plugin, "group-name"), PersistentDataType.STRING, gs.name); - - groupStorage.setItemMeta(gsMeta); - inv.setItem(storageSlot, groupStorage); - - this.upgradeAll.setAmount(rowsLeft); - inv.setItem(upgradeOne, this.upgradeOne); - inv.setItem(upgradeAll, this.upgradeAll); - - storageSlot++; - upgradeOne++; - upgradeAll++; - - } - - return inv; - } - - public void removeRows (int rows) { - this.rowsLeft = this.rowsLeft - rows; - } - - public int getRows() { - return this.rowsLeft; - } - - public Player getPlayer() { - return this.user; - } - - public Chunk getChunk() { - return this.chunk; - } - -} diff --git a/src/main/java/com/somemone/bigventories/item/VoucherItem.java b/src/main/java/com/somemone/bigventories/item/VoucherItem.java deleted file mode 100644 index 146ad3a..0000000 --- a/src/main/java/com/somemone/bigventories/item/VoucherItem.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.somemone.bigventories.item; - -import com.somemone.bigventories.StoragePlus; -import org.bukkit.Material; -import org.bukkit.NamespacedKey; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.inventory.ItemFlag; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; -import org.bukkit.persistence.PersistentDataType; - -import java.util.ArrayList; -import java.util.List; - -public class VoucherItem { - - private ItemStack voucherItem = new ItemStack(Material.PAPER); - - public VoucherItem (int rows) { - - this.voucherItem.addEnchantment( Enchantment.KNOCKBACK , 1 ); - - ItemMeta meta = this.voucherItem.getItemMeta(); - meta.setDisplayName("Upgrade Voucher"); - - List lore = new ArrayList<>(); - lore.add("Rows: " + String.valueOf(rows)); - meta.setLore( lore ); - - meta.getItemFlags().add(ItemFlag.HIDE_ENCHANTS); - - NamespacedKey key = new NamespacedKey(StoragePlus.plugin, "rows-alloted"); - - meta.getPersistentDataContainer().set(key, PersistentDataType.INTEGER, rows); - - this.voucherItem.setItemMeta(meta); - } - - public ItemStack getItem() { - return voucherItem; - } - -} diff --git a/src/main/java/com/somemone/bigventories/listener/InventoryListener.java b/src/main/java/com/somemone/bigventories/listener/InventoryListener.java deleted file mode 100644 index 894c285..0000000 --- a/src/main/java/com/somemone/bigventories/listener/InventoryListener.java +++ /dev/null @@ -1,168 +0,0 @@ -package com.somemone.bigventories.listener; - -import com.somemone.bigventories.StoragePlus; -import com.somemone.bigventories.storage.*; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.event.inventory.InventoryCloseEvent; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemStack; - -import java.util.ArrayList; -import java.util.Collections; - -public class InventoryListener implements Listener { - - @EventHandler - public void onInventoryClick(InventoryClickEvent event) { - - if (event.getView().getTitle().equals("Storage")) { // If the inventory is a storage. - - ArrayList playerInventories = null; - - for (OpenStorage os : StoragePlus.openStorages) { - if (os.checkIfViewing((Player) event.getWhoClicked())) { - - playerInventories = os.inventory; - break; - - } - } - - if (playerInventories == null) { - - return; - } - - if (event.getCurrentItem() != null) { - - if (event.getCurrentItem().equals(Storage.nextButton)) { - if (playerInventories != null && playerInventories.contains(event.getInventory())) { - - StoragePlus.closedByPlugin.add((Player) event.getWhoClicked()); - - if (playerInventories.indexOf(event.getInventory()) < (playerInventories.size() - 1)) { - Inventory selectedInventory = playerInventories.get(playerInventories.indexOf(event.getInventory()) + 1); - try { - event.getWhoClicked().openInventory(selectedInventory); - } catch (ArrayIndexOutOfBoundsException ignored) { - } - } - - event.setCancelled(true); - - } - } else if (event.getCurrentItem().equals(Storage.prevButton)) { - - if (playerInventories != null && playerInventories.contains(event.getInventory())) { - - StoragePlus.closedByPlugin.add((Player) event.getWhoClicked()); - - if (playerInventories.indexOf(event.getInventory()) > 0) { - Inventory selectedInventory = playerInventories.get(playerInventories.indexOf(event.getInventory()) - 1); - try { - event.getWhoClicked().openInventory(selectedInventory); - } catch (ArrayIndexOutOfBoundsException ignored) { - } - } - - - event.setCancelled(true); - - } - - event.setCancelled(true); - - } else if (event.getCurrentItem().equals(Storage.glassPane)) { - - event.setCancelled(true); - - } - } - - } - } - - @EventHandler - public void onInventoryClose (InventoryCloseEvent event) { - - if (!(StoragePlus.closedByPlugin.contains(event.getPlayer()))) { - - if (event.getView().getTitle().equals("Storage")) { // "Deconstructs" inventories to their - - Storage st = null; - OpenStorage permStorage = null; - - for (OpenStorage os : StoragePlus.openStorages) { - if (os.checkIfViewing((Player) event.getPlayer())) { - if (os.getViewers().size() == 1) { // Player is the only viewer of the inventory - for (PersonalStorage ps : StoragePlus.personalStorages) { - if (ps.uuid == os.uuid) { - st = ps; - permStorage = os; - } - } - for (ChunkStorage cs : StoragePlus.chunkStorages) { - if (cs.uuid == os.uuid) { - st = cs; - permStorage = os; - } - } - for (GroupStorage gs : StoragePlus.groupStorages) { - if (gs.uuid == os.uuid) { - st = gs; - permStorage = os; - } - } - } - } - } - - if (permStorage != null) { - if (st != null) { - - ArrayList totalItems = new ArrayList<>(); - - StoragePlus.openStorages.remove(permStorage); - - - for (Inventory inv : permStorage.inventory) { - ArrayList items = new ArrayList<>(); - if (inv.getContents().length > 0) { - for (ItemStack item : inv.getContents()) { - items.add(item); - } - } - - - int removed = 0; - while ( removed < Math.min( items.size(), 9 )) { - items.remove(items.size() - 1); - removed++; - } - - items.removeAll(Collections.singleton(null)); - - totalItems.addAll(items); - } - - st.items = totalItems; - - } - - } - - } - - } else { - StoragePlus.closedByPlugin.remove(event.getPlayer()); - } - - } - -} - - - diff --git a/src/main/java/com/somemone/bigventories/listener/VoucherListener.java b/src/main/java/com/somemone/bigventories/listener/VoucherListener.java deleted file mode 100644 index 1a9ad0a..0000000 --- a/src/main/java/com/somemone/bigventories/listener/VoucherListener.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.somemone.bigventories.listener; - -import com.somemone.bigventories.StoragePlus; -import com.somemone.bigventories.inventory.VoucherInventory; -import com.somemone.bigventories.item.VoucherItem; -import com.somemone.bigventories.storage.ChunkStorage; -import com.somemone.bigventories.storage.GroupStorage; -import com.somemone.bigventories.storage.PersonalStorage; -import com.somemone.bigventories.util.SearchHandler; -import org.bukkit.NamespacedKey; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.block.Action; -import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.event.inventory.InventoryDragEvent; -import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.inventory.ItemStack; -import org.bukkit.persistence.PersistentDataType; - -import java.util.HashMap; -import java.util.UUID; - -public class VoucherListener implements Listener { - - private HashMap rowsRemaining = new HashMap<>(); - - @EventHandler - public void onInventoryClick (InventoryClickEvent event ) { - if (event.getView().getTitle().equals("Voucher")) { - if (event.getCurrentItem() != null) { - - VoucherInventory vInv = rowsRemaining.get(event.getWhoClicked().getUniqueId()); - int originalRows = vInv.getRows(); - rowsRemaining.remove(event.getWhoClicked().getUniqueId()); - - ItemStack modulatedAllRowsStack = VoucherInventory.upgradeAll; - modulatedAllRowsStack.setAmount(originalRows); - - if (event.getCurrentItem().equals(VoucherInventory.upgradeOne)) { - vInv.removeRows(1); - - SearchHandler searchHandler = new SearchHandler(); - switch (event.getSlot()) { - case 27: - PersonalStorage ps = searchHandler.searchPersonalStorage(vInv.getPlayer()); - - ps.addRows(1); - break; - case 28: - ChunkStorage cs = searchHandler.searchChunkStorage(vInv.getChunk()); - - cs.addRows(1); - break; - default: - - GroupStorage gs = searchHandler.searchGroupStorage(event.getClickedInventory().getItem(event.getSlot() + 9).getItemMeta().getPersistentDataContainer() - .get(new NamespacedKey(StoragePlus.plugin, "group-name"), PersistentDataType.STRING)); - - gs.addRows(1); - break; - - } - - if (vInv.getRows() == 0) { - ItemStack origItem = new VoucherItem(originalRows).getItem(); - for ( ItemStack item : event.getWhoClicked().getInventory().getContents() ) { - if (item != null) { - if (item.isSimilar(origItem)) { - if (item.getAmount() == 1) { - event.getWhoClicked().getInventory().remove(item); - } else { - item.setAmount(item.getAmount() - 1); - } - } - } - } - event.getWhoClicked().closeInventory(); - - event.setCancelled(true); - return; - } - - - } else if (event.getCurrentItem().equals(modulatedAllRowsStack)) { - vInv.removeRows(originalRows); - - SearchHandler searchHandler = new SearchHandler(); - switch (event.getSlot()) { - case 18: - PersonalStorage ps = searchHandler.searchPersonalStorage(vInv.getPlayer()); - - ps.addRows(originalRows); - break; - case 19: - ChunkStorage cs = searchHandler.searchChunkStorage(vInv.getChunk()); - - cs.addRows(originalRows); - break; - default: - GroupStorage gs = searchHandler.searchGroupStorage(event.getClickedInventory().getItem(event.getSlot() + 18).getItemMeta().getPersistentDataContainer() - .get(new NamespacedKey(StoragePlus.plugin, "group-name"), PersistentDataType.STRING)); - - gs.addRows(originalRows); - break; - - } - - - ItemStack origItem = new VoucherItem(originalRows).getItem(); - for ( ItemStack item : event.getWhoClicked().getInventory().getContents() ) { - if (item != null) { - if (item.isSimilar(origItem)) { - item.setAmount(item.getAmount() - 1); - } - } - } - event.getWhoClicked().closeInventory(); - - event.setCancelled(true); - return; - - } - - ItemStack newItem = new VoucherItem(vInv.getRows()).getItem(); - ItemStack origItem = new VoucherItem(originalRows).getItem(); - - for ( ItemStack item : event.getWhoClicked().getInventory().getContents() ) { - if (item != null) { - if (item.isSimilar(origItem)) { - if (item.getAmount() == 1) { - event.getWhoClicked().getInventory().remove(item); - } else { - item.setAmount(item.getAmount() - 1); - } - } - } - } - - event.getWhoClicked().getInventory().addItem(newItem); - - rowsRemaining.put(event.getWhoClicked().getUniqueId(), vInv); - - event.getWhoClicked().openInventory(vInv.buildInventory()); - - event.setCancelled(true); - } - - } - } - - @EventHandler - public void onItemClick (PlayerInteractEvent event) { - if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) { - - if (event.getItem() != null) { - if (event.getItem().getItemMeta().getPersistentDataContainer().has(new NamespacedKey(StoragePlus.plugin, "rows-alloted"), PersistentDataType.INTEGER)) { - - VoucherInventory vInv = new VoucherInventory(event.getItem().getItemMeta().getPersistentDataContainer().get(new NamespacedKey(StoragePlus.plugin, "rows-alloted"), PersistentDataType.INTEGER), event.getPlayer()); - - rowsRemaining.put(event.getPlayer().getUniqueId(), vInv); - - event.getPlayer().openInventory(vInv.buildInventory()); - - } - } - - } - } - - -} diff --git a/src/main/java/com/somemone/bigventories/storage/ChunkStorage.java b/src/main/java/com/somemone/bigventories/storage/ChunkStorage.java deleted file mode 100644 index 356208e..0000000 --- a/src/main/java/com/somemone/bigventories/storage/ChunkStorage.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.somemone.bigventories.storage; - -import org.bukkit.Chunk; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - -import java.util.ArrayList; -import java.util.UUID; - -public class ChunkStorage extends Storage { - - public int x; - public int z; - - public ChunkStorage(int rows, int x, int z) { - super(rows); - - this.x = x; - this.z = z; - } - - public ChunkStorage(int rows, UUID uuid, ArrayList items, int x, int z) { - super(rows, uuid, items); - - this.x = x; - this.z = z; - } - - public boolean checkChunk( Chunk chunk ) { - return chunk.getX() == this.x && chunk.getZ() == this.z; - } - -} diff --git a/src/main/java/com/somemone/bigventories/storage/GroupStorage.java b/src/main/java/com/somemone/bigventories/storage/GroupStorage.java deleted file mode 100644 index 952f16f..0000000 --- a/src/main/java/com/somemone/bigventories/storage/GroupStorage.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.somemone.bigventories.storage; - -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - -import java.util.ArrayList; -import java.util.UUID; - -public class GroupStorage extends Storage { - - public UUID owner; - public ArrayList accessList; - public String name; - - public GroupStorage(String name, int rows, UUID owner) { - super(rows); - - this.owner = owner; - this.accessList = new ArrayList<>(); - this.accessList.add(owner); - this.name = name; - } - - public GroupStorage(String name, int rows, ArrayList items, UUID owner, UUID uuid, ArrayList accessList) { - super(rows, uuid, items); - - this.owner = owner; - this.accessList = accessList; - this.accessList.add(owner); - this.name = name; - } - - public void addPlayer ( Player added ) { - this.accessList.add(added.getUniqueId()); - } - - public void addPlayer ( UUID uuid ) { - this.accessList.add(uuid); - } - - public void removePlayer ( Player removed ) { - this.accessList.add(removed.getUniqueId()); - } - - public void removePlayers ( UUID uuid ) { - this.accessList.add(uuid); - } - - public boolean checkAccess (UUID checking) { - return this.accessList.contains(checking); - } -} diff --git a/src/main/java/com/somemone/bigventories/storage/OpenStorage.java b/src/main/java/com/somemone/bigventories/storage/OpenStorage.java deleted file mode 100644 index d11a0dd..0000000 --- a/src/main/java/com/somemone/bigventories/storage/OpenStorage.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.somemone.bigventories.storage; - -import org.bukkit.entity.HumanEntity; -import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.UUID; - -public class OpenStorage { - - public UUID uuid; - public ArrayList inventory; - - public OpenStorage ( ArrayList inventories, UUID uuid ) { - this.inventory = inventories; - this.uuid = uuid; - } - - public boolean checkIfViewing (Player player) { - - return this.getViewers().contains(player); - - } - - public ArrayList getViewers () { - ArrayList players = new ArrayList<>(); - - for (Inventory inventory : this.inventory) { - - if (inventory.getViewers().size() > 0) { - for (HumanEntity player : inventory.getViewers()) { - players.add((Player) player); - } - } - - } - - return players; - } - -} diff --git a/src/main/java/com/somemone/bigventories/storage/PersonalStorage.java b/src/main/java/com/somemone/bigventories/storage/PersonalStorage.java deleted file mode 100644 index 67c7e07..0000000 --- a/src/main/java/com/somemone/bigventories/storage/PersonalStorage.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.somemone.bigventories.storage; - -import org.bukkit.OfflinePlayer; -import org.bukkit.inventory.ItemStack; - -import java.util.ArrayList; -import java.util.UUID; - -public class PersonalStorage extends Storage { - - public OfflinePlayer owner; - - public PersonalStorage(int rows, OfflinePlayer owner) { - super(rows); - - this.owner = owner; - } - - public PersonalStorage(int rows, UUID uuid, OfflinePlayer owner, ArrayList items) { - super(rows, uuid, items); - - this.owner = owner; - } -} diff --git a/src/main/java/com/somemone/bigventories/storage/Storage.java b/src/main/java/com/somemone/bigventories/storage/Storage.java deleted file mode 100644 index f7be95d..0000000 --- a/src/main/java/com/somemone/bigventories/storage/Storage.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.somemone.bigventories.storage; - -import com.somemone.bigventories.StoragePlus; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.Color; -import org.bukkit.Material; -import org.bukkit.entity.Item; -import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - -public class Storage { - - public static ItemStack nextButton; - public static ItemStack prevButton; - public static ItemStack glassPane; - - public ArrayList items; - public int rows; - public UUID uuid; - - public Storage (int rows) { - this.rows = rows; - items = new ArrayList<>(); - this.uuid = UUID.randomUUID(); - - nextButton = new ItemStack(Material.ARROW); - ItemMeta nBMeta = nextButton.getItemMeta(); - nBMeta.setDisplayName(ChatColor.GREEN + "NEXT PAGE"); - nextButton.setItemMeta(nBMeta); - - prevButton = new ItemStack(Material.ARROW); - ItemMeta pBMeta = prevButton.getItemMeta(); - pBMeta.setDisplayName(ChatColor.RED + "PREVIOUS PAGE"); - prevButton.setItemMeta(pBMeta); - - glassPane = new ItemStack(Material.LIGHT_GRAY_STAINED_GLASS_PANE); - ItemMeta gPMeta = glassPane.getItemMeta(); - gPMeta.setDisplayName(ChatColor.GOLD + "|"); - glassPane.setItemMeta(gPMeta); - } - - public Storage (int rows, UUID uuid, ArrayList items) { - this.rows = rows; - this.items = items; - this.uuid = uuid; - - nextButton = new ItemStack(Material.ARROW); - ItemMeta nBMeta = nextButton.getItemMeta(); - nBMeta.setDisplayName(ChatColor.GREEN + "NEXT PAGE"); - nextButton.setItemMeta(nBMeta); - - prevButton = new ItemStack(Material.ARROW); - ItemMeta pBMeta = prevButton.getItemMeta(); - pBMeta.setDisplayName(ChatColor.RED + "PREVIOUS PAGE"); - prevButton.setItemMeta(pBMeta); - - glassPane = new ItemStack(Material.GRAY_STAINED_GLASS_PANE); - ItemMeta gPMeta = glassPane.getItemMeta(); - gPMeta.setDisplayName(ChatColor.GOLD + "|"); - glassPane.setItemMeta(gPMeta); - } - - public ArrayList buildInventories ( ) { - - ArrayList inventories = new ArrayList<>(); - double localRows = this.rows; - ArrayList localItems = this.items; - int neededInventory = (int) Math.ceil(localRows / 5); - - for ( int i = 0; i < neededInventory; i++) { - - int invSize; - if ( localRows > 5 ) { - invSize = 54; - localRows = localRows - 5; - } else { - invSize = ((int) localRows * 9) + 9; - localRows = 0; - } - - Inventory inv = Bukkit.createInventory(null, invSize, "Storage"); - - int itemNumber = invSize - 9; - - for ( int a = 0; a < itemNumber; a++) { - - if (localItems.size() > 0) { - inv.addItem(localItems.get(0)); - localItems.remove(0); - } - - } - - inv.setItem( invSize - 9, glassPane); - inv.setItem( invSize - 8, glassPane); - inv.setItem( invSize - 7, glassPane); - inv.setItem( invSize - 6, prevButton); - inv.setItem( invSize - 5, glassPane); - inv.setItem( invSize - 4, nextButton); - inv.setItem( invSize - 3, glassPane); - inv.setItem( invSize - 2, glassPane); - inv.setItem( invSize - 1, glassPane); - - inventories.add( inv ) ; - - } - - return inventories; - - } - - public void addRows (int rows) { - if (StoragePlus.openStorages.size() == 0) { - OpenStorage toDelete = null; - for (OpenStorage os : StoragePlus.openStorages) { - if (os.uuid == this.uuid) { - for (Player player : os.getViewers()) { - player.closeInventory(); - player.sendMessage(ChatColor.GOLD + "This storage has been upgraded!"); - } - } - } - - if (toDelete != null) { - StoragePlus.openStorages.remove(toDelete); - } - } - - this.rows = this.rows + rows; - } - -} diff --git a/src/main/java/com/somemone/bigventories/storage/StorageType.java b/src/main/java/com/somemone/bigventories/storage/StorageType.java deleted file mode 100644 index a3185ac..0000000 --- a/src/main/java/com/somemone/bigventories/storage/StorageType.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.somemone.bigventories.storage; - -public enum StorageType { - - CHUNK_STORAGE, PERSONAL_STORAGE, GROUP_STORAGE; - -} diff --git a/src/main/java/com/somemone/bigventories/util/ConfigHandler.java b/src/main/java/com/somemone/bigventories/util/ConfigHandler.java deleted file mode 100644 index 9784843..0000000 --- a/src/main/java/com/somemone/bigventories/util/ConfigHandler.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.somemone.bigventories.util; - -import org.bukkit.configuration.Configuration; -import org.bukkit.configuration.ConfigurationSection; - -public class ConfigHandler { - - private Configuration config; - - public ConfigHandler (Configuration config ) { - - this.config = config; - - } - - public double getPersonalStoragePrice (int rows) { - - if (config.getBoolean("personal-storage.purchaseable")) { - return config.getInt("personal-storage.price") * Math.pow(config.getDouble("personal-storage.upgrade-multiplier"), rows); - } else { - return 0; - } - - } - - public double getChunkStoragePrice (int rows) { - - if (config.getBoolean("chunk-storage.purchaseable")) { - return config.getInt("chunk-storage.price") * Math.pow(config.getDouble("chunk-storage.upgrade-multiplier"), rows); - } else { - return 0; - } - - } - - public double getGroupStoragePrice (int rows) { - - if (config.getBoolean("group-storage.purchaseable")) { - return (config.getInt("group-storage.price") * Math.pow(config.getDouble("group-storage.upgrade-multiplier"), rows)); - } else { - return 0; - } - - } - - public int getGroupStorageNum () { - - return Math.min(config.getInt("default-player-groups"), 7); - - } - -} diff --git a/src/main/java/com/somemone/bigventories/util/SearchHandler.java b/src/main/java/com/somemone/bigventories/util/SearchHandler.java deleted file mode 100644 index 8d34902..0000000 --- a/src/main/java/com/somemone/bigventories/util/SearchHandler.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.somemone.bigventories.util; - -import com.somemone.bigventories.StoragePlus; -import com.somemone.bigventories.storage.ChunkStorage; -import com.somemone.bigventories.storage.GroupStorage; -import com.somemone.bigventories.storage.PersonalStorage; -import org.bukkit.Chunk; -import org.bukkit.entity.Player; - -import java.util.ArrayList; -import java.util.UUID; - -public class SearchHandler { - - public PersonalStorage searchPersonalStorage (Player player) { - for (PersonalStorage ps : StoragePlus.personalStorages) { - if (ps.owner == player) { - return ps; - } - } - - return null; - } - - public PersonalStorage searchPersonalStorage (UUID uuid) { - for (PersonalStorage ps : StoragePlus.personalStorages) { - if (ps.uuid == uuid) { - return ps; - } - } - return null; - } - - - public ChunkStorage searchChunkStorage (int x, int z) { - for (ChunkStorage cs : StoragePlus.chunkStorages) { - if (cs.x == x && cs.z == z) { - return cs; - } - } - return null; - } - - public ChunkStorage searchChunkStorage (Chunk chunk) { - for (ChunkStorage cs : StoragePlus.chunkStorages) { - if (cs.checkChunk(chunk)) { - return cs; - } - } - return null; - } - - public ChunkStorage searchChunkStorage (UUID uuid) { - for (ChunkStorage cs : StoragePlus.chunkStorages) { - if (cs.uuid == uuid) { - return cs; - } - } - return null; - } - - - public GroupStorage searchGroupStorage (Player owner) { - for (GroupStorage gs : StoragePlus.groupStorages) { - if (gs.owner == owner.getUniqueId()) { - return gs; - } - } - return null; - } - - public ArrayList searchGroupStorages (UUID uuid) { - ArrayList list = new ArrayList<>(); - - for (GroupStorage gs : StoragePlus.groupStorages) { - if (gs.accessList.contains(uuid)) { - list.add(gs); - } - } - return list; - } - - public GroupStorage searchGroupStorage (UUID uuid) { - for (GroupStorage gs : StoragePlus.groupStorages) { - if (gs.uuid == uuid) { - return gs; - } - } - return null; - } - - public GroupStorage searchGroupStorage (String name) { - for (GroupStorage gs : StoragePlus.groupStorages) { - if (gs.name == name) { - return gs; - } - } - return null; - } -} diff --git a/src/main/java/com/somemone/bigventories/util/UtilityStuff.java b/src/main/java/com/somemone/bigventories/util/UtilityStuff.java deleted file mode 100644 index 23da217..0000000 --- a/src/main/java/com/somemone/bigventories/util/UtilityStuff.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.somemone.bigventories.util; - -import org.bukkit.inventory.ItemStack; - -public class UtilityStuff { - - /** - * Basically a place where I put random methods that help out - */ - - public static ItemStack addGlow (ItemStack item) { - return item; - } -}