Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-09-29 22:07:27 +02:00
Code Issues Projects Releases Wiki Activity

API changes for 2.15

Browse Source
This commit is contained in:
Luck 2016-11-22 18:27:40 +00:00
parent d13eb1a55d
commit f1606ac51b
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
12 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>luckperms</artifactId>
<groupId>me.lucko.luckperms</groupId>
<version>2.14-SNAPSHOT</version>
<version>2.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

3
api/src/main/java/me/lucko/luckperms/api/Contexts.java
View File

@ -32,6 +32,7 @@ import java.util.Map;
* @since 2.11
*/
public class Contexts {
private static final Contexts ALLOW_ALL = new Contexts(ContextSet.empty(), true, true, true, true, true, true);
public static final String SERVER_KEY = "server";
public static final String WORLD_KEY = "world";
@ -40,7 +41,7 @@ public class Contexts {
* @return a context that will not apply any filters
*/
public static Contexts allowAll() {
return new Contexts(ContextSet.empty(), true, true, true, true, true, true);
return ALLOW_ALL;
}
public static Contexts of(ContextSet context, boolean includeGlobal, boolean includeGlobalWorld, boolean applyGroups, boolean applyGlobalGroups, boolean applyGlobalWorldGroups, boolean op) {

8
api/src/main/java/me/lucko/luckperms/api/LuckPermsApi.java
View File

@ -250,4 +250,12 @@ public interface LuckPermsApi {
*/
void registerContextListener(ContextListener<?> contextListener);
/**
* Gets a calculated context instance for the user using the rules of the platform.
* These values are calculated using the options in the configuration, and the provided calculators.
* @param user the user to get contexts for
* @return an optional containing contexts. Will return empty if the user is not online.
*/
Optional<Contexts> getContextForUser(User user);
}

3
api/src/main/java/me/lucko/luckperms/api/context/ContextSet.java
View File

@ -37,6 +37,7 @@ import java.util.stream.Collectors;
* @since 2.13
*/
public class ContextSet {
private static final ContextSet EMPTY = new ContextSet();
/**
* Make a singleton ContextSet from a context pair
@ -112,7 +113,7 @@ public class ContextSet {
* @return a new ContextSet
*/
public static ContextSet empty() {
return new ContextSet();
return EMPTY;
}
final Set<Map.Entry<String, String>> contexts;

2
bukkit-legacy/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>luckperms</artifactId>
<groupId>me.lucko.luckperms</groupId>
<version>2.14-SNAPSHOT</version>
<version>2.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
bukkit-placeholders/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>luckperms</artifactId>
<groupId>me.lucko.luckperms</groupId>
<version>2.14-SNAPSHOT</version>
<version>2.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -30,7 +30,7 @@
<dependency>
<groupId>me.lucko.luckperms</groupId>
<artifactId>luckperms-api</artifactId>
<version>2.14-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<!-- BukkitAPI -->

2
bukkit/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>luckperms</artifactId>
<groupId>me.lucko.luckperms</groupId>
<version>2.14-SNAPSHOT</version>
<version>2.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bungee/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>luckperms</artifactId>
<groupId>me.lucko.luckperms</groupId>
<version>2.14-SNAPSHOT</version>
<version>2.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>luckperms</artifactId>
<groupId>me.lucko.luckperms</groupId>
<version>2.14-SNAPSHOT</version>
<version>2.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

10
common/src/main/java/me/lucko/luckperms/common/api/ApiProvider.java
View File

@ -71,7 +71,7 @@ public class ApiProvider implements LuckPermsApi {
@Override
public double getApiVersion() {
return 2.14;
return 2.15;
}
@Override
@ -159,7 +159,7 @@ public class ApiProvider implements LuckPermsApi {
@Override
public void cleanupUser(@NonNull User user) {
me.lucko.luckperms.common.api.internal.Utils.checkUser(user);
Utils.checkUser(user);
plugin.getUserManager().cleanup(((UserLink) user).getMaster());
}
@ -221,4 +221,10 @@ public class ApiProvider implements LuckPermsApi {
public void registerContextListener(ContextListener<?> contextListener) {
plugin.getContextManager().registerListener(contextListener);
}
@Override
public Optional<Contexts> getContextForUser(User user) {
Utils.checkUser(user);
return Optional.ofNullable(plugin.getContextForUser(((UserLink) user).getMaster()));
}
}

4
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>me.lucko.luckperms</groupId>
<artifactId>luckperms</artifactId>
<version>2.14-SNAPSHOT</version>
<version>2.15-SNAPSHOT</version>
<modules>
<module>common</module>
<module>api</module>
@ -38,7 +38,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<release.version>2.14</release.version>
<release.version>2.15</release.version>
</properties>
<distributionManagement>

2
sponge/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>luckperms</artifactId>
<groupId>me.lucko.luckperms</groupId>
<version>2.14-SNAPSHOT</version>
<version>2.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>