Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-27 21:29:47 +01:00
Code Issues Projects Releases Wiki Activity

Some tidying up

Browse Source
This commit is contained in:
Luck 2020-12-09 10:46:22 +00:00
parent 5fbb80f16a
commit 39a5ccf9a9
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/me/lucko/luckperms/common/node/types/Inheritance.java
View File

@ -27,10 +27,12 @@ package me.lucko.luckperms.common.node.types;
import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNode;
import me.lucko.luckperms.common.node.AbstractNodeBuilder; import me.lucko.luckperms.common.node.AbstractNodeBuilder;
import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.context.ImmutableContextSet;
import net.luckperms.api.model.group.Group; import net.luckperms.api.model.group.Group;
import net.luckperms.api.node.metadata.NodeMetadataKey; import net.luckperms.api.node.metadata.NodeMetadataKey;
import net.luckperms.api.node.types.InheritanceNode; import net.luckperms.api.node.types.InheritanceNode;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;

2
common/src/main/java/me/lucko/luckperms/common/node/types/Meta.java
View File

@ -28,9 +28,11 @@ package me.lucko.luckperms.common.node.types;
import me.lucko.luckperms.common.node.AbstractNode; import me.lucko.luckperms.common.node.AbstractNode;
import me.lucko.luckperms.common.node.AbstractNodeBuilder; import me.lucko.luckperms.common.node.AbstractNodeBuilder;
import me.lucko.luckperms.common.node.factory.Delimiters; import me.lucko.luckperms.common.node.factory.Delimiters;
import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.context.ImmutableContextSet;
import net.luckperms.api.node.metadata.NodeMetadataKey; import net.luckperms.api.node.metadata.NodeMetadataKey;
import net.luckperms.api.node.types.MetaNode; import net.luckperms.api.node.types.MetaNode;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;

10
common/src/main/java/me/lucko/luckperms/common/query/FlagUtils.java
View File

@ -33,9 +33,9 @@ import java.util.Set;
final class FlagUtils { final class FlagUtils {
private FlagUtils() {} private FlagUtils() {}
private static final EnumSet<Flag> DEFAULT_FLAGS_SET = EnumSet.allOf(Flag.class); private static final EnumSet<Flag> ALL_FLAGS_SET = EnumSet.allOf(Flag.class);
private static final int DEFAULT_FLAGS_SIZE = DEFAULT_FLAGS_SET.size(); private static final int ALL_FLAGS_SIZE = ALL_FLAGS_SET.size();
static final byte DEFAULT_FLAGS = toByte0(DEFAULT_FLAGS_SET); static final byte ALL_FLAGS = toByte0(ALL_FLAGS_SET);
/* bitwise utility methods */ /* bitwise utility methods */
@ -45,8 +45,8 @@ final class FlagUtils {
static byte toByte(Set<Flag> settings) { static byte toByte(Set<Flag> settings) {
// fast path for the default set of flags. // fast path for the default set of flags.
if (settings.size() == DEFAULT_FLAGS_SIZE) { if (settings.size() == ALL_FLAGS_SIZE) {
return DEFAULT_FLAGS; return ALL_FLAGS;
} }
return toByte0(settings); return toByte0(settings);
} }

6
common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsBuilderImpl.java
View File

@ -54,7 +54,7 @@ public class QueryOptionsBuilderImpl implements QueryOptions.Builder {
public QueryOptionsBuilderImpl(QueryMode mode) { public QueryOptionsBuilderImpl(QueryMode mode) {
this.mode = mode; this.mode = mode;
this.context = mode == QueryMode.CONTEXTUAL ? ImmutableContextSetImpl.EMPTY : null; this.context = mode == QueryMode.CONTEXTUAL ? ImmutableContextSetImpl.EMPTY : null;
this.flags = FlagUtils.DEFAULT_FLAGS; this.flags = FlagUtils.ALL_FLAGS;
this.flagsSet = null; this.flagsSet = null;
this.options = null; this.options = null;
this.copyOptions = false; this.copyOptions = false;
@ -150,13 +150,13 @@ public class QueryOptionsBuilderImpl implements QueryOptions.Builder {
if (this.options == null) { if (this.options == null) {
if (this.mode == QueryMode.NON_CONTEXTUAL) { if (this.mode == QueryMode.NON_CONTEXTUAL) {
if (FlagUtils.DEFAULT_FLAGS == flags) { if (FlagUtils.ALL_FLAGS == flags) {
// mode same, contexts null, flags same, options null // mode same, contexts null, flags same, options null
// so therefore, equal to default - return that instead! // so therefore, equal to default - return that instead!
return QueryOptionsImpl.DEFAULT_NON_CONTEXTUAL; return QueryOptionsImpl.DEFAULT_NON_CONTEXTUAL;
} }
} else if (this.mode == QueryMode.CONTEXTUAL) { } else if (this.mode == QueryMode.CONTEXTUAL) {
if (FlagUtils.DEFAULT_FLAGS == flags && this.context.isEmpty()) { if (FlagUtils.ALL_FLAGS == flags && this.context.isEmpty()) {
// mode same, contexts empty, flags same, options null // mode same, contexts empty, flags same, options null
// so therefore, equal to default - return that instead! // so therefore, equal to default - return that instead!
return QueryOptionsImpl.DEFAULT_CONTEXTUAL; return QueryOptionsImpl.DEFAULT_CONTEXTUAL;

4
common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsImpl.java
View File

@ -47,8 +47,8 @@ import java.util.Optional;
import java.util.Set; import java.util.Set;
public class QueryOptionsImpl implements QueryOptions { public class QueryOptionsImpl implements QueryOptions {
public static final QueryOptions DEFAULT_CONTEXTUAL = new QueryOptionsImpl(QueryMode.CONTEXTUAL, ImmutableContextSetImpl.EMPTY, FlagUtils.DEFAULT_FLAGS, null); public static final QueryOptions DEFAULT_CONTEXTUAL = new QueryOptionsImpl(QueryMode.CONTEXTUAL, ImmutableContextSetImpl.EMPTY, FlagUtils.ALL_FLAGS, null);
public static final QueryOptions DEFAULT_NON_CONTEXTUAL = new QueryOptionsImpl(QueryMode.NON_CONTEXTUAL, null, FlagUtils.DEFAULT_FLAGS, null); public static final QueryOptions DEFAULT_NON_CONTEXTUAL = new QueryOptionsImpl(QueryMode.NON_CONTEXTUAL, null, FlagUtils.ALL_FLAGS, null);
// state // state
private final QueryMode mode; private final QueryMode mode;