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

Reorganize packages

Browse Source
This commit is contained in:
Luck 2016-10-13 20:07:03 +01:00
parent b6c4239322
commit 26fb506560
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
221 changed files with 1443 additions and 1370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,14 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms; package me.lucko.luckperms.bukkit;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.calculators.*; import me.lucko.luckperms.bukkit.calculators.AttachmentProcessor;
import me.lucko.luckperms.inject.Injector; import me.lucko.luckperms.bukkit.calculators.DefaultsProcessor;
import me.lucko.luckperms.inject.LPPermissible; import me.lucko.luckperms.bukkit.inject.Injector;
import me.lucko.luckperms.users.User; import me.lucko.luckperms.bukkit.inject.LPPermissible;
import me.lucko.luckperms.common.calculators.*;
import me.lucko.luckperms.common.users.User;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

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

@ -20,14 +20,15 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms; package me.lucko.luckperms.bukkit;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import me.lucko.luckperms.api.data.Callback; import me.lucko.luckperms.api.data.Callback;
import me.lucko.luckperms.commands.CommandManager; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.Util; import me.lucko.luckperms.common.commands.CommandManager;
import me.lucko.luckperms.constants.Patterns; import me.lucko.luckperms.common.commands.Util;
import me.lucko.luckperms.common.constants.Patterns;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

4
bukkit/src/main/java/me/lucko/luckperms/BukkitConfig.java → bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitConfig.java
View File

@ -20,9 +20,9 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms; package me.lucko.luckperms.bukkit;
import me.lucko.luckperms.config.AbstractConfiguration; import me.lucko.luckperms.common.config.AbstractConfiguration;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;

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

@ -20,13 +20,13 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms; package me.lucko.luckperms.bukkit;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.bukkit.inject.Injector;
import me.lucko.luckperms.inject.Injector; import me.lucko.luckperms.bukkit.inject.LPPermissible;
import me.lucko.luckperms.inject.LPPermissible; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.users.User; import me.lucko.luckperms.common.users.User;
import me.lucko.luckperms.utils.AbstractListener; import me.lucko.luckperms.common.utils.AbstractListener;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;

7
bukkit/src/main/java/me/lucko/luckperms/BukkitSenderFactory.java → bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java
View File

@ -20,10 +20,11 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms; package me.lucko.luckperms.bukkit;
import me.lucko.luckperms.commands.SenderFactory; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.constants.Constants; import me.lucko.luckperms.common.commands.SenderFactory;
import me.lucko.luckperms.common.constants.Constants;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

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

@ -20,34 +20,36 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms; package me.lucko.luckperms.bukkit;
import lombok.Getter; import lombok.Getter;
import me.lucko.luckperms.ApiHandler;
import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.Logger; import me.lucko.luckperms.api.Logger;
import me.lucko.luckperms.api.LuckPermsApi; import me.lucko.luckperms.api.LuckPermsApi;
import me.lucko.luckperms.api.PlatformType; import me.lucko.luckperms.api.PlatformType;
import me.lucko.luckperms.api.implementation.ApiProvider; import me.lucko.luckperms.bukkit.calculators.DefaultsProvider;
import me.lucko.luckperms.api.vault.VaultHook; import me.lucko.luckperms.bukkit.vault.VaultHook;
import me.lucko.luckperms.calculators.CalculatorFactory; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.calculators.DefaultsProvider; import me.lucko.luckperms.common.api.ApiProvider;
import me.lucko.luckperms.commands.ConsecutiveExecutor; import me.lucko.luckperms.common.calculators.CalculatorFactory;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.ConsecutiveExecutor;
import me.lucko.luckperms.config.LPConfiguration; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.config.LPConfiguration;
import me.lucko.luckperms.contexts.ContextManager; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.contexts.ServerCalculator; import me.lucko.luckperms.common.contexts.ContextManager;
import me.lucko.luckperms.core.UuidCache; import me.lucko.luckperms.common.contexts.ServerCalculator;
import me.lucko.luckperms.data.Importer; import me.lucko.luckperms.common.core.UuidCache;
import me.lucko.luckperms.groups.GroupManager; import me.lucko.luckperms.common.data.Importer;
import me.lucko.luckperms.runnables.ExpireTemporaryTask; import me.lucko.luckperms.common.groups.GroupManager;
import me.lucko.luckperms.runnables.UpdateTask; import me.lucko.luckperms.common.runnables.ExpireTemporaryTask;
import me.lucko.luckperms.storage.Datastore; import me.lucko.luckperms.common.runnables.UpdateTask;
import me.lucko.luckperms.storage.StorageFactory; import me.lucko.luckperms.common.storage.Datastore;
import me.lucko.luckperms.tracks.TrackManager; import me.lucko.luckperms.common.storage.StorageFactory;
import me.lucko.luckperms.users.UserManager; import me.lucko.luckperms.common.tracks.TrackManager;
import me.lucko.luckperms.utils.LocaleManager; import me.lucko.luckperms.common.users.UserManager;
import me.lucko.luckperms.utils.LogFactory; import me.lucko.luckperms.common.utils.LocaleManager;
import me.lucko.luckperms.common.utils.LogFactory;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.command.PluginCommand; import org.bukkit.command.PluginCommand;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -160,7 +162,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
getLog().info("Registering API..."); getLog().info("Registering API...");
apiProvider = new ApiProvider(this); apiProvider = new ApiProvider(this);
LuckPerms.registerProvider(apiProvider); ApiHandler.registerProvider(apiProvider);
getServer().getServicesManager().register(LuckPermsApi.class, apiProvider, this, ServicePriority.Normal); getServer().getServicesManager().register(LuckPermsApi.class, apiProvider, this, ServicePriority.Normal);
// Run update task to refresh any online users // Run update task to refresh any online users
@ -185,7 +187,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
datastore.shutdown(); datastore.shutdown();
getLog().info("Unregistering API..."); getLog().info("Unregistering API...");
LuckPerms.unregisterProvider(); ApiHandler.unregisterProvider();
getServer().getServicesManager().unregisterAll(this); getServer().getServicesManager().unregisterAll(this);
if (vaultHook != null) { if (vaultHook != null) {
@ -236,8 +238,8 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
@Override @Override
public List<Sender> getNotifyListeners() { public List<Sender> getNotifyListeners() {
return getServer().getOnlinePlayers().stream() return getServer().getOnlinePlayers().stream()
.map(p -> BukkitSenderFactory.get(this).wrap(p, Collections.singleton(me.lucko.luckperms.constants.Permission.LOG_NOTIFY))) .map(p -> BukkitSenderFactory.get(this).wrap(p, Collections.singleton(me.lucko.luckperms.common.constants.Permission.LOG_NOTIFY)))
.filter(me.lucko.luckperms.constants.Permission.LOG_NOTIFY::isAuthorized) .filter(me.lucko.luckperms.common.constants.Permission.LOG_NOTIFY::isAuthorized)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@ -346,7 +348,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
Map<String, List<String>> wildcards = new HashMap<>(); Map<String, List<String>> wildcards = new HashMap<>();
List<String> all = new ArrayList<>(); List<String> all = new ArrayList<>();
for (me.lucko.luckperms.constants.Permission p : me.lucko.luckperms.constants.Permission.values()) { for (me.lucko.luckperms.common.constants.Permission p : me.lucko.luckperms.common.constants.Permission.values()) {
pm.addPermission(new Permission(p.getNode(), def)); pm.addPermission(new Permission(p.getNode(), def));
if (p.getGroup() != null) { if (p.getGroup() != null) {
if (!wildcards.containsKey(p.getGroup())) { if (!wildcards.containsKey(p.getGroup())) {

4
bukkit/src/main/java/me/lucko/luckperms/WorldCalculator.java → bukkit/src/main/java/me/lucko/luckperms/bukkit/WorldCalculator.java
View File

@ -20,13 +20,13 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms; package me.lucko.luckperms.bukkit;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.context.ContextCalculator; import me.lucko.luckperms.api.context.ContextCalculator;
import me.lucko.luckperms.common.LuckPermsPlugin;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;

3
bukkit/src/main/java/me/lucko/luckperms/calculators/AttachmentProcessor.java → bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/AttachmentProcessor.java
View File

@ -20,11 +20,12 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.calculators; package me.lucko.luckperms.bukkit.calculators;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.common.calculators.PermissionProcessor;
import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.permissions.PermissionAttachmentInfo;
import java.util.Map; import java.util.Map;

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

@ -20,15 +20,14 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.calculators; package me.lucko.luckperms.bukkit.calculators;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.common.calculators.PermissionProcessor;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.permissions.Permission; import org.bukkit.permissions.Permission;
import java.util.function.Supplier;
@AllArgsConstructor @AllArgsConstructor
public class DefaultsProcessor implements PermissionProcessor { public class DefaultsProcessor implements PermissionProcessor {
private final boolean isOp; private final boolean isOp;

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

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

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

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.inject; package me.lucko.luckperms.bukkit.inject;
import org.bukkit.permissions.PermissibleBase; import org.bukkit.permissions.PermissibleBase;
import org.bukkit.permissions.Permission; import org.bukkit.permissions.Permission;

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

@ -20,11 +20,10 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.inject; package me.lucko.luckperms.bukkit.inject;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.permissions.Permissible; import org.bukkit.permissions.Permissible;

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

@ -20,14 +20,14 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.inject; package me.lucko.luckperms.bukkit.inject;
import lombok.Getter; import lombok.Getter;
import lombok.NonNull; import lombok.NonNull;
import me.lucko.luckperms.LPBukkitPlugin;
import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.users.User; import me.lucko.luckperms.bukkit.LPBukkitPlugin;
import me.lucko.luckperms.common.users.User;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.permissions.*; import org.bukkit.permissions.*;

21
bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultChatHook.java → bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultChatHook.java
View File

@ -20,17 +20,18 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.api.vault; package me.lucko.luckperms.bukkit.vault;
import lombok.NonNull; import lombok.NonNull;
import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.caching.MetaData; import me.lucko.luckperms.common.caching.MetaData;
import me.lucko.luckperms.core.PermissionHolder; import me.lucko.luckperms.common.core.PermissionHolder;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.common.users.User;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.exceptions.ObjectLacksException; import me.lucko.luckperms.exceptions.ObjectLacksException;
import me.lucko.luckperms.groups.Group;
import me.lucko.luckperms.users.User;
import net.milkbowl.vault.chat.Chat; import net.milkbowl.vault.chat.Chat;
import java.util.HashMap; import java.util.HashMap;
@ -38,8 +39,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static me.lucko.luckperms.utils.ArgumentChecker.escapeCharacters; import static me.lucko.luckperms.common.utils.ArgumentChecker.escapeCharacters;
import static me.lucko.luckperms.utils.ArgumentChecker.unescapeCharacters; import static me.lucko.luckperms.common.utils.ArgumentChecker.unescapeCharacters;
/** /**
* Provides the Vault Chat service through the use of normal permission nodes. * Provides the Vault Chat service through the use of normal permission nodes.
@ -55,7 +56,7 @@ import static me.lucko.luckperms.utils.ArgumentChecker.unescapeCharacters;
* Permission Nodes = meta.node.value * Permission Nodes = meta.node.value
* *
* Node that special characters used within LuckPerms are escaped: * Node that special characters used within LuckPerms are escaped:
* See {@link me.lucko.luckperms.utils.ArgumentChecker#escapeCharacters(String)} * See {@link ArgumentChecker#escapeCharacters(String)}
*/ */
public class VaultChatHook extends Chat { public class VaultChatHook extends Chat {
private final VaultPermissionHook perms; private final VaultPermissionHook perms;
@ -94,7 +95,7 @@ public class VaultChatHook extends Chat {
} catch (ObjectLacksException ignored) {} } catch (ObjectLacksException ignored) {}
}); });
Node.Builder metaNode = new me.lucko.luckperms.core.Node.Builder("meta." + k + "." + v).setValue(true); Node.Builder metaNode = new me.lucko.luckperms.common.core.Node.Builder("meta." + k + "." + v).setValue(true);
if (!perms.getServer().equalsIgnoreCase("global")) { if (!perms.getServer().equalsIgnoreCase("global")) {
metaNode.setServer(perms.getServer()); metaNode.setServer(perms.getServer());
} }
@ -118,7 +119,7 @@ public class VaultChatHook extends Chat {
perms.log("Setting " + (prefix ? "prefix" : "suffix") + " for " + holder.getObjectName() + " on world " + world + ", server " + perms.getServer()); perms.log("Setting " + (prefix ? "prefix" : "suffix") + " for " + holder.getObjectName() + " on world " + world + ", server " + perms.getServer());
perms.getScheduler().scheduleTask(() -> { perms.getScheduler().scheduleTask(() -> {
Node.Builder node = new me.lucko.luckperms.core.Node.Builder(prefix ? "prefix" : "suffix" + ".1000." + escapeCharacters(value)); Node.Builder node = new me.lucko.luckperms.common.core.Node.Builder(prefix ? "prefix" : "suffix" + ".1000." + escapeCharacters(value));
node.setValue(true); node.setValue(true);
if (!perms.getServer().equalsIgnoreCase("global")) { if (!perms.getServer().equalsIgnoreCase("global")) {
node.setServer(perms.getServer()); node.setServer(perms.getServer());

4
bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultHook.java → bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultHook.java
View File

@ -20,10 +20,10 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.api.vault; package me.lucko.luckperms.bukkit.vault;
import lombok.Getter; import lombok.Getter;
import me.lucko.luckperms.LPBukkitPlugin; import me.lucko.luckperms.bukkit.LPBukkitPlugin;
import net.milkbowl.vault.chat.Chat; import net.milkbowl.vault.chat.Chat;
import net.milkbowl.vault.permission.Permission; import net.milkbowl.vault.permission.Permission;
import org.bukkit.plugin.ServicePriority; import org.bukkit.plugin.ServicePriority;

10
bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultPermissionHook.java → bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java
View File

@ -20,19 +20,19 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.api.vault; package me.lucko.luckperms.bukkit.vault;
import lombok.Getter; import lombok.Getter;
import lombok.NonNull; import lombok.NonNull;
import lombok.Setter; import lombok.Setter;
import me.lucko.luckperms.LPBukkitPlugin;
import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.core.PermissionHolder; import me.lucko.luckperms.bukkit.LPBukkitPlugin;
import me.lucko.luckperms.common.core.PermissionHolder;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.common.users.User;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.exceptions.ObjectLacksException; import me.lucko.luckperms.exceptions.ObjectLacksException;
import me.lucko.luckperms.groups.Group;
import me.lucko.luckperms.users.User;
import net.milkbowl.vault.permission.Permission; import net.milkbowl.vault.permission.Permission;
import java.util.Collections; import java.util.Collections;

4
bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultScheduler.java → bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultScheduler.java
View File

@ -20,9 +20,9 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.api.vault; package me.lucko.luckperms.bukkit.vault;
import me.lucko.luckperms.LPBukkitPlugin; import me.lucko.luckperms.bukkit.LPBukkitPlugin;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
bukkit/src/main/resources/plugin.yml
View File

@ -4,7 +4,7 @@ description: A permissions plugin
author: Luck author: Luck
website: https://github.com/lucko/LuckPerms website: https://github.com/lucko/LuckPerms
main: me.lucko.luckperms.LPBukkitPlugin main: me.lucko.luckperms.bukkit.LPBukkitPlugin
softdepend: [Vault, PermissionsEx, GroupManager, PowerfulPerms, zPermissions, bPermissions] # For migration softdepend: [Vault, PermissionsEx, GroupManager, PowerfulPerms, zPermissions, bPermissions] # For migration
commands: commands:

2
bungee/src/main/java/me/lucko/luckperms/BackendServerCalculator.java → bungee/src/main/java/me/lucko/luckperms/bungee/BackendServerCalculator.java
View File

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms; package me.lucko.luckperms.bungee;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import me.lucko.luckperms.api.context.ContextCalculator; import me.lucko.luckperms.api.context.ContextCalculator;

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

@ -20,12 +20,12 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms; package me.lucko.luckperms.bungee;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.calculators.*; import me.lucko.luckperms.common.calculators.*;
import me.lucko.luckperms.users.User; import me.lucko.luckperms.common.users.User;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

8
bungee/src/main/java/me/lucko/luckperms/BungeeCommand.java → bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCommand.java
View File

@ -20,14 +20,14 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms; package me.lucko.luckperms.bungee;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import me.lucko.luckperms.api.data.Callback; import me.lucko.luckperms.api.data.Callback;
import me.lucko.luckperms.commands.CommandManager; import me.lucko.luckperms.common.commands.CommandManager;
import me.lucko.luckperms.commands.Util; import me.lucko.luckperms.common.commands.Util;
import me.lucko.luckperms.constants.Patterns; import me.lucko.luckperms.common.constants.Patterns;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Command;
import net.md_5.bungee.api.plugin.TabExecutor; import net.md_5.bungee.api.plugin.TabExecutor;

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

@ -20,9 +20,9 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms; package me.lucko.luckperms.bungee;
import me.lucko.luckperms.config.AbstractConfiguration; import me.lucko.luckperms.common.config.AbstractConfiguration;
import net.md_5.bungee.config.Configuration; import net.md_5.bungee.config.Configuration;
import net.md_5.bungee.config.ConfigurationProvider; import net.md_5.bungee.config.ConfigurationProvider;
import net.md_5.bungee.config.YamlConfiguration; import net.md_5.bungee.config.YamlConfiguration;

10
bungee/src/main/java/me/lucko/luckperms/BungeeListener.java → bungee/src/main/java/me/lucko/luckperms/bungee/BungeeListener.java
View File

@ -20,14 +20,14 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms; package me.lucko.luckperms.bungee;
import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.event.events.UserFirstLoginEvent; import me.lucko.luckperms.api.event.events.UserFirstLoginEvent;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.core.UuidCache; import me.lucko.luckperms.common.core.UuidCache;
import me.lucko.luckperms.users.User; import me.lucko.luckperms.common.users.User;
import me.lucko.luckperms.utils.AbstractListener; import me.lucko.luckperms.common.utils.AbstractListener;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.api.connection.PendingConnection; import net.md_5.bungee.api.connection.PendingConnection;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;

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

@ -20,10 +20,11 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms; package me.lucko.luckperms.bungee;
import me.lucko.luckperms.commands.SenderFactory; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.constants.Constants; import me.lucko.luckperms.common.commands.SenderFactory;
import me.lucko.luckperms.common.constants.Constants;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;

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

@ -20,33 +20,35 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms; package me.lucko.luckperms.bungee;
import lombok.Getter; import lombok.Getter;
import me.lucko.luckperms.ApiHandler;
import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.Logger; import me.lucko.luckperms.api.Logger;
import me.lucko.luckperms.api.PlatformType; import me.lucko.luckperms.api.PlatformType;
import me.lucko.luckperms.api.implementation.ApiProvider; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.calculators.CalculatorFactory; import me.lucko.luckperms.common.api.ApiProvider;
import me.lucko.luckperms.commands.CommandManager; import me.lucko.luckperms.common.calculators.CalculatorFactory;
import me.lucko.luckperms.commands.ConsecutiveExecutor; import me.lucko.luckperms.common.commands.CommandManager;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.ConsecutiveExecutor;
import me.lucko.luckperms.config.LPConfiguration; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.config.LPConfiguration;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.contexts.ContextManager; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.contexts.ServerCalculator; import me.lucko.luckperms.common.contexts.ContextManager;
import me.lucko.luckperms.core.UuidCache; import me.lucko.luckperms.common.contexts.ServerCalculator;
import me.lucko.luckperms.data.Importer; import me.lucko.luckperms.common.core.UuidCache;
import me.lucko.luckperms.groups.GroupManager; import me.lucko.luckperms.common.data.Importer;
import me.lucko.luckperms.runnables.ExpireTemporaryTask; import me.lucko.luckperms.common.groups.GroupManager;
import me.lucko.luckperms.runnables.UpdateTask; import me.lucko.luckperms.common.runnables.ExpireTemporaryTask;
import me.lucko.luckperms.storage.Datastore; import me.lucko.luckperms.common.runnables.UpdateTask;
import me.lucko.luckperms.storage.StorageFactory; import me.lucko.luckperms.common.storage.Datastore;
import me.lucko.luckperms.tracks.TrackManager; import me.lucko.luckperms.common.storage.StorageFactory;
import me.lucko.luckperms.users.UserManager; import me.lucko.luckperms.common.tracks.TrackManager;
import me.lucko.luckperms.utils.LocaleManager; import me.lucko.luckperms.common.users.UserManager;
import me.lucko.luckperms.utils.LogFactory; import me.lucko.luckperms.common.utils.LocaleManager;
import me.lucko.luckperms.common.utils.LogFactory;
import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.Plugin;
@ -132,7 +134,7 @@ public class LPBungeePlugin extends Plugin implements LuckPermsPlugin {
getLog().info("Registering API..."); getLog().info("Registering API...");
apiProvider = new ApiProvider(this); apiProvider = new ApiProvider(this);
LuckPerms.registerProvider(apiProvider); ApiHandler.registerProvider(apiProvider);
// Run update task to refresh any online users // Run update task to refresh any online users
getLog().info("Scheduling Update Task to refresh any online users."); getLog().info("Scheduling Update Task to refresh any online users.");
@ -151,7 +153,7 @@ public class LPBungeePlugin extends Plugin implements LuckPermsPlugin {
datastore.shutdown(); datastore.shutdown();
getLog().info("Unregistering API..."); getLog().info("Unregistering API...");
LuckPerms.unregisterProvider(); ApiHandler.unregisterProvider();
} }
@Override @Override

2
bungee/src/main/resources/plugin.yml
View File

@ -2,5 +2,5 @@ name: LuckPerms
version: ${release.version}.${git.closest.tag.commit.count} version: ${release.version}.${git.closest.tag.commit.count}
description: A permissions plugin description: A permissions plugin
author: Luck author: Luck
main: me.lucko.luckperms.LPBungeePlugin main: me.lucko.luckperms.bungee.LPBungeePlugin
softdepends: [PowerfulPerms] # For migration softdepends: [PowerfulPerms] # For migration

37
common/src/main/java/me/lucko/luckperms/ApiHandler.java Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package me.lucko.luckperms;
import me.lucko.luckperms.api.LuckPermsApi;
public class ApiHandler {
public static void registerProvider(LuckPermsApi luckPermsApi) {
LuckPerms.registerProvider(luckPermsApi);
}
public static void unregisterProvider() {
LuckPerms.unregisterProvider();
}
}

30
common/src/main/java/me/lucko/luckperms/LuckPermsPlugin.java → common/src/main/java/me/lucko/luckperms/common/LuckPermsPlugin.java
View File

@ -20,25 +20,25 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms; package me.lucko.luckperms.common;
import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.Logger; import me.lucko.luckperms.api.Logger;
import me.lucko.luckperms.api.PlatformType; import me.lucko.luckperms.api.PlatformType;
import me.lucko.luckperms.api.implementation.ApiProvider; import me.lucko.luckperms.common.api.ApiProvider;
import me.lucko.luckperms.calculators.CalculatorFactory; import me.lucko.luckperms.common.calculators.CalculatorFactory;
import me.lucko.luckperms.commands.ConsecutiveExecutor; import me.lucko.luckperms.common.commands.ConsecutiveExecutor;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.config.LPConfiguration; import me.lucko.luckperms.common.config.LPConfiguration;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.contexts.ContextManager; import me.lucko.luckperms.common.contexts.ContextManager;
import me.lucko.luckperms.core.UuidCache; import me.lucko.luckperms.common.core.UuidCache;
import me.lucko.luckperms.data.Importer; import me.lucko.luckperms.common.data.Importer;
import me.lucko.luckperms.groups.GroupManager; import me.lucko.luckperms.common.groups.GroupManager;
import me.lucko.luckperms.storage.Datastore; import me.lucko.luckperms.common.storage.Datastore;
import me.lucko.luckperms.tracks.TrackManager; import me.lucko.luckperms.common.tracks.TrackManager;
import me.lucko.luckperms.users.UserManager; import me.lucko.luckperms.common.users.UserManager;
import me.lucko.luckperms.utils.LocaleManager; import me.lucko.luckperms.common.utils.LocaleManager;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;

43
common/src/main/java/me/lucko/luckperms/api/implementation/ApiProvider.java → common/src/main/java/me/lucko/luckperms/common/api/ApiProvider.java
View File

@ -20,26 +20,25 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.api.implementation; package me.lucko.luckperms.common.api;
import com.google.common.eventbus.EventBus; import com.google.common.eventbus.EventBus;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.NonNull; import lombok.NonNull;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.*; import me.lucko.luckperms.api.*;
import me.lucko.luckperms.api.context.ContextListener; import me.lucko.luckperms.api.context.ContextListener;
import me.lucko.luckperms.api.context.IContextCalculator; import me.lucko.luckperms.api.context.IContextCalculator;
import me.lucko.luckperms.api.event.LPEvent; import me.lucko.luckperms.api.event.LPEvent;
import me.lucko.luckperms.api.event.LPListener; import me.lucko.luckperms.api.event.LPListener;
import me.lucko.luckperms.api.implementation.internal.*; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.users.UserIdentifier; import me.lucko.luckperms.common.users.UserIdentifier;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static me.lucko.luckperms.api.implementation.internal.Utils.checkNode; import static me.lucko.luckperms.common.api.internal.Utils.checkNode;
/** /**
* Implements the LuckPerms API using the plugin instance * Implements the LuckPerms API using the plugin instance
@ -95,17 +94,17 @@ public class ApiProvider implements LuckPermsApi {
@Override @Override
public LPConfiguration getConfiguration() { public LPConfiguration getConfiguration() {
return new LPConfigurationLink(plugin.getConfiguration()); return new me.lucko.luckperms.common.api.internal.LPConfigurationLink(plugin.getConfiguration());
} }
@Override @Override
public Datastore getDatastore() { public Datastore getDatastore() {
return new DatastoreLink(plugin, plugin.getDatastore()); return new me.lucko.luckperms.common.api.internal.DatastoreLink(plugin, plugin.getDatastore());
} }
@Override @Override
public UuidCache getUuidCache() { public UuidCache getUuidCache() {
return new UuidCacheLink(plugin.getUuidCache()); return new me.lucko.luckperms.common.api.internal.UuidCacheLink(plugin.getUuidCache());
} }
@Override @Override
@ -115,12 +114,12 @@ public class ApiProvider implements LuckPermsApi {
@Override @Override
public User getUser(@NonNull UUID uuid) { public User getUser(@NonNull UUID uuid) {
final me.lucko.luckperms.users.User user = plugin.getUserManager().get(uuid); final me.lucko.luckperms.common.users.User user = plugin.getUserManager().get(uuid);
if (user == null) { if (user == null) {
return null; return null;
} }
return new UserLink(user); return new me.lucko.luckperms.common.api.internal.UserLink(user);
} }
@Override @Override
@ -130,12 +129,12 @@ public class ApiProvider implements LuckPermsApi {
@Override @Override
public User getUser(@NonNull String name) { public User getUser(@NonNull String name) {
final me.lucko.luckperms.users.User user = plugin.getUserManager().get(name); final me.lucko.luckperms.common.users.User user = plugin.getUserManager().get(name);
if (user == null) { if (user == null) {
return null; return null;
} }
return new UserLink(user); return new me.lucko.luckperms.common.api.internal.UserLink(user);
} }
@Override @Override
@ -145,7 +144,7 @@ public class ApiProvider implements LuckPermsApi {
@Override @Override
public Set<User> getUsers() { public Set<User> getUsers() {
return plugin.getUserManager().getAll().values().stream().map(UserLink::new).collect(Collectors.toSet()); return plugin.getUserManager().getAll().values().stream().map(me.lucko.luckperms.common.api.internal.UserLink::new).collect(Collectors.toSet());
} }
@Override @Override
@ -155,18 +154,18 @@ public class ApiProvider implements LuckPermsApi {
@Override @Override
public void cleanupUser(@NonNull User user) { public void cleanupUser(@NonNull User user) {
Utils.checkUser(user); me.lucko.luckperms.common.api.internal.Utils.checkUser(user);
plugin.getUserManager().cleanup(((UserLink) user).getMaster()); plugin.getUserManager().cleanup(((me.lucko.luckperms.common.api.internal.UserLink) user).getMaster());
} }
@Override @Override
public Group getGroup(@NonNull String name) { public Group getGroup(@NonNull String name) {
final me.lucko.luckperms.groups.Group group = plugin.getGroupManager().get(name); final me.lucko.luckperms.common.groups.Group group = plugin.getGroupManager().get(name);
if (group == null) { if (group == null) {
return null; return null;
} }
return new GroupLink(group); return new me.lucko.luckperms.common.api.internal.GroupLink(group);
} }
@Override @Override
@ -176,7 +175,7 @@ public class ApiProvider implements LuckPermsApi {
@Override @Override
public Set<Group> getGroups() { public Set<Group> getGroups() {
return plugin.getGroupManager().getAll().values().stream().map(GroupLink::new).collect(Collectors.toSet()); return plugin.getGroupManager().getAll().values().stream().map(me.lucko.luckperms.common.api.internal.GroupLink::new).collect(Collectors.toSet());
} }
@Override @Override
@ -186,12 +185,12 @@ public class ApiProvider implements LuckPermsApi {
@Override @Override
public Track getTrack(@NonNull String name) { public Track getTrack(@NonNull String name) {
final me.lucko.luckperms.tracks.Track track = plugin.getTrackManager().get(name); final me.lucko.luckperms.common.tracks.Track track = plugin.getTrackManager().get(name);
if (track == null) { if (track == null) {
return null; return null;
} }
return new TrackLink(track); return new me.lucko.luckperms.common.api.internal.TrackLink(track);
} }
@Override @Override
@ -201,7 +200,7 @@ public class ApiProvider implements LuckPermsApi {
@Override @Override
public Set<Track> getTracks() { public Set<Track> getTracks() {
return plugin.getTrackManager().getAll().values().stream().map(TrackLink::new).collect(Collectors.toSet()); return plugin.getTrackManager().getAll().values().stream().map(me.lucko.luckperms.common.api.internal.TrackLink::new).collect(Collectors.toSet());
} }
@Override @Override
@ -211,7 +210,7 @@ public class ApiProvider implements LuckPermsApi {
@Override @Override
public Node.Builder buildNode(@NonNull String permission) throws IllegalArgumentException { public Node.Builder buildNode(@NonNull String permission) throws IllegalArgumentException {
return new me.lucko.luckperms.core.Node.Builder(checkNode(permission)); return new me.lucko.luckperms.common.core.Node.Builder(checkNode(permission));
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")

18
common/src/main/java/me/lucko/luckperms/api/implementation/internal/DatastoreLink.java → common/src/main/java/me/lucko/luckperms/common/api/internal/DatastoreLink.java
View File

@ -20,15 +20,15 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.api.implementation.internal; package me.lucko.luckperms.common.api.internal;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.NonNull; import lombok.NonNull;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.*; import me.lucko.luckperms.api.*;
import me.lucko.luckperms.api.data.Callback; import me.lucko.luckperms.api.data.Callback;
import me.lucko.luckperms.common.LuckPermsPlugin;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -36,21 +36,21 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import static me.lucko.luckperms.api.implementation.internal.Utils.*; import static me.lucko.luckperms.common.api.internal.Utils.*;
/** /**
* Provides a link between {@link Datastore} and {@link me.lucko.luckperms.storage.Datastore} * Provides a link between {@link Datastore} and {@link me.lucko.luckperms.common.storage.Datastore}
*/ */
@SuppressWarnings({"unused", "WeakerAccess"}) @SuppressWarnings({"unused", "WeakerAccess"})
public class DatastoreLink implements Datastore { public class DatastoreLink implements Datastore {
private final LuckPermsPlugin plugin; private final LuckPermsPlugin plugin;
private final me.lucko.luckperms.storage.Datastore master; private final me.lucko.luckperms.common.storage.Datastore master;
private final Async async; private final Async async;
private final Sync sync; private final Sync sync;
private final Future future; private final Future future;
public DatastoreLink(@NonNull LuckPermsPlugin plugin, @NonNull me.lucko.luckperms.storage.Datastore master) { public DatastoreLink(@NonNull LuckPermsPlugin plugin, @NonNull me.lucko.luckperms.common.storage.Datastore master) {
this.plugin = plugin; this.plugin = plugin;
this.master = master; this.master = master;
this.async = new Async(master); this.async = new Async(master);
@ -93,7 +93,7 @@ public class DatastoreLink implements Datastore {
@AllArgsConstructor @AllArgsConstructor
public class Async implements Datastore.Async { public class Async implements Datastore.Async {
private final me.lucko.luckperms.storage.Datastore master; private final me.lucko.luckperms.common.storage.Datastore master;
@Override @Override
public void logAction(@NonNull LogEntry entry, Callback<Boolean> callback) { public void logAction(@NonNull LogEntry entry, Callback<Boolean> callback) {
@ -206,7 +206,7 @@ public class DatastoreLink implements Datastore {
@AllArgsConstructor @AllArgsConstructor
public class Sync implements Datastore.Sync { public class Sync implements Datastore.Sync {
private final me.lucko.luckperms.storage.Datastore master; private final me.lucko.luckperms.common.storage.Datastore master;
@Override @Override
public boolean logAction(@NonNull LogEntry entry) { public boolean logAction(@NonNull LogEntry entry) {
@ -319,7 +319,7 @@ public class DatastoreLink implements Datastore {
@AllArgsConstructor @AllArgsConstructor
public class Future implements Datastore.Future { public class Future implements Datastore.Future {
private final me.lucko.luckperms.storage.Datastore master; private final me.lucko.luckperms.common.storage.Datastore master;
@Override @Override
public java.util.concurrent.Future<Boolean> logAction(@NonNull LogEntry entry) { public java.util.concurrent.Future<Boolean> logAction(@NonNull LogEntry entry) {

10
common/src/main/java/me/lucko/luckperms/api/implementation/internal/GroupLink.java → common/src/main/java/me/lucko/luckperms/common/api/internal/GroupLink.java
View File

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.api.implementation.internal; package me.lucko.luckperms.common.api.internal;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -32,22 +32,22 @@ import me.lucko.luckperms.exceptions.ObjectLacksException;
import java.util.List; import java.util.List;
import static me.lucko.luckperms.api.implementation.internal.Utils.*; import static me.lucko.luckperms.common.api.internal.Utils.*;
/** /**
* Provides a link between {@link Group} and {@link me.lucko.luckperms.groups.Group} * Provides a link between {@link Group} and {@link me.lucko.luckperms.common.groups.Group}
*/ */
@EqualsAndHashCode(of = {"name"}, callSuper = false) @EqualsAndHashCode(of = {"name"}, callSuper = false)
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class GroupLink extends PermissionHolderLink implements Group { public class GroupLink extends PermissionHolderLink implements Group {
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.PACKAGE)
private final me.lucko.luckperms.groups.Group master; private final me.lucko.luckperms.common.groups.Group master;
@Getter @Getter
private final String name; private final String name;
public GroupLink(@NonNull me.lucko.luckperms.groups.Group master) { public GroupLink(@NonNull me.lucko.luckperms.common.groups.Group master) {
super(master); super(master);
this.master = master; this.master = master;
this.name = master.getName(); this.name = master.getName();

6
common/src/main/java/me/lucko/luckperms/api/implementation/internal/LPConfigurationLink.java → common/src/main/java/me/lucko/luckperms/common/api/internal/LPConfigurationLink.java
View File

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.api.implementation.internal; package me.lucko.luckperms.common.api.internal;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import me.lucko.luckperms.api.LPConfiguration; import me.lucko.luckperms.api.LPConfiguration;
@ -30,11 +30,11 @@ import me.lucko.luckperms.api.data.MySQLConfiguration;
import java.util.Map; import java.util.Map;
/** /**
* Provides a link between {@link LPConfiguration} and {@link me.lucko.luckperms.config.LPConfiguration} * Provides a link between {@link LPConfiguration} and {@link me.lucko.luckperms.common.config.LPConfiguration}
*/ */
@AllArgsConstructor @AllArgsConstructor
public class LPConfigurationLink implements LPConfiguration { public class LPConfigurationLink implements LPConfiguration {
private final me.lucko.luckperms.config.LPConfiguration master; private final me.lucko.luckperms.common.config.LPConfiguration master;
@Override @Override
public String getServer() { public String getServer() {

8
common/src/main/java/me/lucko/luckperms/api/implementation/internal/LogLink.java → common/src/main/java/me/lucko/luckperms/common/api/internal/LogLink.java
View File

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.api.implementation.internal; package me.lucko.luckperms.common.api.internal;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.NonNull; import lombok.NonNull;
@ -31,14 +31,14 @@ import java.util.SortedMap;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.UUID; import java.util.UUID;
import static me.lucko.luckperms.api.implementation.internal.Utils.checkName; import static me.lucko.luckperms.common.api.internal.Utils.checkName;
/** /**
* Provides a link between {@link Log} and {@link me.lucko.luckperms.data.Log} * Provides a link between {@link Log} and {@link me.lucko.luckperms.common.data.Log}
*/ */
@AllArgsConstructor @AllArgsConstructor
public class LogLink implements Log { public class LogLink implements Log {
private final me.lucko.luckperms.data.Log master; private final me.lucko.luckperms.common.data.Log master;
@Override @Override
public SortedSet<LogEntry> getContent() { public SortedSet<LogEntry> getContent() {

10
common/src/main/java/me/lucko/luckperms/api/implementation/internal/PermissionHolderLink.java → common/src/main/java/me/lucko/luckperms/common/api/internal/PermissionHolderLink.java
View File

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.api.implementation.internal; package me.lucko.luckperms.common.api.internal;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.NonNull; import lombok.NonNull;
@ -30,18 +30,18 @@ import me.lucko.luckperms.exceptions.ObjectLacksException;
import java.util.*; import java.util.*;
import static me.lucko.luckperms.api.implementation.internal.Utils.*; import static me.lucko.luckperms.common.api.internal.Utils.*;
import static me.lucko.luckperms.core.PermissionHolder.exportToLegacy; import static me.lucko.luckperms.common.core.PermissionHolder.exportToLegacy;
/** /**
* Provides a link between {@link PermissionHolder} and {@link me.lucko.luckperms.core.PermissionHolder} * Provides a link between {@link PermissionHolder} and {@link me.lucko.luckperms.common.core.PermissionHolder}
*/ */
@SuppressWarnings("unused") @SuppressWarnings("unused")
@AllArgsConstructor @AllArgsConstructor
public class PermissionHolderLink implements PermissionHolder { public class PermissionHolderLink implements PermissionHolder {
@NonNull @NonNull
private final me.lucko.luckperms.core.PermissionHolder master; private final me.lucko.luckperms.common.core.PermissionHolder master;
@Override @Override
public String getObjectName() { public String getObjectName() {

10
common/src/main/java/me/lucko/luckperms/api/implementation/internal/TrackLink.java → common/src/main/java/me/lucko/luckperms/common/api/internal/TrackLink.java
View File

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.api.implementation.internal; package me.lucko.luckperms.common.api.internal;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -33,22 +33,22 @@ import me.lucko.luckperms.exceptions.ObjectLacksException;
import java.util.List; import java.util.List;
import static me.lucko.luckperms.api.implementation.internal.Utils.checkGroup; import static me.lucko.luckperms.common.api.internal.Utils.checkGroup;
/** /**
* Provides a link between {@link Track} and {@link me.lucko.luckperms.tracks.Track} * Provides a link between {@link Track} and {@link me.lucko.luckperms.common.tracks.Track}
*/ */
@EqualsAndHashCode(of = {"name"}) @EqualsAndHashCode(of = {"name"})
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class TrackLink implements Track { public class TrackLink implements Track {
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.PACKAGE)
private final me.lucko.luckperms.tracks.Track master; private final me.lucko.luckperms.common.tracks.Track master;
@Getter @Getter
private final String name; private final String name;
public TrackLink(@NonNull me.lucko.luckperms.tracks.Track master) { public TrackLink(@NonNull me.lucko.luckperms.common.tracks.Track master) {
this.master = master; this.master = master;
this.name = master.getName(); this.name = master.getName();
} }

10
common/src/main/java/me/lucko/luckperms/api/implementation/internal/UserLink.java → common/src/main/java/me/lucko/luckperms/common/api/internal/UserLink.java
View File

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.api.implementation.internal; package me.lucko.luckperms.common.api.internal;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
@ -33,22 +33,22 @@ import me.lucko.luckperms.exceptions.ObjectLacksException;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import static me.lucko.luckperms.api.implementation.internal.Utils.*; import static me.lucko.luckperms.common.api.internal.Utils.*;
/** /**
* Provides a link between {@link User} and {@link me.lucko.luckperms.users.User} * Provides a link between {@link User} and {@link me.lucko.luckperms.common.users.User}
*/ */
@EqualsAndHashCode(of = {"uuid"}, callSuper = false) @EqualsAndHashCode(of = {"uuid"}, callSuper = false)
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class UserLink extends PermissionHolderLink implements User { public class UserLink extends PermissionHolderLink implements User {
@Getter @Getter
private final me.lucko.luckperms.users.User master; private final me.lucko.luckperms.common.users.User master;
@Getter @Getter
private final UUID uuid; private final UUID uuid;
public UserLink(@NonNull me.lucko.luckperms.users.User master) { public UserLink(@NonNull me.lucko.luckperms.common.users.User master) {
super(master); super(master);
this.master = master; this.master = master;
this.uuid = master.getUuid(); this.uuid = master.getUuid();

4
common/src/main/java/me/lucko/luckperms/api/implementation/internal/Utils.java → common/src/main/java/me/lucko/luckperms/common/api/internal/Utils.java
View File

@ -20,13 +20,13 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.api.implementation.internal; package me.lucko.luckperms.common.api.internal;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import me.lucko.luckperms.api.Group; import me.lucko.luckperms.api.Group;
import me.lucko.luckperms.api.Track; import me.lucko.luckperms.api.Track;
import me.lucko.luckperms.api.User; import me.lucko.luckperms.api.User;
import me.lucko.luckperms.utils.ArgumentChecker; import me.lucko.luckperms.common.utils.ArgumentChecker;
@UtilityClass @UtilityClass
public class Utils { public class Utils {

6
common/src/main/java/me/lucko/luckperms/api/implementation/internal/UuidCacheLink.java → common/src/main/java/me/lucko/luckperms/common/api/internal/UuidCacheLink.java
View File

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.api.implementation.internal; package me.lucko.luckperms.common.api.internal;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import me.lucko.luckperms.api.UuidCache; import me.lucko.luckperms.api.UuidCache;
@ -28,11 +28,11 @@ import me.lucko.luckperms.api.UuidCache;
import java.util.UUID; import java.util.UUID;
/** /**
* Provides a link between {@link UuidCache} and {@link me.lucko.luckperms.core.UuidCache} * Provides a link between {@link UuidCache} and {@link me.lucko.luckperms.common.core.UuidCache}
*/ */
@AllArgsConstructor @AllArgsConstructor
public class UuidCacheLink implements UuidCache { public class UuidCacheLink implements UuidCache {
private final me.lucko.luckperms.core.UuidCache master; private final me.lucko.luckperms.common.core.UuidCache master;
@Override @Override
public UUID getUUID(UUID external) { public UUID getUUID(UUID external) {

2
common/src/main/java/me/lucko/luckperms/caching/MetaData.java → common/src/main/java/me/lucko/luckperms/common/caching/MetaData.java
View File

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.caching; package me.lucko.luckperms.common.caching;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import lombok.Getter; import lombok.Getter;

8
common/src/main/java/me/lucko/luckperms/caching/PermissionData.java → common/src/main/java/me/lucko/luckperms/common/caching/PermissionData.java
View File

@ -20,15 +20,15 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.caching; package me.lucko.luckperms.common.caching;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import lombok.NonNull; import lombok.NonNull;
import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.calculators.CalculatorFactory; import me.lucko.luckperms.common.calculators.CalculatorFactory;
import me.lucko.luckperms.calculators.PermissionCalculator; import me.lucko.luckperms.common.calculators.PermissionCalculator;
import me.lucko.luckperms.users.User; import me.lucko.luckperms.common.users.User;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;

6
common/src/main/java/me/lucko/luckperms/caching/UserData.java → common/src/main/java/me/lucko/luckperms/common/caching/UserData.java
View File

@ -20,12 +20,12 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.caching; package me.lucko.luckperms.common.caching;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.calculators.CalculatorFactory; import me.lucko.luckperms.common.calculators.CalculatorFactory;
import me.lucko.luckperms.users.User; import me.lucko.luckperms.common.users.User;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;

4
common/src/main/java/me/lucko/luckperms/calculators/CalculatorFactory.java → common/src/main/java/me/lucko/luckperms/common/calculators/CalculatorFactory.java
View File

@ -20,10 +20,10 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.calculators; package me.lucko.luckperms.common.calculators;
import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.users.User; import me.lucko.luckperms.common.users.User;
import java.util.Map; import java.util.Map;

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

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.calculators; package me.lucko.luckperms.common.calculators;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

4
common/src/main/java/me/lucko/luckperms/calculators/PermissionCalculator.java → common/src/main/java/me/lucko/luckperms/common/calculators/PermissionCalculator.java
View File

@ -20,11 +20,11 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.calculators; package me.lucko.luckperms.common.calculators;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.common.LuckPermsPlugin;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

2
common/src/main/java/me/lucko/luckperms/calculators/PermissionProcessor.java → common/src/main/java/me/lucko/luckperms/common/calculators/PermissionProcessor.java
View File

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.calculators; package me.lucko.luckperms.common.calculators;
import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.Tristate;

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

@ -20,12 +20,12 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.calculators; package me.lucko.luckperms.common.calculators;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.constants.Patterns; import me.lucko.luckperms.common.constants.Patterns;
import java.util.Map; import java.util.Map;
import java.util.regex.Pattern; import java.util.regex.Pattern;

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

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.calculators; package me.lucko.luckperms.common.calculators;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

2
common/src/main/java/me/lucko/luckperms/commands/Arg.java → common/src/main/java/me/lucko/luckperms/common/commands/Arg.java
View File

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands; package me.lucko.luckperms.common.commands;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import lombok.AccessLevel; import lombok.AccessLevel;

30
common/src/main/java/me/lucko/luckperms/commands/CommandManager.java → common/src/main/java/me/lucko/luckperms/common/commands/CommandManager.java
View File

@ -20,26 +20,26 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands; package me.lucko.luckperms.common.commands;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.data.Callback; import me.lucko.luckperms.api.data.Callback;
import me.lucko.luckperms.commands.group.CreateGroup; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.group.DeleteGroup; import me.lucko.luckperms.common.commands.group.CreateGroup;
import me.lucko.luckperms.commands.group.GroupMainCommand; import me.lucko.luckperms.common.commands.group.DeleteGroup;
import me.lucko.luckperms.commands.group.ListGroups; import me.lucko.luckperms.common.commands.group.GroupMainCommand;
import me.lucko.luckperms.commands.log.LogMainCommand; import me.lucko.luckperms.common.commands.group.ListGroups;
import me.lucko.luckperms.commands.migration.MigrationMainCommand; import me.lucko.luckperms.common.commands.log.LogMainCommand;
import me.lucko.luckperms.commands.misc.*; import me.lucko.luckperms.common.commands.migration.MigrationMainCommand;
import me.lucko.luckperms.commands.track.CreateTrack; import me.lucko.luckperms.common.commands.misc.*;
import me.lucko.luckperms.commands.track.DeleteTrack; import me.lucko.luckperms.common.commands.track.CreateTrack;
import me.lucko.luckperms.commands.track.ListTracks; import me.lucko.luckperms.common.commands.track.DeleteTrack;
import me.lucko.luckperms.commands.track.TrackMainCommand; import me.lucko.luckperms.common.commands.track.ListTracks;
import me.lucko.luckperms.commands.user.UserMainCommand; import me.lucko.luckperms.common.commands.track.TrackMainCommand;
import me.lucko.luckperms.commands.usersbulkedit.UsersBulkEditMainCommand; import me.lucko.luckperms.common.commands.user.UserMainCommand;
import me.lucko.luckperms.common.commands.usersbulkedit.UsersBulkEditMainCommand;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

2
common/src/main/java/me/lucko/luckperms/commands/CommandResult.java → common/src/main/java/me/lucko/luckperms/common/commands/CommandResult.java
View File

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

2
common/src/main/java/me/lucko/luckperms/commands/ConsecutiveExecutor.java → common/src/main/java/me/lucko/luckperms/common/commands/ConsecutiveExecutor.java
View File

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands; package me.lucko.luckperms.common.commands;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

6
common/src/main/java/me/lucko/luckperms/commands/MainCommand.java → common/src/main/java/me/lucko/luckperms/common/commands/MainCommand.java
View File

@ -20,13 +20,13 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands; package me.lucko.luckperms.common.commands;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

2
common/src/main/java/me/lucko/luckperms/commands/Predicate.java → common/src/main/java/me/lucko/luckperms/common/commands/Predicate.java
View File

@ -20,7 +20,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands; package me.lucko.luckperms.common.commands;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;

6
common/src/main/java/me/lucko/luckperms/commands/Sender.java → common/src/main/java/me/lucko/luckperms/common/commands/Sender.java
View File

@ -20,10 +20,10 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands; package me.lucko.luckperms.common.commands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import java.util.UUID; import java.util.UUID;

8
common/src/main/java/me/lucko/luckperms/commands/SenderFactory.java → common/src/main/java/me/lucko/luckperms/common/commands/SenderFactory.java
View File

@ -20,14 +20,14 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands; package me.lucko.luckperms.common.commands;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.constants.Constants; import me.lucko.luckperms.common.constants.Constants;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.*; import java.util.*;

6
common/src/main/java/me/lucko/luckperms/commands/SingleMainCommand.java → common/src/main/java/me/lucko/luckperms/common/commands/SingleMainCommand.java
View File

@ -20,10 +20,10 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands; package me.lucko.luckperms.common.commands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;

14
common/src/main/java/me/lucko/luckperms/commands/SubCommand.java → common/src/main/java/me/lucko/luckperms/common/commands/SubCommand.java
View File

@ -20,17 +20,17 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands; package me.lucko.luckperms.common.commands;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.groups.Group; import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.tracks.Track; import me.lucko.luckperms.common.tracks.Track;
import me.lucko.luckperms.users.User; import me.lucko.luckperms.common.users.User;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;

8
common/src/main/java/me/lucko/luckperms/commands/Util.java → common/src/main/java/me/lucko/luckperms/common/commands/Util.java
View File

@ -20,15 +20,15 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands; package me.lucko.luckperms.common.commands;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import me.lucko.luckperms.api.LocalizedNode; import me.lucko.luckperms.api.LocalizedNode;
import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Patterns; import me.lucko.luckperms.common.constants.Patterns;
import me.lucko.luckperms.utils.DateUtil; import me.lucko.luckperms.common.utils.DateUtil;
import java.util.*; import java.util.*;

18
common/src/main/java/me/lucko/luckperms/commands/group/CreateGroup.java → common/src/main/java/me/lucko/luckperms/common/commands/group/CreateGroup.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group; package me.lucko.luckperms.common.commands.group;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.CommandResult; import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.commands.SingleMainCommand; import me.lucko.luckperms.common.commands.SingleMainCommand;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.utils.ArgumentChecker; import me.lucko.luckperms.common.utils.ArgumentChecker;
import java.util.List; import java.util.List;

18
common/src/main/java/me/lucko/luckperms/commands/group/DeleteGroup.java → common/src/main/java/me/lucko/luckperms/common/commands/group/DeleteGroup.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group; package me.lucko.luckperms.common.commands.group;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.CommandResult; import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.commands.SingleMainCommand; import me.lucko.luckperms.common.commands.SingleMainCommand;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.groups.Group; import me.lucko.luckperms.common.groups.Group;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

18
common/src/main/java/me/lucko/luckperms/commands/group/GroupMainCommand.java → common/src/main/java/me/lucko/luckperms/common/commands/group/GroupMainCommand.java
View File

@ -20,17 +20,17 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group; package me.lucko.luckperms.common.commands.group;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.MainCommand; import me.lucko.luckperms.common.commands.MainCommand;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.commands.SubCommand; import me.lucko.luckperms.common.commands.SubCommand;
import me.lucko.luckperms.commands.group.subcommands.*; import me.lucko.luckperms.common.commands.group.subcommands.*;
import me.lucko.luckperms.commands.meta.MetaCommands; import me.lucko.luckperms.common.commands.meta.MetaCommands;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.groups.Group; import me.lucko.luckperms.common.groups.Group;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

18
common/src/main/java/me/lucko/luckperms/commands/group/ListGroups.java → common/src/main/java/me/lucko/luckperms/common/commands/group/ListGroups.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group; package me.lucko.luckperms.common.commands.group;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.CommandResult; import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.commands.SingleMainCommand; import me.lucko.luckperms.common.commands.SingleMainCommand;
import me.lucko.luckperms.commands.Util; import me.lucko.luckperms.common.commands.Util;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.groups.Group; import me.lucko.luckperms.common.groups.Group;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

16
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupBulkChange.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupBulkChange.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.exceptions.ObjectLacksException; import me.lucko.luckperms.exceptions.ObjectLacksException;
import me.lucko.luckperms.groups.Group;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
@ -74,7 +74,7 @@ public class GroupBulkChange extends SubCommand<Group> {
} }
toRemove.add(element); toRemove.add(element);
toAdd.add(me.lucko.luckperms.core.Node.builderFromExisting(element).setWorld(to).build()); toAdd.add(me.lucko.luckperms.common.core.Node.builderFromExisting(element).setWorld(to).build());
} }
} else { } else {
while (iterator.hasNext()) { while (iterator.hasNext()) {
@ -85,7 +85,7 @@ public class GroupBulkChange extends SubCommand<Group> {
} }
toRemove.add(element); toRemove.add(element);
toAdd.add(me.lucko.luckperms.core.Node.builderFromExisting(element).setServer(to).build()); toAdd.add(me.lucko.luckperms.common.core.Node.builderFromExisting(element).setServer(to).build());
} }
} }

16
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupClear.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupClear.java
View File

@ -20,15 +20,15 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.groups.Group; import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.utils.ArgumentChecker; import me.lucko.luckperms.common.utils.ArgumentChecker;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;

16
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupClone.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupClone.java
View File

@ -20,15 +20,15 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.groups.Group; import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.utils.ArgumentChecker; import me.lucko.luckperms.common.utils.ArgumentChecker;
import java.util.List; import java.util.List;

16
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupHasPerm.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupHasPerm.java
View File

@ -20,15 +20,15 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.core.Node; import me.lucko.luckperms.common.core.Node;
import me.lucko.luckperms.groups.Group; import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.utils.ArgumentChecker; import me.lucko.luckperms.common.utils.ArgumentChecker;
import java.util.List; import java.util.List;

18
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInfo.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupInfo.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.CommandResult; import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.commands.Predicate; import me.lucko.luckperms.common.commands.Predicate;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.commands.SubCommand; import me.lucko.luckperms.common.commands.SubCommand;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.groups.Group; import me.lucko.luckperms.common.groups.Group;
import java.util.List; import java.util.List;

18
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInheritsPerm.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupInheritsPerm.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.core.InheritanceInfo; import me.lucko.luckperms.common.core.InheritanceInfo;
import me.lucko.luckperms.core.Node; import me.lucko.luckperms.common.core.Node;
import me.lucko.luckperms.groups.Group; import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.utils.ArgumentChecker; import me.lucko.luckperms.common.utils.ArgumentChecker;
import java.util.List; import java.util.List;

12
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListNodes.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupListNodes.java
View File

@ -20,13 +20,13 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.groups.Group; import me.lucko.luckperms.common.groups.Group;
import java.util.List; import java.util.List;

12
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListParents.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupListParents.java
View File

@ -20,13 +20,13 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.groups.Group; import me.lucko.luckperms.common.groups.Group;
import java.util.List; import java.util.List;

16
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRename.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupRename.java
View File

@ -20,15 +20,15 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.groups.Group; import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.utils.ArgumentChecker; import me.lucko.luckperms.common.utils.ArgumentChecker;
import java.util.List; import java.util.List;

16
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetInherit.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetInherit.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.groups.Group;
import me.lucko.luckperms.utils.ArgumentChecker;
import java.util.List; import java.util.List;

16
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetPermission.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetPermission.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.groups.Group;
import me.lucko.luckperms.utils.ArgumentChecker;
import java.util.List; import java.util.List;

18
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempInherit.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetTempInherit.java
View File

@ -20,17 +20,17 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.common.utils.DateUtil;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.groups.Group;
import me.lucko.luckperms.utils.ArgumentChecker;
import me.lucko.luckperms.utils.DateUtil;
import java.util.List; import java.util.List;

18
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempPermission.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetTempPermission.java
View File

@ -20,17 +20,17 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.common.utils.DateUtil;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.groups.Group;
import me.lucko.luckperms.utils.ArgumentChecker;
import me.lucko.luckperms.utils.DateUtil;
import java.util.List; import java.util.List;

14
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupShowTracks.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupShowTracks.java
View File

@ -20,14 +20,14 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.groups.Group; import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.tracks.Track; import me.lucko.luckperms.common.tracks.Track;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;

16
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnSetPermission.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnSetPermission.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.exceptions.ObjectLacksException; import me.lucko.luckperms.exceptions.ObjectLacksException;
import me.lucko.luckperms.groups.Group;
import me.lucko.luckperms.utils.ArgumentChecker;
import java.util.List; import java.util.List;

16
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetInherit.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnsetInherit.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.exceptions.ObjectLacksException; import me.lucko.luckperms.exceptions.ObjectLacksException;
import me.lucko.luckperms.groups.Group;
import me.lucko.luckperms.utils.ArgumentChecker;
import java.util.List; import java.util.List;

16
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempInherit.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnsetTempInherit.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.exceptions.ObjectLacksException; import me.lucko.luckperms.exceptions.ObjectLacksException;
import me.lucko.luckperms.groups.Group;
import me.lucko.luckperms.utils.ArgumentChecker;
import java.util.List; import java.util.List;

16
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempPermission.java → common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnsetTempPermission.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.group.subcommands; package me.lucko.luckperms.common.commands.group.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.exceptions.ObjectLacksException; import me.lucko.luckperms.exceptions.ObjectLacksException;
import me.lucko.luckperms.groups.Group;
import me.lucko.luckperms.utils.ArgumentChecker;
import java.util.List; import java.util.List;

16
common/src/main/java/me/lucko/luckperms/commands/log/LogMainCommand.java → common/src/main/java/me/lucko/luckperms/common/commands/log/LogMainCommand.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.log; package me.lucko.luckperms.common.commands.log;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.MainCommand; import me.lucko.luckperms.common.commands.MainCommand;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.commands.SubCommand; import me.lucko.luckperms.common.commands.SubCommand;
import me.lucko.luckperms.commands.log.subcommands.*; import me.lucko.luckperms.common.commands.log.subcommands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.data.Log; import me.lucko.luckperms.common.data.Log;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;

12
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogExport.java → common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogExport.java
View File

@ -20,14 +20,14 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.log.subcommands; package me.lucko.luckperms.common.commands.log.subcommands;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.LogEntry; import me.lucko.luckperms.api.LogEntry;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.data.Log; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.data.Log;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

16
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogGroupHistory.java → common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogGroupHistory.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.log.subcommands; package me.lucko.luckperms.common.commands.log.subcommands;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.LogEntry; import me.lucko.luckperms.api.LogEntry;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.data.Log; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.utils.ArgumentChecker; import me.lucko.luckperms.common.data.Log;
import me.lucko.luckperms.utils.DateUtil; import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.common.utils.DateUtil;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

12
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogNotify.java → common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogNotify.java
View File

@ -20,13 +20,13 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.log.subcommands; package me.lucko.luckperms.common.commands.log.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.Log; import me.lucko.luckperms.common.data.Log;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;

16
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogRecent.java → common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogRecent.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.log.subcommands; package me.lucko.luckperms.common.commands.log.subcommands;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.LogEntry; import me.lucko.luckperms.api.LogEntry;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Patterns; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Patterns;
import me.lucko.luckperms.data.Log; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.utils.DateUtil; import me.lucko.luckperms.common.data.Log;
import me.lucko.luckperms.common.utils.DateUtil;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

14
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogSearch.java → common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogSearch.java
View File

@ -20,15 +20,15 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.log.subcommands; package me.lucko.luckperms.common.commands.log.subcommands;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.LogEntry; import me.lucko.luckperms.api.LogEntry;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.data.Log; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.utils.DateUtil; import me.lucko.luckperms.common.data.Log;
import me.lucko.luckperms.common.utils.DateUtil;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

16
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogTrackHistory.java → common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogTrackHistory.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.log.subcommands; package me.lucko.luckperms.common.commands.log.subcommands;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.LogEntry; import me.lucko.luckperms.api.LogEntry;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.data.Log; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.utils.ArgumentChecker; import me.lucko.luckperms.common.data.Log;
import me.lucko.luckperms.utils.DateUtil; import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.common.utils.DateUtil;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

16
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogUserHistory.java → common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogUserHistory.java
View File

@ -20,16 +20,16 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.log.subcommands; package me.lucko.luckperms.common.commands.log.subcommands;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.LogEntry; import me.lucko.luckperms.api.LogEntry;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.constants.Patterns; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Patterns;
import me.lucko.luckperms.data.Log; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.utils.DateUtil; import me.lucko.luckperms.common.data.Log;
import me.lucko.luckperms.common.utils.DateUtil;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

14
common/src/main/java/me/lucko/luckperms/commands/meta/MetaCommands.java → common/src/main/java/me/lucko/luckperms/common/commands/meta/MetaCommands.java
View File

@ -20,16 +20,14 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.meta; package me.lucko.luckperms.common.commands.meta;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import lombok.RequiredArgsConstructor; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.commands.*;
import me.lucko.luckperms.commands.*; import me.lucko.luckperms.common.commands.meta.subcommands.*;
import me.lucko.luckperms.commands.meta.subcommands.*; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.core.PermissionHolder;
import me.lucko.luckperms.core.PermissionHolder;
import me.lucko.luckperms.users.User;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

22
common/src/main/java/me/lucko/luckperms/commands/meta/MetaSubCommand.java → common/src/main/java/me/lucko/luckperms/common/commands/meta/MetaSubCommand.java
View File

@ -20,21 +20,21 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.meta; package me.lucko.luckperms.common.commands.meta;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.Arg; import me.lucko.luckperms.common.commands.Arg;
import me.lucko.luckperms.commands.CommandResult; import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.commands.Util; import me.lucko.luckperms.common.commands.Util;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.core.PermissionHolder; import me.lucko.luckperms.common.core.PermissionHolder;
import me.lucko.luckperms.groups.Group; import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.users.User; import me.lucko.luckperms.common.users.User;
import java.util.List; import java.util.List;
import java.util.function.Predicate; import java.util.function.Predicate;

24
common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddPrefix.java → common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddPrefix.java
View File

@ -20,20 +20,20 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.meta.subcommands; package me.lucko.luckperms.common.commands.meta.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.Arg; import me.lucko.luckperms.common.commands.Arg;
import me.lucko.luckperms.commands.CommandResult; import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.commands.Predicate; import me.lucko.luckperms.common.commands.Predicate;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.commands.meta.MetaSubCommand; import me.lucko.luckperms.common.commands.meta.MetaSubCommand;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.core.PermissionHolder; import me.lucko.luckperms.common.core.PermissionHolder;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.utils.ArgumentChecker;
import java.util.List; import java.util.List;

24
common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddSuffix.java → common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddSuffix.java
View File

@ -20,20 +20,20 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.meta.subcommands; package me.lucko.luckperms.common.commands.meta.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.Arg; import me.lucko.luckperms.common.commands.Arg;
import me.lucko.luckperms.commands.CommandResult; import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.commands.Predicate; import me.lucko.luckperms.common.commands.Predicate;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.commands.meta.MetaSubCommand; import me.lucko.luckperms.common.commands.meta.MetaSubCommand;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.core.PermissionHolder; import me.lucko.luckperms.common.core.PermissionHolder;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.utils.ArgumentChecker;
import java.util.List; import java.util.List;

26
common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddTempPrefix.java → common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddTempPrefix.java
View File

@ -20,21 +20,21 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.meta.subcommands; package me.lucko.luckperms.common.commands.meta.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.Arg; import me.lucko.luckperms.common.commands.Arg;
import me.lucko.luckperms.commands.CommandResult; import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.commands.Predicate; import me.lucko.luckperms.common.commands.Predicate;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.commands.meta.MetaSubCommand; import me.lucko.luckperms.common.commands.meta.MetaSubCommand;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.core.PermissionHolder; import me.lucko.luckperms.common.core.PermissionHolder;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.common.utils.DateUtil;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.utils.ArgumentChecker;
import me.lucko.luckperms.utils.DateUtil;
import java.util.List; import java.util.List;

26
common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddTempSuffix.java → common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddTempSuffix.java
View File

@ -20,21 +20,21 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.meta.subcommands; package me.lucko.luckperms.common.commands.meta.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.Arg; import me.lucko.luckperms.common.commands.Arg;
import me.lucko.luckperms.commands.CommandResult; import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.commands.Predicate; import me.lucko.luckperms.common.commands.Predicate;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.commands.meta.MetaSubCommand; import me.lucko.luckperms.common.commands.meta.MetaSubCommand;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.core.PermissionHolder; import me.lucko.luckperms.common.core.PermissionHolder;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.common.utils.DateUtil;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.utils.ArgumentChecker;
import me.lucko.luckperms.utils.DateUtil;
import java.util.List; import java.util.List;

24
common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaClear.java → common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaClear.java
View File

@ -20,19 +20,19 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.meta.subcommands; package me.lucko.luckperms.common.commands.meta.subcommands;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.Arg; import me.lucko.luckperms.common.commands.Arg;
import me.lucko.luckperms.commands.CommandResult; import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.commands.Predicate; import me.lucko.luckperms.common.commands.Predicate;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.commands.meta.MetaSubCommand; import me.lucko.luckperms.common.commands.meta.MetaSubCommand;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.core.PermissionHolder; import me.lucko.luckperms.common.core.PermissionHolder;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.utils.ArgumentChecker; import me.lucko.luckperms.common.utils.ArgumentChecker;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;

20
common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaInfo.java → common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaInfo.java
View File

@ -20,19 +20,19 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.meta.subcommands; package me.lucko.luckperms.common.commands.meta.subcommands;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.commands.CommandResult; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.Predicate; import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Predicate;
import me.lucko.luckperms.commands.Util; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.commands.meta.MetaSubCommand; import me.lucko.luckperms.common.commands.Util;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.commands.meta.MetaSubCommand;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.core.PermissionHolder; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.core.PermissionHolder;
import java.util.*; import java.util.*;

24
common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemovePrefix.java → common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemovePrefix.java
View File

@ -20,21 +20,21 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.meta.subcommands; package me.lucko.luckperms.common.commands.meta.subcommands;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.commands.Arg; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.CommandResult; import me.lucko.luckperms.common.commands.Arg;
import me.lucko.luckperms.commands.Predicate; import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Predicate;
import me.lucko.luckperms.commands.meta.MetaSubCommand; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.commands.meta.MetaSubCommand;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.core.PermissionHolder; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.core.PermissionHolder;
import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.exceptions.ObjectLacksException; import me.lucko.luckperms.exceptions.ObjectLacksException;
import me.lucko.luckperms.utils.ArgumentChecker;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

24
common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemoveSuffix.java → common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemoveSuffix.java
View File

@ -20,21 +20,21 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.meta.subcommands; package me.lucko.luckperms.common.commands.meta.subcommands;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.commands.Arg; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.CommandResult; import me.lucko.luckperms.common.commands.Arg;
import me.lucko.luckperms.commands.Predicate; import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Predicate;
import me.lucko.luckperms.commands.meta.MetaSubCommand; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.commands.meta.MetaSubCommand;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.core.PermissionHolder; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.core.PermissionHolder;
import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.exceptions.ObjectLacksException; import me.lucko.luckperms.exceptions.ObjectLacksException;
import me.lucko.luckperms.utils.ArgumentChecker;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

24
common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemoveTempPrefix.java → common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemoveTempPrefix.java
View File

@ -20,21 +20,21 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.meta.subcommands; package me.lucko.luckperms.common.commands.meta.subcommands;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.commands.Arg; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.CommandResult; import me.lucko.luckperms.common.commands.Arg;
import me.lucko.luckperms.commands.Predicate; import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Predicate;
import me.lucko.luckperms.commands.meta.MetaSubCommand; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.commands.meta.MetaSubCommand;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.core.PermissionHolder; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.core.PermissionHolder;
import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.exceptions.ObjectLacksException; import me.lucko.luckperms.exceptions.ObjectLacksException;
import me.lucko.luckperms.utils.ArgumentChecker;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

24
common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemoveTempSuffix.java → common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemoveTempSuffix.java
View File

@ -20,21 +20,21 @@
* SOFTWARE. * SOFTWARE.
*/ */
package me.lucko.luckperms.commands.meta.subcommands; package me.lucko.luckperms.common.commands.meta.subcommands;
import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.commands.Arg; import me.lucko.luckperms.common.LuckPermsPlugin;
import me.lucko.luckperms.commands.CommandResult; import me.lucko.luckperms.common.commands.Arg;
import me.lucko.luckperms.commands.Predicate; import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.commands.Sender; import me.lucko.luckperms.common.commands.Predicate;
import me.lucko.luckperms.commands.meta.MetaSubCommand; import me.lucko.luckperms.common.commands.Sender;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.common.commands.meta.MetaSubCommand;
import me.lucko.luckperms.constants.Permission; import me.lucko.luckperms.common.constants.Message;
import me.lucko.luckperms.core.PermissionHolder; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.data.LogEntry; import me.lucko.luckperms.common.core.PermissionHolder;
import me.lucko.luckperms.common.data.LogEntry;
import me.lucko.luckperms.common.utils.ArgumentChecker;
import me.lucko.luckperms.exceptions.ObjectLacksException; import me.lucko.luckperms.exceptions.ObjectLacksException;
import me.lucko.luckperms.utils.ArgumentChecker;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

Some files were not shown because too many files have changed in this diff Show More