Mineattack/PvpTogglePlugin
4
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
Benkralex
2023-08-27 19:53:29 +02:00
parent 158efb75d9
commit 037c927a27
5 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvptogglepluginworkspace/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<groupId>benkralex</groupId> <groupId>benkralex</groupId>
<artifactId>Pvptoggle</artifactId> <artifactId>Pvptoggle</artifactId>
<version>1.7.3-SNAPSHOT</version> <version>1.7.7-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Pvptoggle</name> <name>Pvptoggle</name>
pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/Config.java
+2 -2
View File
@@ -22,8 +22,8 @@ public class Config {
} }
public static void setPvpTime(int i) { public static void setPvpTime(int i) {
config.set("pvp-time-hit-back", i); config.set("pvp-time-hit-back", i);
Pvptoggle.pvptoggle.saveConfig(); Pvptoggle.pvptoggle.saveConfig();
} }
public static void setPvpProt(Boolean b) { public static void setPvpProt(Boolean b) {
pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryListener.java
+4 -10
View File
@@ -29,11 +29,11 @@ public class InventoryListener implements Listener{
} else if (iname.equals("Ultra an/aus schalten")) { } else if (iname.equals("Ultra an/aus schalten")) {
if (pdc.has(ultra, PersistentDataType.BOOLEAN)) { if (pdc.has(ultra, PersistentDataType.BOOLEAN)) {
pdc.set(ultra, PersistentDataType.BOOLEAN, !pdc.get(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)); inv.setItem(12, InventoryMenu.getMenuItem(1, p));
} else { } else {
pdc.set(ultra, PersistentDataType.BOOLEAN, true); 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)); inv.setItem(12, InventoryMenu.getMenuItem(1, p));
} }
return; return;
@@ -49,15 +49,12 @@ public class InventoryListener implements Listener{
} }
return; return;
} else if (iname.equals("Whitelist")) { } else if (iname.equals("Whitelist")) {
p.closeInventory();
p.openInventory(InventoryMenu.pvpWhitelistMenu(p)); p.openInventory(InventoryMenu.pvpWhitelistMenu(p));
return; return;
} else if (iname.equals("Blacklist")) { } else if (iname.equals("Blacklist")) {
p.closeInventory();
p.openInventory(InventoryMenu.pvpBlacklistMenu(p)); p.openInventory(InventoryMenu.pvpBlacklistMenu(p));
return; return;
} else if (iname.equals("Menu für Operators")) { } else if (iname.equals("Menu für Operators")) {
p.closeInventory();
p.openInventory(InventoryMenu.pvpOpSettingsMenu(p)); p.openInventory(InventoryMenu.pvpOpSettingsMenu(p));
return; return;
} else { } else {
@@ -72,7 +69,6 @@ public class InventoryListener implements Listener{
p.closeInventory(); p.closeInventory();
return; return;
} else if (iname.equals("Zurück")) { } else if (iname.equals("Zurück")) {
p.closeInventory();
p.openInventory(InventoryMenu.pvpMenu(p)); p.openInventory(InventoryMenu.pvpMenu(p));
return; return;
} else { } else {
@@ -87,7 +83,6 @@ public class InventoryListener implements Listener{
p.closeInventory(); p.closeInventory();
return; return;
} else if (iname.equals("Zurück")) { } else if (iname.equals("Zurück")) {
p.closeInventory();
p.openInventory(InventoryMenu.pvpMenu(p)); p.openInventory(InventoryMenu.pvpMenu(p));
return; return;
} else { } else {
@@ -101,7 +96,6 @@ public class InventoryListener implements Listener{
if (iname.equals("Inventar schließen")) { if (iname.equals("Inventar schließen")) {
p.closeInventory(); p.closeInventory();
} else if (iname.equals("Zurück")) { } else if (iname.equals("Zurück")) {
p.closeInventory();
p.openInventory(InventoryMenu.pvpMenu(p)); p.openInventory(InventoryMenu.pvpMenu(p));
} else if (iname.equals("Standard PvP-Schutz an/aus schalten")){ } else if (iname.equals("Standard PvP-Schutz an/aus schalten")){
Config.setPvpProt(!Config.getPvpProt()); Config.setPvpProt(!Config.getPvpProt());
@@ -112,7 +106,7 @@ public class InventoryListener implements Listener{
} else if (e.isLeftClick()) { } else if (e.isLeftClick()) {
Config.setPvpTime(Config.getPvpTime() + 10); 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")) { } else if (iname.equals("Zeit um zurückzuschlagen verringern")) {
if (e.isRightClick()) { if (e.isRightClick()) {
if (!(Config.getPvpTime() < 1)) { if (!(Config.getPvpTime() < 1)) {
@@ -123,7 +117,7 @@ public class InventoryListener implements Listener{
Config.setPvpTime(Config.getPvpTime() - 10); Config.setPvpTime(Config.getPvpTime() - 10);
} }
} }
inv.setItem(15, InventoryMenu.getMenuItem(9, p)); inv.setItem(14, InventoryMenu.getMenuItem(InventoryMenu.PVP_TIME, p));
} }
} }
} }
pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/InventoryMenu.java
+39 -25
View File
@@ -6,6 +6,7 @@ import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.NamespacedKey; import org.bukkit.NamespacedKey;
import org.bukkit.entity.Blaze;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemFlag;
@@ -38,8 +39,11 @@ public class InventoryMenu {
ItemMeta mtoggle = itoggle.getItemMeta(); ItemMeta mtoggle = itoggle.getItemMeta();
mtoggle.setDisplayName("PvP-Schutz an/aus schalten"); mtoggle.setDisplayName("PvP-Schutz an/aus schalten");
mtoggle.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); 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"; 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); mtoggle.setLore(lore);
itoggle.setItemMeta(mtoggle); itoggle.setItemMeta(mtoggle);
return itoggle; return itoggle;
@@ -48,7 +52,11 @@ public class InventoryMenu {
ItemMeta multra = iultra.getItemMeta(); ItemMeta multra = iultra.getItemMeta();
multra.setDisplayName("Ultra an/aus schalten"); multra.setDisplayName("Ultra an/aus schalten");
multra.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); 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); multra.setLore(lore);
iultra.setItemMeta(multra); iultra.setItemMeta(multra);
return iultra; return iultra;
@@ -108,7 +116,9 @@ public class InventoryMenu {
ItemStack idefaultprot = new ItemStack(Material.GOLDEN_SWORD); ItemStack idefaultprot = new ItemStack(Material.GOLDEN_SWORD);
ItemMeta mdefaultprot = idefaultprot.getItemMeta(); ItemMeta mdefaultprot = idefaultprot.getItemMeta();
mdefaultprot.setDisplayName("Standard PvP-Schutz an/aus schalten"); 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.setLore(lore);
mdefaultprot.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); mdefaultprot.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
idefaultprot.setItemMeta(mdefaultprot); idefaultprot.setItemMeta(mdefaultprot);
@@ -161,27 +171,31 @@ public class InventoryMenu {
} }
public static Inventory pvpMenu(Player p) { public static Inventory pvpMenu(Player p) {
Inventory inv = Bukkit.createInventory(null, 3 * 9, "PvP-Menu"); if (p.hasPermission("pvp.inv.normal")) {
Inventory inv2; Inventory inv = Bukkit.createInventory(null, 3 * 9, "PvP-Menu");
Inventory inv2;
inv.setItem(10, getMenuItem(0, p)); inv.setItem(10, getMenuItem(PVP_TOGGLE, p));
inv.setItem(12, getMenuItem(1, p)); inv.setItem(12, getMenuItem(ULTRA_TOGGLE, p));
inv.setItem(14, getMenuItem(2, p)); inv.setItem(14, getMenuItem(WHITELIST, p));
inv.setItem(16, getMenuItem(3, p)); inv.setItem(16, getMenuItem(BLACKLIST, p));
if (p.hasPermission("pvp.inv.op")) { if (p.hasPermission("pvp.inv.op")) {
inv.setItem(22, getMenuItem(4, p)); 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);
} }
inv.setItem(8, getMenuItem(5, p));
inv2 = pvpMenuFillEmpty(inv, p);
return inv2;
} }
public static Inventory pvpBlacklistMenu(Player p) { public static Inventory pvpBlacklistMenu(Player p) {
Inventory inv = Bukkit.createInventory(null, 3*9, "Blacklist-Menu"); Inventory inv = Bukkit.createInventory(null, 3*9, "Blacklist-Menu");
inv.setItem(8, getMenuItem(5, p)); inv.setItem(8, getMenuItem(CLOSE, p));
inv.setItem(26, getMenuItem(6, p)); inv.setItem(26, getMenuItem(BACK, p));
return pvpMenuFillEmpty(inv, p); return pvpMenuFillEmpty(inv, p);
} }
@@ -189,8 +203,8 @@ public class InventoryMenu {
public static Inventory pvpWhitelistMenu(Player p) { public static Inventory pvpWhitelistMenu(Player p) {
Inventory inv = Bukkit.createInventory(null, 3*9, "Whitelist-Menu"); Inventory inv = Bukkit.createInventory(null, 3*9, "Whitelist-Menu");
inv.setItem(8, getMenuItem(5, p)); inv.setItem(8, getMenuItem(CLOSE, p));
inv.setItem(26, getMenuItem(6, p)); inv.setItem(26, getMenuItem(BACK, p));
return pvpMenuFillEmpty(inv, p); return pvpMenuFillEmpty(inv, p);
} }
@@ -198,12 +212,12 @@ public class InventoryMenu {
public static Inventory pvpOpSettingsMenu(Player p) { public static Inventory pvpOpSettingsMenu(Player p) {
Inventory inv = Bukkit.createInventory(null, 3*9, "Operator-Menu"); Inventory inv = Bukkit.createInventory(null, 3*9, "Operator-Menu");
inv.setItem(8, getMenuItem(5, p)); inv.setItem(8, getMenuItem(CLOSE, p));
inv.setItem(26, getMenuItem(6, p)); inv.setItem(26, getMenuItem(BACK, p));
inv.setItem(11, getMenuItem(8, p)); inv.setItem(11, getMenuItem(DEFAULT_PROTECTION, p));
inv.setItem(14, getMenuItem(11, p)); inv.setItem(13, getMenuItem(PVP_TIME_MINUS, p));
inv.setItem(15, getMenuItem(9, p)); inv.setItem(14, getMenuItem(PVP_TIME, p));
inv.setItem(16, getMenuItem(10, p)); inv.setItem(15, getMenuItem(PVP_TIME_PLUS, p));
return pvpMenuFillEmpty(inv, p); return pvpMenuFillEmpty(inv, p);
} }
pvptogglepluginworkspace/src/main/java/benkralex/pvptoggle/PvpCommand.java
+9 -8
View File
@@ -26,7 +26,6 @@ public class PvpCommand {
//Create PVP-Command with Command-API //Create PVP-Command with Command-API
new CommandAPICommand("pvp") new CommandAPICommand("pvp")
.executesPlayer(PvpCommand::pvpInv) .executesPlayer(PvpCommand::pvpInv)
.withPermission("pvp.inv.op")
.withUsage("/pvp") .withUsage("/pvp")
.withHelp("PvP Menu", "Du kannst damit ein Menu öffnen, in dem du alles verwalten kannst.") .withHelp("PvP Menu", "Du kannst damit ein Menu öffnen, in dem du alles verwalten kannst.")
.withSubcommand(new CommandAPICommand("toggle") .withSubcommand(new CommandAPICommand("toggle")
@@ -95,7 +94,9 @@ public class PvpCommand {
public static void pvpInv(Player sender, CommandArguments args) { 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; int i = 0;
for (NamespacedKey uuid:pdcList.getKeys()) { for (NamespacedKey uuid:pdcList.getKeys()) {
i++; 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 { } else {
sender.sendMessage("Deine "+listName+ "ist leer"); sender.sendMessage("Deine "+listName+ " ist leer");
} }
} else if (action == 2) { } else if (action == 2) {
//hinzufügen //hinzufügen
if (pdcList.has(new NamespacedKey(Pvptoggle.pvptoggle,((Player)args.get("Player")).getUniqueId().toString()),PersistentDataType.TAG_CONTAINER)) { 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{ }else{
pdcList.set(new NamespacedKey(Pvptoggle.pvptoggle,((Player)args.get("Player")).getUniqueId().toString()),PersistentDataType.TAG_CONTAINER,pdcList.getAdapterContext().newPersistentDataContainer()); 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) { } else if (action == 3) {
//entfernen //entfernen
if (!pdcList.has(new NamespacedKey(Pvptoggle.pvptoggle,((Player)args.get("Player")).getUniqueId().toString()),PersistentDataType.TAG_CONTAINER)) { 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{ }else{
pdcList.remove(new NamespacedKey(Pvptoggle.pvptoggle,((Player)args.get("Player")).getUniqueId().toString())); 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 { } else {
sender.sendMessage("Fehler"); sender.sendMessage("Fehler");