From 850284810366c34728fa3d7deb7caf38c3a83451 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Sun, 5 Jun 2022 17:51:37 +0200 Subject: [PATCH] Added package permission --- src/main/java/com/alttd/config/ParticleConfig.java | 1 + .../java/com/alttd/gui/windows/ChooseParticleGUI.java | 2 +- src/main/java/com/alttd/objects/ParticleSet.java | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alttd/config/ParticleConfig.java b/src/main/java/com/alttd/config/ParticleConfig.java index e27f0c7..ac6ec02 100644 --- a/src/main/java/com/alttd/config/ParticleConfig.java +++ b/src/main/java/com/alttd/config/ParticleConfig.java @@ -56,6 +56,7 @@ public class ParticleConfig extends AbstractConfig { aPartType, cs.getString("unique-name"), cs.getString("permission"), + cs.getString("package-permission"), new ItemStack(Material.valueOf(cs.getString("material")))); } catch (Exception e) {//Im lazy rn sorry e.printStackTrace(); diff --git a/src/main/java/com/alttd/gui/windows/ChooseParticleGUI.java b/src/main/java/com/alttd/gui/windows/ChooseParticleGUI.java index f9c62aa..fe3b1dd 100644 --- a/src/main/java/com/alttd/gui/windows/ChooseParticleGUI.java +++ b/src/main/java/com/alttd/gui/windows/ChooseParticleGUI.java @@ -37,7 +37,7 @@ public class ChooseParticleGUI extends DefaultGUI { public ChooseParticleGUI(APartType aPartType, Component name, Player player) { super(name); List availableParticles = ParticleStorage.getParticleSets(aPartType).stream() - .filter(particleSet -> player.hasPermission(particleSet.getPermission())) + .filter(particleSet -> player.hasPermission(particleSet.getPackPermission()) || player.hasPermission(particleSet.getPermission())) .collect(Collectors.toList()); PlayerSettings playerSettings = PlayerSettings.getPlayer(player.getUniqueId()); int i = 0; diff --git a/src/main/java/com/alttd/objects/ParticleSet.java b/src/main/java/com/alttd/objects/ParticleSet.java index 5fabb13..1ea3a6d 100644 --- a/src/main/java/com/alttd/objects/ParticleSet.java +++ b/src/main/java/com/alttd/objects/ParticleSet.java @@ -25,9 +25,10 @@ public class ParticleSet { private final APartType aPartType; private final String uniqueId; private final String permission; + private final String packPermission; private final ItemStack itemStack; - public ParticleSet(List frames, String name, List lore, int frameDelay, int repeat, int repeatDelay, APartType aPartType, String uniqueId, String permission, ItemStack itemStack) { + public ParticleSet(List frames, String name, List lore, int frameDelay, int repeat, int repeatDelay, APartType aPartType, String uniqueId, String permission, String packPermission,ItemStack itemStack) { MiniMessage miniMessage = MiniMessage.miniMessage(); this.frames = frames; this.frameDelay = frameDelay; @@ -36,6 +37,7 @@ public class ParticleSet { this.aPartType = aPartType; this.uniqueId = uniqueId; this.permission = permission; + this.packPermission = packPermission; ItemMeta itemMeta = itemStack.getItemMeta(); itemMeta.displayName(miniMessage.deserialize(name)); itemMeta.lore(lore.stream().map(miniMessage::deserialize).collect(Collectors.toList())); @@ -81,6 +83,10 @@ public class ParticleSet { return permission; } + public String getPackPermission() { + return packPermission; + } + public ItemStack getItemStack() { return itemStack; }