diff --git a/src/main/java/hu/jgj52/wolfFFA/Commands/EditKitCommand.java b/src/main/java/hu/jgj52/wolfFFA/Commands/EditKitCommand.java index 696aeca..034741c 100644 --- a/src/main/java/hu/jgj52/wolfFFA/Commands/EditKitCommand.java +++ b/src/main/java/hu/jgj52/wolfFFA/Commands/EditKitCommand.java @@ -55,41 +55,26 @@ public class EditKitCommand implements CommandExecutor, TabCompleter { ItemStack undoKit = new ItemStack(Material.RED_STAINED_GLASS_PANE); ItemMeta undoMeta = undoKit.getItemMeta(); - if (saveMeta != null) { saveMeta.setDisplayName("§aSave Kit"); saveKit.setItemMeta(saveMeta); - } if (infoMeta != null) { - infoMeta.setDisplayName("§fKit editor, you can customize your kit."); - infoItem.setItemMeta(infoMeta); - } if (undoMeta != null) { undoMeta.setDisplayName("§cUndo Changes"); undoKit.setItemMeta(undoMeta); - } gui.setItem(0, saveKit); gui.setItem(1, saveKit); gui.setItem(2, saveKit); - gui.setItem(3, infoItem); - gui.setItem(4, infoItem); - gui.setItem(5, infoItem); gui.setItem(6, undoKit); gui.setItem(7, undoKit); gui.setItem(8, undoKit); gui.setItem(9, saveKit); gui.setItem(10, saveKit); gui.setItem(11, saveKit); - gui.setItem(12, infoItem); - gui.setItem(13, infoItem); - gui.setItem(14, infoItem); gui.setItem(15, undoKit); gui.setItem(16, undoKit); gui.setItem(17, undoKit); gui.setItem(18, saveKit); gui.setItem(19, saveKit); gui.setItem(20, saveKit); - gui.setItem(21, infoItem); - gui.setItem(22, infoItem); - gui.setItem(23, infoItem); gui.setItem(24, undoKit); gui.setItem(25, undoKit); gui.setItem(26, undoKit); @@ -103,6 +88,18 @@ public class EditKitCommand implements CommandExecutor, TabCompleter { inv.setItem(getItemSlot("sword", "sword", player), swordsword); + infoMeta.setDisplayName("§fSword Kit"); + infoItem.setItemMeta(infoMeta); + gui.setItem(3, infoItem); + gui.setItem(4, infoItem); + gui.setItem(5, infoItem); + gui.setItem(12, infoItem); + gui.setItem(13, infoItem); + gui.setItem(14, infoItem); + gui.setItem(21, infoItem); + gui.setItem(22, infoItem); + gui.setItem(23, infoItem); + player.openInventory(gui); break; case "uhc": @@ -125,6 +122,7 @@ public class EditKitCommand implements CommandExecutor, TabCompleter { ItemStack uhcbow = new ItemStack(Material.BOW); ItemStack uhcarrow = new ItemStack(Material.ARROW, 16); ItemStack uhcshield = new ItemStack(Material.SHIELD); + ItemStack uhcshield2 = new ItemStack(Material.SHIELD); ItemStack uhcplanks = new ItemStack(Material.OAK_PLANKS, 64); ItemStack uhcpickaxe = new ItemStack(Material.DIAMOND_PICKAXE); @@ -146,6 +144,7 @@ public class EditKitCommand implements CommandExecutor, TabCompleter { ItemMeta uhcmetawater2 = uhcwater2.getItemMeta(); ItemMeta uhcmetawater3 = uhcwater3.getItemMeta(); ItemMeta uhcmetawater4 = uhcwater4.getItemMeta(); + ItemMeta uhcmetashield2 = uhcshield2.getItemMeta(); uhcmetalava2.getPersistentDataContainer().set(new NamespacedKey(String.valueOf(this), "lavab"), PersistentDataType.STRING, "lava2uuid"); uhclava2.setItemMeta(uhcmetalava2); @@ -159,6 +158,9 @@ public class EditKitCommand implements CommandExecutor, TabCompleter { uhcmetawater4.getPersistentDataContainer().set(new NamespacedKey(String.valueOf(this), "waterd"), PersistentDataType.STRING, "water4uuid"); uhcwater4.setItemMeta(uhcmetawater4); + uhcmetashield2.getPersistentDataContainer().set(new NamespacedKey(String.valueOf(this), "shieldb"), PersistentDataType.STRING, "shield2uuid"); + uhcshield2.setItemMeta(uhcmetashield2); + inv.setItem(getItemSlot("axe", "uhc", player), uhcaxe); inv.setItem(getItemSlot("sword", "uhc", player), uhcsword); inv.setItem(getItemSlot("lava", "uhc", player), uhclava); @@ -170,7 +172,7 @@ public class EditKitCommand implements CommandExecutor, TabCompleter { inv.setItem(getItemSlot("bow", "uhc", player), uhcbow); inv.setItem(getItemSlot("shield", "uhc", player), uhcshield); inv.setItem(getItemSlot("arrow", "uhc", player), uhcarrow); - inv.setItem(getItemSlot("shield2", "uhc", player), uhcshield); + inv.setItem(getItemSlot("shield2", "uhc", player), uhcshield2); inv.setItem(getItemSlot("planks", "uhc", player), uhcplanks); inv.setItem(getItemSlot("pickaxe", "uhc", player), uhcpickaxe); inv.setItem(getItemSlot("lava2", "uhc", player), uhclava2); @@ -178,6 +180,18 @@ public class EditKitCommand implements CommandExecutor, TabCompleter { inv.setItem(getItemSlot("water3", "uhc", player), uhcwater3); inv.setItem(getItemSlot("water4", "uhc", player), uhcwater4); + infoMeta.setDisplayName("§fUHC Kit"); + infoItem.setItemMeta(infoMeta); + gui.setItem(3, infoItem); + gui.setItem(4, infoItem); + gui.setItem(5, infoItem); + gui.setItem(12, infoItem); + gui.setItem(13, infoItem); + gui.setItem(14, infoItem); + gui.setItem(21, infoItem); + gui.setItem(22, infoItem); + gui.setItem(23, infoItem); + player.openInventory(gui); break; default: diff --git a/src/main/java/hu/jgj52/wolfFFA/Listeners/KitListener.java b/src/main/java/hu/jgj52/wolfFFA/Listeners/KitListener.java index 6317bff..8eace5c 100644 --- a/src/main/java/hu/jgj52/wolfFFA/Listeners/KitListener.java +++ b/src/main/java/hu/jgj52/wolfFFA/Listeners/KitListener.java @@ -2,12 +2,17 @@ package hu.jgj52.wolfFFA.Listeners; import hu.jgj52.wolfFFA.Main; import net.kyori.adventure.text.Component; +import org.bukkit.Material; +import org.bukkit.NamespacedKey; 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.player.PlayerJoinEvent; import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.ItemStack; +import org.bukkit.persistence.PersistentDataType; +import org.checkerframework.checker.units.qual.N; import java.util.HashMap; import java.util.Map; @@ -57,18 +62,70 @@ public class KitListener implements Listener { public void onInventoryClick(InventoryClickEvent event) { if (!(event.getWhoClicked() instanceof Player player)) return; Inventory gui = event.getInventory(); - Inventory inv = player.getInventory(); + ItemStack[] inv = player.getInventory().getContents(); if (event.getClickedInventory() == event.getView().getTopInventory() && event.getView().title().equals(Component.text("Kit Editor"))) { event.setCancelled(true); if ((0 <= event.getSlot() && event.getSlot() <= 2) || (9 <= event.getSlot() && event.getSlot() <= 11) || (18 <= event.getSlot() && event.getSlot() <= 20)) { - player.sendMessage("szia"); - } - else if ((3 <= event.getSlot() && event.getSlot() <= 5) || (12 <= event.getSlot() && event.getSlot() <= 14) || (21 <= event.getSlot() && event.getSlot() <= 23)) { - player.sendMessage("szia2"); - } - else if ((6 <= event.getSlot() && event.getSlot() <= 8) || (15 <= event.getSlot() && event.getSlot() <= 17) || (24 <= event.getSlot() && event.getSlot() <= 26)) { - player.sendMessage("szia3"); + if (gui.getItem(13).getItemMeta().getDisplayName() == "§fSword Kit") { + for (int i = 0; i < inv.length; i++) { + ItemStack item = inv[i]; + + if (item.getType() == Material.DIAMOND_SWORD) { + plugin.getConfig().set("kits.sword." + player.getUniqueId() + ".sword", i); + } + } + } else if (gui.getItem(13).getItemMeta().getDisplayName() == "§fUHC Kit") { + for (int i = 0; i < inv.length; i++) { + ItemStack item = inv[i]; + + if (item.getType() == Material.DIAMOND_AXE) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".axe", i); + } else if (item.getType() == Material.DIAMOND_SWORD) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".sword", i); + } else if (item.getType() == Material.LAVA_BUCKET) { + if (item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey(String.valueOf(this), "lavab"), PersistentDataType.STRING)) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".lava2", i); + } else { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".lava", i); + } + } else if (item.getType() == Material.COBWEB) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".cobweb", i); + } else if (item.getType() == Material.COBBLESTONE) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".cobblestone", i); + } else if (item.getType() == Material.GOLDEN_APPLE) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".goldenapple", i); + } else if (item.getType() == Material.WATER_BUCKET) { + if (item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey(String.valueOf(this), "waterb"), PersistentDataType.STRING)) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".water2", i); + } else if (item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey(String.valueOf(this), "waterc"), PersistentDataType.STRING)) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".water3", i); + } else if (item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey(String.valueOf(this), "waterd"), PersistentDataType.STRING)) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".water4", i); + } else { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".water", i); + } + } else if (item.getType() == Material.CROSSBOW) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".crossbow", i); + } else if (item.getType() == Material.BOW) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".bow", i); + } else if (item.getType() == Material.ARROW) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".arrow", i); + } else if (item.getType() == Material.OAK_PLANKS) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".planks", i); + } else if (item.getType() == Material.DIAMOND_PICKAXE) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".pickaxe", i); + } else if (item.getType() == Material.SHIELD) { + if (item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey(String.valueOf(this), "shieldb"), PersistentDataType.STRING)) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".shield2", i); + } else { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".shield", i); + } + } + } + } + } else if ((6 <= event.getSlot() && event.getSlot() <= 8) || (15 <= event.getSlot() && event.getSlot() <= 17) || (24 <= event.getSlot() && event.getSlot() <= 26)) { + } } } diff --git a/target/WolfFFA-1.0.jar b/target/WolfFFA-1.0.jar index d2854f1..a9e7f15 100644 Binary files a/target/WolfFFA-1.0.jar and b/target/WolfFFA-1.0.jar differ diff --git a/target/classes/hu/jgj52/wolfFFA/Managers/FileManager.class b/target/classes/hu/jgj52/wolfFFA/Managers/FileManager.class new file mode 100644 index 0000000..9d7c6cf Binary files /dev/null and b/target/classes/hu/jgj52/wolfFFA/Managers/FileManager.class differ diff --git a/target/original-WolfFFA-1.0.jar b/target/original-WolfFFA-1.0.jar index 3d94bbe..40048ae 100644 Binary files a/target/original-WolfFFA-1.0.jar and b/target/original-WolfFFA-1.0.jar differ