Skip to content
This repository was archived by the owner on Mar 30, 2024. It is now read-only.

Commit 8641b91

Browse files
BGHDDevelopmentBGHDDevelopment
authored
Merge pull request #11 from Refrac/master
Fixed user and group parents, version push
2 parents 2e09a57 + 95465a6 commit 8641b91

File tree

5 files changed

+21
-14
lines changed

5 files changed

+21
-14
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>me.AsVaidas.LuckPermsGUI</groupId>
1414
<artifactId>LuckPermsGUI</artifactId>
15-
<version>3.1</version>
15+
<version>4.1</version>
1616
<packaging>jar</packaging>
1717

1818
<name>LuckPermsGUI</name>

‎src/main/java/me/AsVaidas/LuckPemsGUI/groups/Parents.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import net.luckperms.api.model.group.Group;
1717
import net.luckperms.api.node.Node;
1818
import net.luckperms.api.node.NodeType;
19+
import net.luckperms.api.node.types.InheritanceNode;
1920
import org.bukkit.Bukkit;
2021
import org.bukkit.ChatColor;
2122
import org.bukkit.Material;
@@ -92,15 +93,15 @@ public static void open(Player p, Group group, int page) {
9293
int from = 45*page-1;
9394
int to = 45*(page+1)-1;
9495
for (Node permission : group.getDistinctNodes()) {
95-
if (permission.getType() != NodeType.META) continue;
96+
if (permission.getType() != NodeType.INHERITANCE) continue;
9697
if (from <= sk && sk < to) {
9798

98-
99+
InheritanceNode parent = ((InheritanceNode)permission);
99100
String expiration = permission.hasExpiry() ? Tools.getTime(permission.getExpiry().toEpochMilli()) : "Never";
100101
String server = permission.getContexts().getAnyValue(DefaultContextKeys.SERVER_KEY).orElse("global");
101102
String world = permission.getContexts().getAnyValue(DefaultContextKeys.WORLD_KEY).orElse("global");
102103
ItemStack item = Tools.button(Material.TNT,
103-
"&6"+group.getName(),
104+
"&6"+parent.getGroupName(),
104105
Arrays.asList(
105106
"&cID: &e"+sk,
106107
"&cExpires in: &e"+expiration,
@@ -154,16 +155,18 @@ public void onInventoryClickEvent(InventoryClickEvent e) {
154155

155156
int sk = 0;
156157
for (Node permission : g.getDistinctNodes()) {
157-
if (permission.getType() != NodeType.META) continue;
158+
if (permission.getType() != NodeType.INHERITANCE) continue;
159+
160+
InheritanceNode parent = ((InheritanceNode)permission);
158161

159162
String server = permission.getContexts().getAnyValue(DefaultContextKeys.SERVER_KEY).orElse("global");
160163
String world = permission.getContexts().getAnyValue(DefaultContextKeys.WORLD_KEY).orElse("global");
161164

162165
if (sk == id) {
163166
if (permission.hasExpiry())
164-
Tools.sendCommand(p, "lp group "+g.getName()+" parent removetemp "+'"'+permission.getKey()+'"'+" "+server+" "+world);
167+
Tools.sendCommand(p, "lp group "+g.getName()+" parent removetemp "+'"'+parent.getGroupName()+'"'+" "+server+" "+world);
165168
else
166-
Tools.sendCommand(p, "lp group "+g.getName()+" parent remove "+'"'+permission.getKey()+'"'+" "+server+" "+world);
169+
Tools.sendCommand(p, "lp group "+g.getName()+" parent remove "+'"'+parent.getGroupName()+'"'+" "+server+" "+world);
167170
break;
168171
}
169172
sk++;

‎src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import net.luckperms.api.model.user.User;
1717
import net.luckperms.api.node.Node;
1818
import net.luckperms.api.node.NodeType;
19+
import net.luckperms.api.node.types.InheritanceNode;
1920
import org.bukkit.Bukkit;
2021
import org.bukkit.ChatColor;
2122
import org.bukkit.Material;
@@ -95,13 +96,14 @@ public static void open(Player p, User user, int page) {
9596
int from = 45*page-1;
9697
int to = 45*(page+1)-1;
9798
for (Node permission : user.getDistinctNodes()) {
98-
if (permission.getType() != NodeType.META) continue;
99+
if (permission.getType() != NodeType.INHERITANCE) continue;
99100
if (from <= sk && sk < to) {
101+
InheritanceNode parent = ((InheritanceNode)permission);
100102
String expiration = permission.hasExpiry() ? Tools.getTime(permission.getExpiry().toEpochMilli()) : "Never";
101103
String server = permission.getContexts().getAnyValue(DefaultContextKeys.SERVER_KEY).orElse("global");
102104
String world = permission.getContexts().getAnyValue(DefaultContextKeys.WORLD_KEY).orElse("global");
103105
ItemStack item = Tools.button(Material.TNT,
104-
"&6"+permission.getKey(),
106+
"&6"+parent.getGroupName(),
105107
Arrays.asList(
106108
"&cID: &e"+sk,
107109
"&cExpires in: &e"+expiration,
@@ -155,16 +157,18 @@ public void onInventoryClickEvent(InventoryClickEvent e) {
155157

156158
int sk = 0;
157159
for (Node permission : g.getDistinctNodes()) {
158-
if (permission.getType() != NodeType.META) continue;
160+
if (permission.getType() != NodeType.INHERITANCE) continue;
161+
162+
InheritanceNode parent = ((InheritanceNode)permission);
159163

160164
String server = permission.getContexts().getAnyValue(DefaultContextKeys.SERVER_KEY).orElse("global");
161165
String world = permission.getContexts().getAnyValue(DefaultContextKeys.WORLD_KEY).orElse("global");
162166

163167
if (sk == id) {
164168
if (permission.hasExpiry())
165-
Tools.sendCommand(p, "lp user " + g.getUsername() + " parent removetemp " + '"' + permission.getKey() + '"' + " " + server + " " + world);
169+
Tools.sendCommand(p, "lp user " + g.getUsername() + " parent removetemp " + '"' + parent.getGroupName() + '"' + " " + server + " " + world);
166170
else
167-
Tools.sendCommand(p, "lp user " + g.getUsername() + " parent remove " + '"' + permission.getKey() + '"' + " " + server + " " + world);
171+
Tools.sendCommand(p, "lp user " + g.getUsername() + " parent remove " + '"' + parent.getGroupName() + '"' + " " + server + " " + world);
168172
break;
169173
}
170174
sk++;

‎src/main/java/me/AsVaidas/LuckPemsGUI/util/Settings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ public class Settings {
1818
public static String SUPPORT_DISCORD_URL = "https://bghddevelopment.com/discord";
1919
public static String FEEDBACK = "https://feedback.bghddevelopment.com";
2020
public static String WIKI = "https://wiki.bghddevelopment.com";
21-
public static String VERSION = "3.5";
21+
public static String VERSION = "4.1";
2222
public static String NAME = "LuckPermsGUI";
2323
}

‎src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: LuckPermsGUI
22
main: me.AsVaidas.LuckPemsGUI.Main
3-
version: 4.0
3+
version: 4.1
44
author: BGHDDevelopment
55
website: https://bghddevelopment.com
66
depend: [LuckPerms]

0 commit comments

Comments
 (0)