Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-24 11:38:40 +01:00
Code Issues Projects Releases Wiki Activity

Rearrange some packages, general cleanup

Browse Source
This commit is contained in:
Luck 2016-11-20 13:44:36 +00:00
parent bb25632178
commit 51732fa660
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
26 changed files with 79 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCalculatorFactory.java
View File

@ -29,8 +29,13 @@ import me.lucko.luckperms.bukkit.calculators.AttachmentProcessor;
import me.lucko.luckperms.bukkit.calculators.ChildProcessor;
import me.lucko.luckperms.bukkit.calculators.DefaultsProcessor;
import me.lucko.luckperms.bukkit.inject.Injector;
import me.lucko.luckperms.bukkit.inject.LPPermissible;
import me.lucko.luckperms.common.calculators.*;
import me.lucko.luckperms.bukkit.model.LPPermissible;
import me.lucko.luckperms.common.calculators.CalculatorFactory;
import me.lucko.luckperms.common.calculators.PermissionCalculator;
import me.lucko.luckperms.common.calculators.PermissionProcessor;
import me.lucko.luckperms.common.calculators.processors.MapProcessor;
import me.lucko.luckperms.common.calculators.processors.RegexProcessor;
import me.lucko.luckperms.common.calculators.processors.WildcardProcessor;
import me.lucko.luckperms.common.users.User;
import java.util.UUID;

2
bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitListener.java
View File

@ -23,7 +23,7 @@
package me.lucko.luckperms.bukkit;
import me.lucko.luckperms.bukkit.inject.Injector;
import me.lucko.luckperms.bukkit.inject.LPPermissible;
import me.lucko.luckperms.bukkit.model.LPPermissible;
import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.common.users.User;
import me.lucko.luckperms.common.utils.AbstractListener;

8
bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java
View File

@ -31,8 +31,8 @@ import me.lucko.luckperms.api.PlatformType;
import me.lucko.luckperms.api.context.ContextSet;
import me.lucko.luckperms.api.context.MutableContextSet;
import me.lucko.luckperms.bukkit.calculators.AutoOPListener;
import me.lucko.luckperms.bukkit.calculators.ChildPermissionProvider;
import me.lucko.luckperms.bukkit.calculators.DefaultsProvider;
import me.lucko.luckperms.bukkit.model.ChildPermissionProvider;
import me.lucko.luckperms.bukkit.model.DefaultsProvider;
import me.lucko.luckperms.bukkit.vault.VaultHook;
import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.common.api.ApiProvider;
@ -47,10 +47,10 @@ import me.lucko.luckperms.common.core.UuidCache;
import me.lucko.luckperms.common.data.Importer;
import me.lucko.luckperms.common.groups.GroupManager;
import me.lucko.luckperms.common.messaging.RedisMessaging;
import me.lucko.luckperms.common.runnables.ExpireTemporaryTask;
import me.lucko.luckperms.common.runnables.UpdateTask;
import me.lucko.luckperms.common.storage.Storage;
import me.lucko.luckperms.common.storage.StorageFactory;
import me.lucko.luckperms.common.tasks.ExpireTemporaryTask;
import me.lucko.luckperms.common.tasks.UpdateTask;
import me.lucko.luckperms.common.tracks.TrackManager;
import me.lucko.luckperms.common.users.User;
import me.lucko.luckperms.common.users.UserManager;

2
bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/AutoOPListener.java
View File

@ -24,7 +24,7 @@ package me.lucko.luckperms.bukkit.calculators;
import me.lucko.luckperms.api.context.ContextListener;
import me.lucko.luckperms.bukkit.inject.Injector;
import me.lucko.luckperms.bukkit.inject.LPPermissible;
import me.lucko.luckperms.bukkit.model.LPPermissible;
import org.bukkit.entity.Player;
import java.util.Map;

1
bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/ChildProcessor.java
View File

@ -24,6 +24,7 @@ package me.lucko.luckperms.bukkit.calculators;
import lombok.RequiredArgsConstructor;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.bukkit.model.ChildPermissionProvider;
import me.lucko.luckperms.common.calculators.PermissionProcessor;
import java.util.Map;

1
bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/DefaultsProcessor.java
View File

@ -24,6 +24,7 @@ package me.lucko.luckperms.bukkit.calculators;
import lombok.AllArgsConstructor;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.bukkit.model.DefaultsProvider;
import me.lucko.luckperms.common.calculators.PermissionProcessor;
import org.bukkit.Bukkit;
import org.bukkit.permissions.Permission;

1
bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/Injector.java
View File

@ -23,6 +23,7 @@
package me.lucko.luckperms.bukkit.inject;
import lombok.experimental.UtilityClass;
import me.lucko.luckperms.bukkit.model.LPPermissible;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.permissions.Permissible;

2
bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/ChildPermissionProvider.java → bukkit/src/main/java/me/lucko/luckperms/bukkit/model/ChildPermissionProvider.java
View File

@ -20,7 +20,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.bukkit.calculators;
package me.lucko.luckperms.bukkit.model;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;

2
bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/DefaultsProvider.java → bukkit/src/main/java/me/lucko/luckperms/bukkit/model/DefaultsProvider.java
View File

@ -20,7 +20,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.bukkit.calculators;
package me.lucko.luckperms.bukkit.model;
import lombok.AllArgsConstructor;
import me.lucko.luckperms.api.Tristate;

2
bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/LPPermissible.java → bukkit/src/main/java/me/lucko/luckperms/bukkit/model/LPPermissible.java
View File

@ -20,7 +20,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.bukkit.inject;
package me.lucko.luckperms.bukkit.model;
import lombok.Getter;
import lombok.NonNull;

7
bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCalculatorFactory.java
View File

@ -25,7 +25,12 @@ package me.lucko.luckperms.bungee;
import com.google.common.collect.ImmutableList;
import lombok.AllArgsConstructor;
import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.common.calculators.*;
import me.lucko.luckperms.common.calculators.CalculatorFactory;
import me.lucko.luckperms.common.calculators.PermissionCalculator;
import me.lucko.luckperms.common.calculators.PermissionProcessor;
import me.lucko.luckperms.common.calculators.processors.MapProcessor;
import me.lucko.luckperms.common.calculators.processors.RegexProcessor;
import me.lucko.luckperms.common.calculators.processors.WildcardProcessor;
import me.lucko.luckperms.common.users.User;
@AllArgsConstructor

4
bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java
View File

@ -42,10 +42,10 @@ import me.lucko.luckperms.common.core.UuidCache;
import me.lucko.luckperms.common.data.Importer;
import me.lucko.luckperms.common.groups.GroupManager;
import me.lucko.luckperms.common.messaging.RedisMessaging;
import me.lucko.luckperms.common.runnables.ExpireTemporaryTask;
import me.lucko.luckperms.common.runnables.UpdateTask;
import me.lucko.luckperms.common.storage.Storage;
import me.lucko.luckperms.common.storage.StorageFactory;
import me.lucko.luckperms.common.tasks.ExpireTemporaryTask;
import me.lucko.luckperms.common.tasks.UpdateTask;
import me.lucko.luckperms.common.tracks.TrackManager;
import me.lucko.luckperms.common.users.User;
import me.lucko.luckperms.common.users.UserManager;

3
common/src/main/java/me/lucko/luckperms/common/calculators/MapProcessor.java → common/src/main/java/me/lucko/luckperms/common/calculators/processors/MapProcessor.java
View File

@ -20,9 +20,10 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.calculators;
package me.lucko.luckperms.common.calculators.processors;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.common.calculators.PermissionProcessor;
import java.util.Map;

3
common/src/main/java/me/lucko/luckperms/common/calculators/RegexProcessor.java → common/src/main/java/me/lucko/luckperms/common/calculators/processors/RegexProcessor.java
View File

@ -20,9 +20,10 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.calculators;
package me.lucko.luckperms.common.calculators.processors;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.common.calculators.PermissionProcessor;
import me.lucko.luckperms.common.constants.Patterns;
import java.util.Map;

3
common/src/main/java/me/lucko/luckperms/common/calculators/WildcardProcessor.java → common/src/main/java/me/lucko/luckperms/common/calculators/processors/WildcardProcessor.java
View File

@ -20,9 +20,10 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.calculators;
package me.lucko.luckperms.common.calculators.processors;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.common.calculators.PermissionProcessor;
import java.util.Map;

11
common/src/main/java/me/lucko/luckperms/common/core/Node.java → common/src/main/java/me/lucko/luckperms/common/core/ImmutableNode.java
View File

@ -30,6 +30,7 @@ import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
import me.lucko.luckperms.api.MetaUtils;
import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.api.context.ContextSet;
import me.lucko.luckperms.common.constants.Patterns;
@ -45,7 +46,7 @@ import java.util.stream.Collectors;
@SuppressWarnings("OptionalGetWithoutIsPresent")
@ToString(of = {"permission", "value", "override", "server", "world", "expireAt", "contexts"})
@EqualsAndHashCode(of = {"permission", "value", "override", "server", "world", "expireAt", "contexts"})
public class Node implements me.lucko.luckperms.api.Node {
public class ImmutableNode implements Node {
private static final Pattern PREFIX_PATTERN = Pattern.compile("(?i)prefix\\.-?\\d+\\..*");
private static final Pattern SUFFIX_PATTERN = Pattern.compile("(?i)suffix\\.-?\\d+\\..*");
private static final Pattern META_PATTERN = Pattern.compile("meta\\..*\\..*");
@ -96,7 +97,7 @@ public class Node implements me.lucko.luckperms.api.Node {
* @param world the world this node applies on
* @param contexts any additional contexts applying to this node
*/
public Node(String permission, boolean value, boolean override, long expireAt, String server, String world, ContextSet contexts) {
public ImmutableNode(String permission, boolean value, boolean override, long expireAt, String server, String world, ContextSet contexts) {
if (permission == null || permission.equals("")) {
throw new IllegalArgumentException("Empty permission");
}
@ -449,7 +450,7 @@ public class Node implements me.lucko.luckperms.api.Node {
}
@Override
public boolean equalsIgnoringValue(me.lucko.luckperms.api.Node other) {
public boolean equalsIgnoringValue(Node other) {
if (!other.getPermission().equalsIgnoreCase(this.getPermission())) {
return false;
}
@ -492,7 +493,7 @@ public class Node implements me.lucko.luckperms.api.Node {
}
@Override
public boolean almostEquals(me.lucko.luckperms.api.Node other) {
public boolean almostEquals(Node other) {
if (!other.getPermission().equalsIgnoreCase(this.getPermission())) {
return false;
}
@ -529,7 +530,7 @@ public class Node implements me.lucko.luckperms.api.Node {
}
@Override
public boolean equalsIgnoringValueOrTemp(me.lucko.luckperms.api.Node other) {
public boolean equalsIgnoringValueOrTemp(Node other) {
if (!other.getPermission().equalsIgnoreCase(this.getPermission())) {
return false;
}

33
common/src/main/java/me/lucko/luckperms/common/core/NodeBuilder.java
View File

@ -25,6 +25,7 @@ package me.lucko.luckperms.common.core;
import com.google.common.base.Splitter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.api.context.ContextSet;
import me.lucko.luckperms.api.context.MutableContextSet;
import me.lucko.luckperms.common.constants.Patterns;
@ -38,7 +39,7 @@ import java.util.Set;
* Builds Nodes
*/
@RequiredArgsConstructor
public class NodeBuilder implements me.lucko.luckperms.api.Node.Builder {
public class NodeBuilder implements Node.Builder {
private final String permission;
private Boolean value = true;
private boolean override = false;
@ -67,7 +68,7 @@ public class NodeBuilder implements me.lucko.luckperms.api.Node.Builder {
}
}
NodeBuilder(me.lucko.luckperms.api.Node other) {
NodeBuilder(Node other) {
this.permission = other.getPermission();
this.value = other.getValue();
this.override = other.isOverride();
@ -78,37 +79,37 @@ public class NodeBuilder implements me.lucko.luckperms.api.Node.Builder {
}
@Override
public me.lucko.luckperms.api.Node.Builder setNegated(boolean negated) {
public Node.Builder setNegated(boolean negated) {
value = !negated;
return this;
}
@Override
public me.lucko.luckperms.api.Node.Builder setValue(boolean value) {
public Node.Builder setValue(boolean value) {
this.value = value;
return this;
}
@Override
public me.lucko.luckperms.api.Node.Builder setOverride(boolean override) {
public Node.Builder setOverride(boolean override) {
this.override = override;
return this;
}
@Override
public me.lucko.luckperms.api.Node.Builder setExpiry(long expireAt) {
public Node.Builder setExpiry(long expireAt) {
this.expireAt = expireAt;
return this;
}
@Override
public me.lucko.luckperms.api.Node.Builder setWorld(String world) {
public Node.Builder setWorld(String world) {
this.world = world;
return this;
}
@Override
public me.lucko.luckperms.api.Node.Builder setServer(String server) {
public Node.Builder setServer(String server) {
if (server != null && ArgumentChecker.checkServer(server)) {
throw new IllegalArgumentException("Server name invalid.");
}
@ -117,13 +118,13 @@ public class NodeBuilder implements me.lucko.luckperms.api.Node.Builder {
return this;
}
public me.lucko.luckperms.api.Node.Builder setServerRaw(String server) {
public Node.Builder setServerRaw(String server) {
this.server = server;
return this;
}
@Override
public me.lucko.luckperms.api.Node.Builder withExtraContext(@NonNull String key, @NonNull String value) {
public Node.Builder withExtraContext(@NonNull String key, @NonNull String value) {
switch (key.toLowerCase()) {
case "server":
setServer(value);
@ -140,31 +141,31 @@ public class NodeBuilder implements me.lucko.luckperms.api.Node.Builder {
}
@Override
public me.lucko.luckperms.api.Node.Builder withExtraContext(Map.Entry<String, String> entry) {
public Node.Builder withExtraContext(Map.Entry<String, String> entry) {
withExtraContext(entry.getKey(), entry.getValue());
return this;
}
@Override
public me.lucko.luckperms.api.Node.Builder withExtraContext(Map<String, String> map) {
public Node.Builder withExtraContext(Map<String, String> map) {
withExtraContext(ContextSet.fromMap(map));
return this;
}
@Override
public me.lucko.luckperms.api.Node.Builder withExtraContext(Set<Map.Entry<String, String>> context) {
public Node.Builder withExtraContext(Set<Map.Entry<String, String>> context) {
withExtraContext(ContextSet.fromEntries(context));
return this;
}
@Override
public me.lucko.luckperms.api.Node.Builder withExtraContext(ContextSet set) {
public Node.Builder withExtraContext(ContextSet set) {
set.toSet().forEach(this::withExtraContext);
return this;
}
@Override
public me.lucko.luckperms.api.Node build() {
return new Node(permission, value, override, expireAt, server, world, extraContexts);
public Node build() {
return new ImmutableNode(permission, value, override, expireAt, server, world, extraContexts);
}
}

5
common/src/main/java/me/lucko/luckperms/common/core/PermissionHolder.java
View File

@ -42,6 +42,7 @@ import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.common.utils.Cache;
import me.lucko.luckperms.common.utils.ExtractedContexts;
import me.lucko.luckperms.common.utils.ImmutableLocalizedNode;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.exceptions.ObjectLacksException;
@ -988,8 +989,8 @@ public abstract class PermissionHolder {
return new NodeBuilder(permission);
}
private static me.lucko.luckperms.common.utils.LocalizedNode makeLocal(Node node, String location) {
return me.lucko.luckperms.common.utils.LocalizedNode.of(node, location);
private static ImmutableLocalizedNode makeLocal(Node node, String location) {
return ImmutableLocalizedNode.of(node, location);
}
private static Node makeNode(String s, Boolean b) {

2
common/src/main/java/me/lucko/luckperms/common/storage/AbstractStorage.java
View File

@ -30,6 +30,8 @@ import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.common.data.Log;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.common.storage.backing.AbstractBacking;
import me.lucko.luckperms.common.storage.wrappings.BufferedOutputStorage;
import me.lucko.luckperms.common.storage.wrappings.TolerantStorage;
import me.lucko.luckperms.common.tracks.Track;
import me.lucko.luckperms.common.users.User;

3
common/src/main/java/me/lucko/luckperms/common/storage/BufferedOutputStorage.java → common/src/main/java/me/lucko/luckperms/common/storage/wrappings/BufferedOutputStorage.java
View File

@ -20,13 +20,14 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.storage;
package me.lucko.luckperms.common.storage.wrappings;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.experimental.Delegate;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.common.storage.Storage;
import me.lucko.luckperms.common.tracks.Track;
import me.lucko.luckperms.common.users.User;
import me.lucko.luckperms.common.users.UserIdentifier;

3
common/src/main/java/me/lucko/luckperms/common/storage/TolerantStorage.java → common/src/main/java/me/lucko/luckperms/common/storage/wrappings/TolerantStorage.java
View File

@ -20,7 +20,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.storage;
package me.lucko.luckperms.common.storage.wrappings;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
@ -28,6 +28,7 @@ import lombok.experimental.Delegate;
import me.lucko.luckperms.api.LogEntry;
import me.lucko.luckperms.common.data.Log;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.common.storage.Storage;
import me.lucko.luckperms.common.tracks.Track;
import me.lucko.luckperms.common.users.User;

2
common/src/main/java/me/lucko/luckperms/common/runnables/ExpireTemporaryTask.java → common/src/main/java/me/lucko/luckperms/common/tasks/ExpireTemporaryTask.java
View File

@ -20,7 +20,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.runnables;
package me.lucko.luckperms.common.tasks;
import lombok.AllArgsConstructor;
import me.lucko.luckperms.common.LuckPermsPlugin;

2
common/src/main/java/me/lucko/luckperms/common/runnables/UpdateTask.java → common/src/main/java/me/lucko/luckperms/common/tasks/UpdateTask.java
View File

@ -20,7 +20,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.runnables;
package me.lucko.luckperms.common.tasks;
import lombok.AllArgsConstructor;
import me.lucko.luckperms.api.event.events.PostSyncEvent;

7
common/src/main/java/me/lucko/luckperms/common/utils/LocalizedNode.java → common/src/main/java/me/lucko/luckperms/common/utils/ImmutableLocalizedNode.java
View File

@ -24,6 +24,7 @@ package me.lucko.luckperms.common.utils;
import lombok.*;
import lombok.experimental.Delegate;
import me.lucko.luckperms.api.LocalizedNode;
import me.lucko.luckperms.api.Node;
/**
@ -32,9 +33,9 @@ import me.lucko.luckperms.api.Node;
@Getter
@ToString
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class LocalizedNode implements me.lucko.luckperms.api.LocalizedNode {
public static LocalizedNode of(@NonNull Node node, @NonNull String location) {
return new LocalizedNode(node, location);
public class ImmutableLocalizedNode implements LocalizedNode {
public static ImmutableLocalizedNode of(@NonNull Node node, @NonNull String location) {
return new ImmutableLocalizedNode(node, location);
}
@Delegate

4
sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java
View File

@ -42,10 +42,10 @@ import me.lucko.luckperms.common.core.UuidCache;
import me.lucko.luckperms.common.data.Importer;
import me.lucko.luckperms.common.groups.GroupManager;
import me.lucko.luckperms.common.messaging.RedisMessaging;
import me.lucko.luckperms.common.runnables.ExpireTemporaryTask;
import me.lucko.luckperms.common.runnables.UpdateTask;
import me.lucko.luckperms.common.storage.Storage;
import me.lucko.luckperms.common.storage.StorageFactory;
import me.lucko.luckperms.common.tasks.ExpireTemporaryTask;
import me.lucko.luckperms.common.tasks.UpdateTask;
import me.lucko.luckperms.common.tracks.TrackManager;
import me.lucko.luckperms.common.users.User;
import me.lucko.luckperms.common.users.UserManager;

7
sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCalculatorFactory.java
View File

@ -25,7 +25,12 @@ package me.lucko.luckperms.sponge;
import com.google.common.collect.ImmutableList;
import lombok.AllArgsConstructor;
import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.common.calculators.*;
import me.lucko.luckperms.common.calculators.CalculatorFactory;
import me.lucko.luckperms.common.calculators.PermissionCalculator;
import me.lucko.luckperms.common.calculators.PermissionProcessor;
import me.lucko.luckperms.common.calculators.processors.MapProcessor;
import me.lucko.luckperms.common.calculators.processors.RegexProcessor;
import me.lucko.luckperms.common.calculators.processors.WildcardProcessor;
import me.lucko.luckperms.common.users.User;
import me.lucko.luckperms.sponge.calculators.DefaultsProcessor;
import me.lucko.luckperms.sponge.calculators.SpongeWildcardProcessor;