trueog/LuckPerms-PAPI
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More generic common module

Browse Source
This commit is contained in:
Luck committed 2019-11-29 18:15:46 +00:00
1 parent 30ad40d357
commit c84eba2c4f
8 files changed
+41 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

common/pom.xml
+10 -1
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>me.lucko</groupId>
<groupId>me.lucko.luckperms</groupId>
<artifactId>luckperms-placeholders</artifactId>
<version>5.0-SNAPSHOT</version>
</parent>
@@ -13,4 +13,13 @@
<artifactId>placeholders-common</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>19.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
common/src/main/java/me/lucko/luckperms/placeholders/LPPlaceholderProvider.java
+8 -9
View File
@@ -43,7 +43,6 @@ import net.luckperms.api.node.NodeType;
import net.luckperms.api.node.types.InheritanceNode;
import net.luckperms.api.query.QueryOptions;
import net.luckperms.api.track.Track;
import org.bukkit.entity.Player;
import java.time.Instant;
import java.util.HashMap;
@@ -51,6 +50,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.UUID;
import java.util.stream.Collectors;
/**
@@ -85,8 +85,7 @@ public class LPPlaceholderProvider implements PlaceholderProvider {
private void setup(PlaceholderBuilder builder) {
builder.addDynamic("context", (player, user, userData, queryOptions, key) ->
this.luckPerms.getContextManager().getContext(player).getValues(key).stream()
.collect(Collectors.joining(", "))
String.join(", ", this.luckPerms.getContextManager().getContext(player).getValues(key))
);
builder.addStatic("groups", (player, user, userData, queryOptions) ->
user.getNodes()
@@ -109,7 +108,7 @@ public class LPPlaceholderProvider implements PlaceholderProvider {
.filter(n -> n.getContexts().isSatisfiedBy(queryOptions.context()))
.anyMatch(n -> n.getKey().equals(node))
);
builder.addDynamic("check_permission", (player, user, userData, queryOptions, node) -> player.hasPermission(node));
builder.addDynamic("check_permission", (player, user, userData, queryOptions, node) -> user.getCachedData().getPermissionData(queryOptions).checkPermission(node).asBoolean());
builder.addDynamic("in_group", (player, user, userData, queryOptions, groupName) ->
user.getNodes().stream()
.filter(NodeType.INHERITANCE::matches)
@@ -118,7 +117,7 @@ public class LPPlaceholderProvider implements PlaceholderProvider {
.map(InheritanceNode::getGroupName)
.anyMatch(s -> s.equalsIgnoreCase(groupName))
);
builder.addDynamic("inherits_group", (player, user, userData, queryOptions, groupName) -> player.hasPermission("group." + groupName));
builder.addDynamic("inherits_group", (player, user, userData, queryOptions, groupName) -> user.getCachedData().getPermissionData(queryOptions).checkPermission("group." + groupName).asBoolean());
builder.addDynamic("on_track", (player, user, userData, queryOptions, trackName) ->
Optional.ofNullable(this.luckPerms.getTrackManager().getTrack(trackName))
.map(t -> t.containsGroup(user.getPrimaryGroup()))
@@ -274,8 +273,8 @@ public class LPPlaceholderProvider implements PlaceholderProvider {
}
@Override
public String onPlaceholderRequest(Player player, String placeholder) {
User user = this.luckPerms.getUserManager().getUser(player.getUniqueId());
public String onPlaceholderRequest(Object player, UUID playerUuid, String placeholder) {
User user = this.luckPerms.getUserManager().getUser(playerUuid);
if (user == null) {
return "";
}
@@ -389,7 +388,7 @@ public class LPPlaceholderProvider implements PlaceholderProvider {
*/
@FunctionalInterface
private interface DynamicPlaceholder extends Placeholder {
Object handle(Player player, User user, CachedDataManager userData, QueryOptions queryOptions, String argument);
Object handle(Object player, User user, CachedDataManager userData, QueryOptions queryOptions, String argument);
}
/**
@@ -397,7 +396,7 @@ public class LPPlaceholderProvider implements PlaceholderProvider {
*/
@FunctionalInterface
private interface StaticPlaceholder extends Placeholder {
Object handle(Player player, User user, CachedDataManager userData, QueryOptions queryOptions);
Object handle(Object player, User user, CachedDataManager userData, QueryOptions queryOptions);
}
}
common/src/main/java/me/lucko/luckperms/placeholders/PlaceholderProvider.java
+2 -9
View File
@@ -22,7 +22,7 @@
package me.lucko.luckperms.placeholders;
import org.bukkit.entity.Player;
import java.util.UUID;
/**
* Generic interface for a object that handles placeholder requests
@@ -30,13 +30,6 @@ import org.bukkit.entity.Player;
@FunctionalInterface
public interface PlaceholderProvider {
/**
* Handles a placeholder request
*
* @param player the player placeholders are being requested for
* @param placeholder the placeholder string
* @return the resultant value
*/
String onPlaceholderRequest(Player player, String placeholder);
String onPlaceholderRequest(Object player, UUID playerUuid, String placeholder);
}
luckperms-mvdw-hook/pom.xml
+9 -2
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>me.lucko</groupId>
<groupId>me.lucko.luckperms</groupId>
<artifactId>luckperms-placeholders</artifactId>
<version>5.0-SNAPSHOT</version>
</parent>
@@ -56,9 +56,16 @@
</build>
<dependencies>
<!-- BukkitAPI -->
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- common -->
<dependency>
<groupId>me.lucko</groupId>
<groupId>me.lucko.luckperms</groupId>
<artifactId>placeholders-common</artifactId>
<version>5.0-SNAPSHOT</version>
<scope>compile</scope>
luckperms-mvdw-hook/src/main/java/me/lucko/luckperms/placeholders/LuckPermsMVdWHook.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class LuckPermsMVdWHook extends JavaPlugin implements PlaceholderReplacer
return "";
}
return this.provider.onPlaceholderRequest(player, identifier);
return this.provider.onPlaceholderRequest(player, player.getUniqueId(), identifier);
}
@Override
luckperms-papi-expansion/pom.xml
+9 -2
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>me.lucko</groupId>
<groupId>me.lucko.luckperms</groupId>
<artifactId>luckperms-placeholders</artifactId>
<version>5.0-SNAPSHOT</version>
</parent>
@@ -47,9 +47,16 @@
</build>
<dependencies>
<!-- BukkitAPI -->
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- common -->
<dependency>
<groupId>me.lucko</groupId>
<groupId>me.lucko.luckperms</groupId>
<artifactId>placeholders-common</artifactId>
<version>5.0-SNAPSHOT</version>
<scope>compile</scope>
luckperms-papi-expansion/src/main/java/me/lucko/luckperms/placeholders/LuckPermsExpansion.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class LuckPermsExpansion extends PlaceholderExpansion implements Placehol
return "";
}
return this.provider.onPlaceholderRequest(player, identifier);
return this.provider.onPlaceholderRequest(player, player.getUniqueId(), identifier);
}
@Override
pom.xml
+1 -8
View File
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>me.lucko</groupId>
<groupId>me.lucko.luckperms</groupId>
<artifactId>luckperms-placeholders</artifactId>
<version>5.0-SNAPSHOT</version>
@@ -34,13 +34,6 @@
<version>5.0</version>
<scope>provided</scope>
</dependency>
<!-- BukkitAPI -->
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
<repositories>