From 037c927a27bd2748433df9fe65998dcc94f84994 Mon Sep 17 00:00:00 2001 From: Benkralex Date: Sun, 27 Aug 2023 19:53:29 +0200 Subject: [PATCH] commit --- pvptogglepluginworkspace/pom.xml | 2 +- .../main/java/benkralex/pvptoggle/Config.java | 4 +- .../pvptoggle/InventoryListener.java | 14 ++-- .../benkralex/pvptoggle/InventoryMenu.java | 66 +++++++++++-------- .../java/benkralex/pvptoggle/PvpCommand.java | 17 ++--- 5 files changed, 56 insertions(+), 47 deletions(-) diff --git a/pvptogglepluginworkspace/pom.xml b/pvptogglepluginworkspace/pom.xml index 7bca1c3..0614253 100644 --- a/pvptogglepluginworkspace/pom.xml +++ b/pvptogglepluginworkspace/pom.xml @@ -6,7 +6,7 @@ benkralex Pvptoggle - 1.7.3-SNAPSHOT + 1.7.7-SNAPSHOT jar Pvptoggle diff --git a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Config.java b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Config.java index 569a90c..c4a745b 100644 --- a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Config.java +++ b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Config.java @@ -22,8 +22,8 @@ public class Config { } public static void setPvpTime(int i) { - config.set("pvp-time-hit-back", i); - Pvptoggle.pvptoggle.saveConfig(); + config.set("pvp-time-hit-back", i); + Pvptoggle.pvptoggle.saveConfig(); } public static void setPvpProt(Boolean b) { diff --git a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryListener.java b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryListener.java index 3990a59..1ddddbb 100644 --- a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryListener.java +++ b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryListener.java @@ -29,11 +29,11 @@ public class InventoryListener implements Listener{ } else if (iname.equals("Ultra an/aus schalten")) { if (pdc.has(ultra, PersistentDataType.BOOLEAN)) { pdc.set(ultra, PersistentDataType.BOOLEAN, !pdc.get(ultra, PersistentDataType.BOOLEAN)); - p.sendMessage("PvP-Ultra ist für dich jetzt " + (pdc.get(pvptoggle, PersistentDataType.BOOLEAN)?"an":"aus")); + p.sendMessage("PvP-Ultra ist für dich jetzt " + (pdc.get(ultra, PersistentDataType.BOOLEAN)?"an":"aus")); inv.setItem(12, InventoryMenu.getMenuItem(1, p)); } else { pdc.set(ultra, PersistentDataType.BOOLEAN, true); - p.sendMessage("PvP-Ultra ist für dich jetzt " + (pdc.get(pvptoggle, PersistentDataType.BOOLEAN)?"an":"aus")); + p.sendMessage("PvP-Ultra ist für dich jetzt " + (pdc.get(ultra, PersistentDataType.BOOLEAN)?"an":"aus")); inv.setItem(12, InventoryMenu.getMenuItem(1, p)); } return; @@ -49,15 +49,12 @@ public class InventoryListener implements Listener{ } return; } else if (iname.equals("Whitelist")) { - p.closeInventory(); p.openInventory(InventoryMenu.pvpWhitelistMenu(p)); return; } else if (iname.equals("Blacklist")) { - p.closeInventory(); p.openInventory(InventoryMenu.pvpBlacklistMenu(p)); return; } else if (iname.equals("Menu für Operators")) { - p.closeInventory(); p.openInventory(InventoryMenu.pvpOpSettingsMenu(p)); return; } else { @@ -72,7 +69,6 @@ public class InventoryListener implements Listener{ p.closeInventory(); return; } else if (iname.equals("Zurück")) { - p.closeInventory(); p.openInventory(InventoryMenu.pvpMenu(p)); return; } else { @@ -87,7 +83,6 @@ public class InventoryListener implements Listener{ p.closeInventory(); return; } else if (iname.equals("Zurück")) { - p.closeInventory(); p.openInventory(InventoryMenu.pvpMenu(p)); return; } else { @@ -101,7 +96,6 @@ public class InventoryListener implements Listener{ if (iname.equals("Inventar schließen")) { p.closeInventory(); } else if (iname.equals("Zurück")) { - p.closeInventory(); p.openInventory(InventoryMenu.pvpMenu(p)); } else if (iname.equals("Standard PvP-Schutz an/aus schalten")){ Config.setPvpProt(!Config.getPvpProt()); @@ -112,7 +106,7 @@ public class InventoryListener implements Listener{ } else if (e.isLeftClick()) { Config.setPvpTime(Config.getPvpTime() + 10); } - inv.setItem(15, InventoryMenu.getMenuItem(9, p)); + inv.setItem(14, InventoryMenu.getMenuItem(InventoryMenu.PVP_TIME, p)); } else if (iname.equals("Zeit um zurückzuschlagen verringern")) { if (e.isRightClick()) { if (!(Config.getPvpTime() < 1)) { @@ -123,7 +117,7 @@ public class InventoryListener implements Listener{ Config.setPvpTime(Config.getPvpTime() - 10); } } - inv.setItem(15, InventoryMenu.getMenuItem(9, p)); + inv.setItem(14, InventoryMenu.getMenuItem(InventoryMenu.PVP_TIME, p)); } } } diff --git a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryMenu.java b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryMenu.java index 64725ad..054b37d 100644 --- a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryMenu.java +++ b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryMenu.java @@ -6,6 +6,7 @@ import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.NamespacedKey; +import org.bukkit.entity.Blaze; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemFlag; @@ -38,8 +39,11 @@ public class InventoryMenu { ItemMeta mtoggle = itoggle.getItemMeta(); mtoggle.setDisplayName("PvP-Schutz an/aus schalten"); mtoggle.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); + String s3 = p.getPersistentDataContainer().getOrDefault(new NamespacedKey(Pvptoggle.pvptoggle, "pvptoggle"), PersistentDataType.BOOLEAN, false)?"an":"aus"; + lore.add(ChatColor.LIGHT_PURPLE + "Toggle ist " + s3); + lore.add(ChatColor.BLUE + ""); String s = p.getPersistentDataContainer().getOrDefault(new NamespacedKey(Pvptoggle.pvptoggle, "pvptoggle"), PersistentDataType.BOOLEAN, false)?"Aus":"An"; - lore.add(ChatColor.BLUE + s + " schalten"); + lore.add(ChatColor.DARK_PURPLE + s + " schalten"); mtoggle.setLore(lore); itoggle.setItemMeta(mtoggle); return itoggle; @@ -48,7 +52,11 @@ public class InventoryMenu { ItemMeta multra = iultra.getItemMeta(); multra.setDisplayName("Ultra an/aus schalten"); multra.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); - lore.add(ChatColor.BLUE + (p.getPersistentDataContainer().getOrDefault(new NamespacedKey(Pvptoggle.pvptoggle, "ultra"), PersistentDataType.BOOLEAN, false)?"Aus":"An") + " schalten"); + String s2 = p.getPersistentDataContainer().getOrDefault(new NamespacedKey(Pvptoggle.pvptoggle, "ultra"), PersistentDataType.BOOLEAN, false)?"an":"aus"; + lore.add(ChatColor.LIGHT_PURPLE + "Ultra ist " + s2); + lore.add(ChatColor.BLUE + ""); + String s1 = p.getPersistentDataContainer().getOrDefault(new NamespacedKey(Pvptoggle.pvptoggle, "ultra"), PersistentDataType.BOOLEAN, false)?"Aus":"An"; + lore.add(ChatColor.DARK_PURPLE + s1 + " schalten"); multra.setLore(lore); iultra.setItemMeta(multra); return iultra; @@ -108,7 +116,9 @@ public class InventoryMenu { ItemStack idefaultprot = new ItemStack(Material.GOLDEN_SWORD); ItemMeta mdefaultprot = idefaultprot.getItemMeta(); mdefaultprot.setDisplayName("Standard PvP-Schutz an/aus schalten"); - lore.add(ChatColor.BLUE + (Config.getPvpProt()?"Aus":"An") + " schalten"); + lore.add(ChatColor.LIGHT_PURPLE + "Standart ist PvP-Schutz" + (Config.getPvpProt()?"an":"aus")); + lore.add(ChatColor.BLUE + ""); + lore.add(ChatColor.DARK_PURPLE + (Config.getPvpProt()?"Aus":"An") + " schalten"); mdefaultprot.setLore(lore); mdefaultprot.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); idefaultprot.setItemMeta(mdefaultprot); @@ -161,27 +171,31 @@ public class InventoryMenu { } public static Inventory pvpMenu(Player p) { - Inventory inv = Bukkit.createInventory(null, 3 * 9, "PvP-Menu"); - Inventory inv2; - - inv.setItem(10, getMenuItem(0, p)); - inv.setItem(12, getMenuItem(1, p)); - inv.setItem(14, getMenuItem(2, p)); - inv.setItem(16, getMenuItem(3, p)); - if (p.hasPermission("pvp.inv.op")) { - inv.setItem(22, getMenuItem(4, p)); - } - inv.setItem(8, getMenuItem(5, p)); + if (p.hasPermission("pvp.inv.normal")) { + Inventory inv = Bukkit.createInventory(null, 3 * 9, "PvP-Menu"); + Inventory inv2; - inv2 = pvpMenuFillEmpty(inv, p); - return inv2; + inv.setItem(10, getMenuItem(PVP_TOGGLE, p)); + inv.setItem(12, getMenuItem(ULTRA_TOGGLE, p)); + inv.setItem(14, getMenuItem(WHITELIST, p)); + inv.setItem(16, getMenuItem(BLACKLIST, p)); + if (p.hasPermission("pvp.inv.op")) { + inv.setItem(22, getMenuItem(OP, p)); + } + inv.setItem(8, getMenuItem(CLOSE, p)); + + inv2 = pvpMenuFillEmpty(inv, p); + return inv2; + } else { + return pvpMenuFillEmpty(Bukkit.createInventory(null, 3*9, "No Permissiom"), p); + } } public static Inventory pvpBlacklistMenu(Player p) { Inventory inv = Bukkit.createInventory(null, 3*9, "Blacklist-Menu"); - inv.setItem(8, getMenuItem(5, p)); - inv.setItem(26, getMenuItem(6, p)); + inv.setItem(8, getMenuItem(CLOSE, p)); + inv.setItem(26, getMenuItem(BACK, p)); return pvpMenuFillEmpty(inv, p); } @@ -189,8 +203,8 @@ public class InventoryMenu { public static Inventory pvpWhitelistMenu(Player p) { Inventory inv = Bukkit.createInventory(null, 3*9, "Whitelist-Menu"); - inv.setItem(8, getMenuItem(5, p)); - inv.setItem(26, getMenuItem(6, p)); + inv.setItem(8, getMenuItem(CLOSE, p)); + inv.setItem(26, getMenuItem(BACK, p)); return pvpMenuFillEmpty(inv, p); } @@ -198,12 +212,12 @@ public class InventoryMenu { public static Inventory pvpOpSettingsMenu(Player p) { Inventory inv = Bukkit.createInventory(null, 3*9, "Operator-Menu"); - inv.setItem(8, getMenuItem(5, p)); - inv.setItem(26, getMenuItem(6, p)); - inv.setItem(11, getMenuItem(8, p)); - inv.setItem(14, getMenuItem(11, p)); - inv.setItem(15, getMenuItem(9, p)); - inv.setItem(16, getMenuItem(10, p)); + inv.setItem(8, getMenuItem(CLOSE, p)); + inv.setItem(26, getMenuItem(BACK, p)); + inv.setItem(11, getMenuItem(DEFAULT_PROTECTION, p)); + inv.setItem(13, getMenuItem(PVP_TIME_MINUS, p)); + inv.setItem(14, getMenuItem(PVP_TIME, p)); + inv.setItem(15, getMenuItem(PVP_TIME_PLUS, p)); return pvpMenuFillEmpty(inv, p); } diff --git a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/PvpCommand.java b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/PvpCommand.java index ff206b7..7f20f37 100644 --- a/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/PvpCommand.java +++ b/pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/PvpCommand.java @@ -26,7 +26,6 @@ public class PvpCommand { //Create PVP-Command with Command-API new CommandAPICommand("pvp") .executesPlayer(PvpCommand::pvpInv) - .withPermission("pvp.inv.op") .withUsage("/pvp") .withHelp("PvP Menu", "Du kannst damit ein Menu öffnen, in dem du alles verwalten kannst.") .withSubcommand(new CommandAPICommand("toggle") @@ -95,7 +94,9 @@ public class PvpCommand { public static void pvpInv(Player sender, CommandArguments args) { - sender.openInventory(InventoryMenu.pvpMenu(sender)); + if (sender.hasPermission("pvp.inv.normal")) { + sender.openInventory(InventoryMenu.pvpMenu(sender)); + } } @@ -138,26 +139,26 @@ public class PvpCommand { int i = 0; for (NamespacedKey uuid:pdcList.getKeys()) { i++; - sender.sendMessage("" + ChatColor.DARK_BLUE + i + ". " + ChatColor.BLUE + Bukkit.getPlayer(UUID.fromString(uuid.getKey())).getName()); + sender.sendMessage("" + ChatColor.BLUE + i + ". " + Bukkit.getPlayer(UUID.fromString(uuid.getKey())).getDisplayName()); } } else { - sender.sendMessage("Deine "+listName+ "ist leer"); + sender.sendMessage("Deine "+listName+ " ist leer"); } } else if (action == 2) { //hinzufügen if (pdcList.has(new NamespacedKey(Pvptoggle.pvptoggle,((Player)args.get("Player")).getUniqueId().toString()),PersistentDataType.TAG_CONTAINER)) { - sender.sendMessage(ChatColor.RED + "Der Spieler" + args.get("Player") + "ist schon in deiner " + listName); + sender.sendMessage(ChatColor.RED + "Der Spieler " + ((Player) args.get("Player")).getDisplayName() + ChatColor.RED + " ist schon in deiner " + listName); }else{ pdcList.set(new NamespacedKey(Pvptoggle.pvptoggle,((Player)args.get("Player")).getUniqueId().toString()),PersistentDataType.TAG_CONTAINER,pdcList.getAdapterContext().newPersistentDataContainer()); - sender.sendMessage(ChatColor.GREEN + ((Player)args.get("Player")).getDisplayName() + "wurde zu deiner "+listName+" hinzugefügt"); + sender.sendMessage(ChatColor.GREEN + ((Player)args.get("Player")).getDisplayName() + ChatColor.GREEN + " wurde zu deiner "+listName+" hinzugefügt"); } } else if (action == 3) { //entfernen if (!pdcList.has(new NamespacedKey(Pvptoggle.pvptoggle,((Player)args.get("Player")).getUniqueId().toString()),PersistentDataType.TAG_CONTAINER)) { - sender.sendMessage(ChatColor.RED + "Der Spieler" + args.get("Player") + "ist nicht in deiner "+listName); + sender.sendMessage(ChatColor.RED + "Der Spieler " + ((Player) args.get("Player")).getDisplayName() + ChatColor.RED + " ist nicht in deiner "+listName); }else{ pdcList.remove(new NamespacedKey(Pvptoggle.pvptoggle,((Player)args.get("Player")).getUniqueId().toString())); - sender.sendMessage(ChatColor.GREEN + ((Player)args.get("Player")).getDisplayName() + "wurde aus deiner "+listName+" entfernt"); + sender.sendMessage(ChatColor.GREEN + ((Player)args.get("Player")).getDisplayName() + ChatColor.GREEN + " wurde aus deiner "+listName+" entfernt"); } } else { sender.sendMessage("Fehler");