diff --git a/bukkit/src/main/java/me/lucko/luckperms/BukkitCalculatorFactory.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCalculatorFactory.java similarity index 87% rename from bukkit/src/main/java/me/lucko/luckperms/BukkitCalculatorFactory.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCalculatorFactory.java index 442d19e1..4ec3623e 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/BukkitCalculatorFactory.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCalculatorFactory.java @@ -20,14 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.bukkit; import lombok.AllArgsConstructor; import me.lucko.luckperms.api.Contexts; -import me.lucko.luckperms.calculators.*; -import me.lucko.luckperms.inject.Injector; -import me.lucko.luckperms.inject.LPPermissible; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.bukkit.calculators.AttachmentProcessor; +import me.lucko.luckperms.bukkit.calculators.DefaultsProcessor; +import me.lucko.luckperms.bukkit.inject.Injector; +import me.lucko.luckperms.bukkit.inject.LPPermissible; +import me.lucko.luckperms.common.calculators.*; +import me.lucko.luckperms.common.users.User; import java.util.ArrayList; import java.util.List; diff --git a/bukkit/src/main/java/me/lucko/luckperms/BukkitCommand.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommand.java similarity index 90% rename from bukkit/src/main/java/me/lucko/luckperms/BukkitCommand.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommand.java index 5ed11d13..9ed58111 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/BukkitCommand.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommand.java @@ -20,14 +20,15 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.bukkit; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import me.lucko.luckperms.api.data.Callback; -import me.lucko.luckperms.commands.CommandManager; -import me.lucko.luckperms.commands.Util; -import me.lucko.luckperms.constants.Patterns; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandManager; +import me.lucko.luckperms.common.commands.Util; +import me.lucko.luckperms.common.constants.Patterns; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/bukkit/src/main/java/me/lucko/luckperms/BukkitConfig.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitConfig.java similarity index 96% rename from bukkit/src/main/java/me/lucko/luckperms/BukkitConfig.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitConfig.java index c926c625..fbe89526 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/BukkitConfig.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitConfig.java @@ -20,9 +20,9 @@ * 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.file.YamlConfiguration; diff --git a/bukkit/src/main/java/me/lucko/luckperms/BukkitListener.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitListener.java similarity index 94% rename from bukkit/src/main/java/me/lucko/luckperms/BukkitListener.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitListener.java index a2d01de8..21f9e5ba 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/BukkitListener.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitListener.java @@ -20,13 +20,13 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.bukkit; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.inject.Injector; -import me.lucko.luckperms.inject.LPPermissible; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.AbstractListener; +import me.lucko.luckperms.bukkit.inject.Injector; +import me.lucko.luckperms.bukkit.inject.LPPermissible; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.utils.AbstractListener; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/bukkit/src/main/java/me/lucko/luckperms/BukkitSenderFactory.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java similarity index 92% rename from bukkit/src/main/java/me/lucko/luckperms/BukkitSenderFactory.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java index a2292949..6ddb9cd9 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/BukkitSenderFactory.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java @@ -20,10 +20,11 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.bukkit; -import me.lucko.luckperms.commands.SenderFactory; -import me.lucko.luckperms.constants.Constants; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.SenderFactory; +import me.lucko.luckperms.common.constants.Constants; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/me/lucko/luckperms/LPBukkitPlugin.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java similarity index 88% rename from bukkit/src/main/java/me/lucko/luckperms/LPBukkitPlugin.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java index c3da67d1..e2c4144e 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/LPBukkitPlugin.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java @@ -20,34 +20,36 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.bukkit; import lombok.Getter; +import me.lucko.luckperms.ApiHandler; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Logger; import me.lucko.luckperms.api.LuckPermsApi; import me.lucko.luckperms.api.PlatformType; -import me.lucko.luckperms.api.implementation.ApiProvider; -import me.lucko.luckperms.api.vault.VaultHook; -import me.lucko.luckperms.calculators.CalculatorFactory; -import me.lucko.luckperms.calculators.DefaultsProvider; -import me.lucko.luckperms.commands.ConsecutiveExecutor; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.config.LPConfiguration; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.contexts.ContextManager; -import me.lucko.luckperms.contexts.ServerCalculator; -import me.lucko.luckperms.core.UuidCache; -import me.lucko.luckperms.data.Importer; -import me.lucko.luckperms.groups.GroupManager; -import me.lucko.luckperms.runnables.ExpireTemporaryTask; -import me.lucko.luckperms.runnables.UpdateTask; -import me.lucko.luckperms.storage.Datastore; -import me.lucko.luckperms.storage.StorageFactory; -import me.lucko.luckperms.tracks.TrackManager; -import me.lucko.luckperms.users.UserManager; -import me.lucko.luckperms.utils.LocaleManager; -import me.lucko.luckperms.utils.LogFactory; +import me.lucko.luckperms.bukkit.calculators.DefaultsProvider; +import me.lucko.luckperms.bukkit.vault.VaultHook; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.api.ApiProvider; +import me.lucko.luckperms.common.calculators.CalculatorFactory; +import me.lucko.luckperms.common.commands.ConsecutiveExecutor; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.config.LPConfiguration; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.contexts.ContextManager; +import me.lucko.luckperms.common.contexts.ServerCalculator; +import me.lucko.luckperms.common.core.UuidCache; +import me.lucko.luckperms.common.data.Importer; +import me.lucko.luckperms.common.groups.GroupManager; +import me.lucko.luckperms.common.runnables.ExpireTemporaryTask; +import me.lucko.luckperms.common.runnables.UpdateTask; +import me.lucko.luckperms.common.storage.Datastore; +import me.lucko.luckperms.common.storage.StorageFactory; +import me.lucko.luckperms.common.tracks.TrackManager; +import me.lucko.luckperms.common.users.UserManager; +import me.lucko.luckperms.common.utils.LocaleManager; +import me.lucko.luckperms.common.utils.LogFactory; import org.bukkit.World; import org.bukkit.command.PluginCommand; import org.bukkit.entity.Player; @@ -160,7 +162,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin { getLog().info("Registering API..."); apiProvider = new ApiProvider(this); - LuckPerms.registerProvider(apiProvider); + ApiHandler.registerProvider(apiProvider); getServer().getServicesManager().register(LuckPermsApi.class, apiProvider, this, ServicePriority.Normal); // Run update task to refresh any online users @@ -185,7 +187,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin { datastore.shutdown(); getLog().info("Unregistering API..."); - LuckPerms.unregisterProvider(); + ApiHandler.unregisterProvider(); getServer().getServicesManager().unregisterAll(this); if (vaultHook != null) { @@ -236,8 +238,8 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin { @Override public List getNotifyListeners() { return getServer().getOnlinePlayers().stream() - .map(p -> BukkitSenderFactory.get(this).wrap(p, Collections.singleton(me.lucko.luckperms.constants.Permission.LOG_NOTIFY))) - .filter(me.lucko.luckperms.constants.Permission.LOG_NOTIFY::isAuthorized) + .map(p -> BukkitSenderFactory.get(this).wrap(p, Collections.singleton(me.lucko.luckperms.common.constants.Permission.LOG_NOTIFY))) + .filter(me.lucko.luckperms.common.constants.Permission.LOG_NOTIFY::isAuthorized) .collect(Collectors.toList()); } @@ -346,7 +348,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin { Map> wildcards = new HashMap<>(); List 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)); if (p.getGroup() != null) { if (!wildcards.containsKey(p.getGroup())) { diff --git a/bukkit/src/main/java/me/lucko/luckperms/WorldCalculator.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/WorldCalculator.java similarity index 97% rename from bukkit/src/main/java/me/lucko/luckperms/WorldCalculator.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/WorldCalculator.java index 65dc4fc0..12e7c06e 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/WorldCalculator.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/WorldCalculator.java @@ -20,13 +20,13 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.bukkit; import com.google.common.collect.Maps; import lombok.Getter; import lombok.RequiredArgsConstructor; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.context.ContextCalculator; +import me.lucko.luckperms.common.LuckPermsPlugin; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/bukkit/src/main/java/me/lucko/luckperms/calculators/AttachmentProcessor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/AttachmentProcessor.java similarity index 94% rename from bukkit/src/main/java/me/lucko/luckperms/calculators/AttachmentProcessor.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/AttachmentProcessor.java index 4c96ebfb..281b0ebd 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/calculators/AttachmentProcessor.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/AttachmentProcessor.java @@ -20,11 +20,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.calculators; +package me.lucko.luckperms.bukkit.calculators; import lombok.AllArgsConstructor; import lombok.Getter; import me.lucko.luckperms.api.Tristate; +import me.lucko.luckperms.common.calculators.PermissionProcessor; import org.bukkit.permissions.PermissionAttachmentInfo; import java.util.Map; diff --git a/bukkit/src/main/java/me/lucko/luckperms/calculators/DefaultsProcessor.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/DefaultsProcessor.java similarity index 94% rename from bukkit/src/main/java/me/lucko/luckperms/calculators/DefaultsProcessor.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/DefaultsProcessor.java index a5fe3db9..ef4f2e72 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/calculators/DefaultsProcessor.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/DefaultsProcessor.java @@ -20,15 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.calculators; +package me.lucko.luckperms.bukkit.calculators; import lombok.AllArgsConstructor; import me.lucko.luckperms.api.Tristate; +import me.lucko.luckperms.common.calculators.PermissionProcessor; import org.bukkit.Bukkit; import org.bukkit.permissions.Permission; -import java.util.function.Supplier; - @AllArgsConstructor public class DefaultsProcessor implements PermissionProcessor { private final boolean isOp; diff --git a/bukkit/src/main/java/me/lucko/luckperms/calculators/DefaultsProvider.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/DefaultsProvider.java similarity index 99% rename from bukkit/src/main/java/me/lucko/luckperms/calculators/DefaultsProvider.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/DefaultsProvider.java index 5eb49e37..18822270 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/calculators/DefaultsProvider.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/calculators/DefaultsProvider.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.calculators; +package me.lucko.luckperms.bukkit.calculators; import lombok.AllArgsConstructor; import me.lucko.luckperms.api.Tristate; diff --git a/bukkit/src/main/java/me/lucko/luckperms/inject/DummyPermissibleBase.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/DummyPermissibleBase.java similarity index 98% rename from bukkit/src/main/java/me/lucko/luckperms/inject/DummyPermissibleBase.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/DummyPermissibleBase.java index a1a1c99e..d97ff549 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/inject/DummyPermissibleBase.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/DummyPermissibleBase.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.inject; +package me.lucko.luckperms.bukkit.inject; import org.bukkit.permissions.PermissibleBase; import org.bukkit.permissions.Permission; diff --git a/bukkit/src/main/java/me/lucko/luckperms/inject/Injector.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/Injector.java similarity index 98% rename from bukkit/src/main/java/me/lucko/luckperms/inject/Injector.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/Injector.java index b3071ce0..50b5941e 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/inject/Injector.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/Injector.java @@ -20,11 +20,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.inject; +package me.lucko.luckperms.bukkit.inject; import lombok.experimental.UtilityClass; import org.bukkit.Bukkit; -import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.permissions.Permissible; diff --git a/bukkit/src/main/java/me/lucko/luckperms/inject/LPPermissible.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/LPPermissible.java similarity index 98% rename from bukkit/src/main/java/me/lucko/luckperms/inject/LPPermissible.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/LPPermissible.java index 979c5095..50905abf 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/inject/LPPermissible.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/LPPermissible.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.inject; +package me.lucko.luckperms.bukkit.inject; import lombok.Getter; import lombok.NonNull; -import me.lucko.luckperms.LPBukkitPlugin; import me.lucko.luckperms.api.Contexts; 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.entity.Player; import org.bukkit.permissions.*; diff --git a/bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultChatHook.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultChatHook.java similarity index 95% rename from bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultChatHook.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultChatHook.java index b3ff9e06..64a9c278 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultChatHook.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultChatHook.java @@ -20,17 +20,18 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.vault; +package me.lucko.luckperms.bukkit.vault; import lombok.NonNull; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Node; -import me.lucko.luckperms.caching.MetaData; -import me.lucko.luckperms.core.PermissionHolder; +import me.lucko.luckperms.common.caching.MetaData; +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.ObjectLacksException; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.users.User; import net.milkbowl.vault.chat.Chat; import java.util.HashMap; @@ -38,8 +39,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static me.lucko.luckperms.utils.ArgumentChecker.escapeCharacters; -import static me.lucko.luckperms.utils.ArgumentChecker.unescapeCharacters; +import static me.lucko.luckperms.common.utils.ArgumentChecker.escapeCharacters; +import static me.lucko.luckperms.common.utils.ArgumentChecker.unescapeCharacters; /** * 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 * * 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 { private final VaultPermissionHook perms; @@ -94,7 +95,7 @@ public class VaultChatHook extends Chat { } 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")) { 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.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); if (!perms.getServer().equalsIgnoreCase("global")) { node.setServer(perms.getServer()); diff --git a/bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultHook.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultHook.java similarity index 96% rename from bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultHook.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultHook.java index 3bfe49ed..59b65aa7 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultHook.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultHook.java @@ -20,10 +20,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.vault; +package me.lucko.luckperms.bukkit.vault; import lombok.Getter; -import me.lucko.luckperms.LPBukkitPlugin; +import me.lucko.luckperms.bukkit.LPBukkitPlugin; import net.milkbowl.vault.chat.Chat; import net.milkbowl.vault.permission.Permission; import org.bukkit.plugin.ServicePriority; diff --git a/bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultPermissionHook.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java similarity index 98% rename from bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultPermissionHook.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java index 727eefdb..a981160c 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultPermissionHook.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java @@ -20,19 +20,19 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.vault; +package me.lucko.luckperms.bukkit.vault; import lombok.Getter; import lombok.NonNull; import lombok.Setter; -import me.lucko.luckperms.LPBukkitPlugin; import me.lucko.luckperms.api.Contexts; 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.ObjectLacksException; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.users.User; import net.milkbowl.vault.permission.Permission; import java.util.Collections; diff --git a/bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultScheduler.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultScheduler.java similarity index 95% rename from bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultScheduler.java rename to bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultScheduler.java index 76e547a3..87e42d2e 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultScheduler.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultScheduler.java @@ -20,9 +20,9 @@ * 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.List; diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index a5854a40..641ada88 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -4,7 +4,7 @@ description: A permissions plugin author: Luck 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 commands: diff --git a/bungee/src/main/java/me/lucko/luckperms/BackendServerCalculator.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BackendServerCalculator.java similarity index 98% rename from bungee/src/main/java/me/lucko/luckperms/BackendServerCalculator.java rename to bungee/src/main/java/me/lucko/luckperms/bungee/BackendServerCalculator.java index b824ef6c..c27288f9 100644 --- a/bungee/src/main/java/me/lucko/luckperms/BackendServerCalculator.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BackendServerCalculator.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.bungee; import com.google.common.collect.Maps; import me.lucko.luckperms.api.context.ContextCalculator; diff --git a/bungee/src/main/java/me/lucko/luckperms/BungeeCalculatorFactory.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCalculatorFactory.java similarity index 94% rename from bungee/src/main/java/me/lucko/luckperms/BungeeCalculatorFactory.java rename to bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCalculatorFactory.java index 184ac760..2c6b9fd6 100644 --- a/bungee/src/main/java/me/lucko/luckperms/BungeeCalculatorFactory.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCalculatorFactory.java @@ -20,12 +20,12 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.bungee; import lombok.AllArgsConstructor; import me.lucko.luckperms.api.Contexts; -import me.lucko.luckperms.calculators.*; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.calculators.*; +import me.lucko.luckperms.common.users.User; import java.util.ArrayList; import java.util.List; diff --git a/bungee/src/main/java/me/lucko/luckperms/BungeeCommand.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCommand.java similarity index 92% rename from bungee/src/main/java/me/lucko/luckperms/BungeeCommand.java rename to bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCommand.java index 28cbeedb..31b64073 100644 --- a/bungee/src/main/java/me/lucko/luckperms/BungeeCommand.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeCommand.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.bungee; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import me.lucko.luckperms.api.data.Callback; -import me.lucko.luckperms.commands.CommandManager; -import me.lucko.luckperms.commands.Util; -import me.lucko.luckperms.constants.Patterns; +import me.lucko.luckperms.common.commands.CommandManager; +import me.lucko.luckperms.common.commands.Util; +import me.lucko.luckperms.common.constants.Patterns; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.TabExecutor; diff --git a/bungee/src/main/java/me/lucko/luckperms/BungeeConfig.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeConfig.java similarity index 96% rename from bungee/src/main/java/me/lucko/luckperms/BungeeConfig.java rename to bungee/src/main/java/me/lucko/luckperms/bungee/BungeeConfig.java index bc9e97ea..9c0d532e 100644 --- a/bungee/src/main/java/me/lucko/luckperms/BungeeConfig.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeConfig.java @@ -20,9 +20,9 @@ * 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.ConfigurationProvider; import net.md_5.bungee.config.YamlConfiguration; diff --git a/bungee/src/main/java/me/lucko/luckperms/BungeeListener.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeListener.java similarity index 96% rename from bungee/src/main/java/me/lucko/luckperms/BungeeListener.java rename to bungee/src/main/java/me/lucko/luckperms/bungee/BungeeListener.java index 410481da..3fd73f01 100644 --- a/bungee/src/main/java/me/lucko/luckperms/BungeeListener.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeListener.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.bungee; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.event.events.UserFirstLoginEvent; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.core.UuidCache; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.AbstractListener; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.core.UuidCache; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.utils.AbstractListener; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.connection.PendingConnection; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/bungee/src/main/java/me/lucko/luckperms/BungeeSenderFactory.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java similarity index 92% rename from bungee/src/main/java/me/lucko/luckperms/BungeeSenderFactory.java rename to bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java index 80c64a08..49037ed1 100644 --- a/bungee/src/main/java/me/lucko/luckperms/BungeeSenderFactory.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java @@ -20,10 +20,11 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.bungee; -import me.lucko.luckperms.commands.SenderFactory; -import me.lucko.luckperms.constants.Constants; +import me.lucko.luckperms.common.LuckPermsPlugin; +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.chat.TextComponent; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/bungee/src/main/java/me/lucko/luckperms/LPBungeePlugin.java b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java similarity index 86% rename from bungee/src/main/java/me/lucko/luckperms/LPBungeePlugin.java rename to bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java index d235b236..727f1890 100644 --- a/bungee/src/main/java/me/lucko/luckperms/LPBungeePlugin.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java @@ -20,33 +20,35 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.bungee; import lombok.Getter; +import me.lucko.luckperms.ApiHandler; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Logger; import me.lucko.luckperms.api.PlatformType; -import me.lucko.luckperms.api.implementation.ApiProvider; -import me.lucko.luckperms.calculators.CalculatorFactory; -import me.lucko.luckperms.commands.CommandManager; -import me.lucko.luckperms.commands.ConsecutiveExecutor; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.config.LPConfiguration; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.contexts.ContextManager; -import me.lucko.luckperms.contexts.ServerCalculator; -import me.lucko.luckperms.core.UuidCache; -import me.lucko.luckperms.data.Importer; -import me.lucko.luckperms.groups.GroupManager; -import me.lucko.luckperms.runnables.ExpireTemporaryTask; -import me.lucko.luckperms.runnables.UpdateTask; -import me.lucko.luckperms.storage.Datastore; -import me.lucko.luckperms.storage.StorageFactory; -import me.lucko.luckperms.tracks.TrackManager; -import me.lucko.luckperms.users.UserManager; -import me.lucko.luckperms.utils.LocaleManager; -import me.lucko.luckperms.utils.LogFactory; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.api.ApiProvider; +import me.lucko.luckperms.common.calculators.CalculatorFactory; +import me.lucko.luckperms.common.commands.CommandManager; +import me.lucko.luckperms.common.commands.ConsecutiveExecutor; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.config.LPConfiguration; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.contexts.ContextManager; +import me.lucko.luckperms.common.contexts.ServerCalculator; +import me.lucko.luckperms.common.core.UuidCache; +import me.lucko.luckperms.common.data.Importer; +import me.lucko.luckperms.common.groups.GroupManager; +import me.lucko.luckperms.common.runnables.ExpireTemporaryTask; +import me.lucko.luckperms.common.runnables.UpdateTask; +import me.lucko.luckperms.common.storage.Datastore; +import me.lucko.luckperms.common.storage.StorageFactory; +import me.lucko.luckperms.common.tracks.TrackManager; +import me.lucko.luckperms.common.users.UserManager; +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.connection.ProxiedPlayer; import net.md_5.bungee.api.plugin.Plugin; @@ -132,7 +134,7 @@ public class LPBungeePlugin extends Plugin implements LuckPermsPlugin { getLog().info("Registering API..."); apiProvider = new ApiProvider(this); - LuckPerms.registerProvider(apiProvider); + ApiHandler.registerProvider(apiProvider); // Run 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(); getLog().info("Unregistering API..."); - LuckPerms.unregisterProvider(); + ApiHandler.unregisterProvider(); } @Override diff --git a/bungee/src/main/resources/plugin.yml b/bungee/src/main/resources/plugin.yml index d13bf337..5210fede 100644 --- a/bungee/src/main/resources/plugin.yml +++ b/bungee/src/main/resources/plugin.yml @@ -2,5 +2,5 @@ name: LuckPerms version: ${release.version}.${git.closest.tag.commit.count} description: A permissions plugin author: Luck -main: me.lucko.luckperms.LPBungeePlugin +main: me.lucko.luckperms.bungee.LPBungeePlugin softdepends: [PowerfulPerms] # For migration diff --git a/common/src/main/java/me/lucko/luckperms/ApiHandler.java b/common/src/main/java/me/lucko/luckperms/ApiHandler.java new file mode 100644 index 00000000..e31dfb27 --- /dev/null +++ b/common/src/main/java/me/lucko/luckperms/ApiHandler.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2016 Lucko (Luck) + * + * 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(); + } + +} diff --git a/common/src/main/java/me/lucko/luckperms/LuckPermsPlugin.java b/common/src/main/java/me/lucko/luckperms/common/LuckPermsPlugin.java similarity index 84% rename from common/src/main/java/me/lucko/luckperms/LuckPermsPlugin.java rename to common/src/main/java/me/lucko/luckperms/common/LuckPermsPlugin.java index 21e49310..273a75c3 100644 --- a/common/src/main/java/me/lucko/luckperms/LuckPermsPlugin.java +++ b/common/src/main/java/me/lucko/luckperms/common/LuckPermsPlugin.java @@ -20,25 +20,25 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.common; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Logger; import me.lucko.luckperms.api.PlatformType; -import me.lucko.luckperms.api.implementation.ApiProvider; -import me.lucko.luckperms.calculators.CalculatorFactory; -import me.lucko.luckperms.commands.ConsecutiveExecutor; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.config.LPConfiguration; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.contexts.ContextManager; -import me.lucko.luckperms.core.UuidCache; -import me.lucko.luckperms.data.Importer; -import me.lucko.luckperms.groups.GroupManager; -import me.lucko.luckperms.storage.Datastore; -import me.lucko.luckperms.tracks.TrackManager; -import me.lucko.luckperms.users.UserManager; -import me.lucko.luckperms.utils.LocaleManager; +import me.lucko.luckperms.common.api.ApiProvider; +import me.lucko.luckperms.common.calculators.CalculatorFactory; +import me.lucko.luckperms.common.commands.ConsecutiveExecutor; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.config.LPConfiguration; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.contexts.ContextManager; +import me.lucko.luckperms.common.core.UuidCache; +import me.lucko.luckperms.common.data.Importer; +import me.lucko.luckperms.common.groups.GroupManager; +import me.lucko.luckperms.common.storage.Datastore; +import me.lucko.luckperms.common.tracks.TrackManager; +import me.lucko.luckperms.common.users.UserManager; +import me.lucko.luckperms.common.utils.LocaleManager; import java.io.File; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/api/implementation/ApiProvider.java b/common/src/main/java/me/lucko/luckperms/common/api/ApiProvider.java similarity index 76% rename from common/src/main/java/me/lucko/luckperms/api/implementation/ApiProvider.java rename to common/src/main/java/me/lucko/luckperms/common/api/ApiProvider.java index c1123c51..98c265bd 100644 --- a/common/src/main/java/me/lucko/luckperms/api/implementation/ApiProvider.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/ApiProvider.java @@ -20,26 +20,25 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.implementation; +package me.lucko.luckperms.common.api; import com.google.common.eventbus.EventBus; import lombok.AllArgsConstructor; import lombok.NonNull; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.*; import me.lucko.luckperms.api.context.ContextListener; import me.lucko.luckperms.api.context.IContextCalculator; import me.lucko.luckperms.api.event.LPEvent; import me.lucko.luckperms.api.event.LPListener; -import me.lucko.luckperms.api.implementation.internal.*; -import me.lucko.luckperms.users.UserIdentifier; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.users.UserIdentifier; import java.util.Optional; import java.util.Set; import java.util.UUID; 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 @@ -95,17 +94,17 @@ public class ApiProvider implements LuckPermsApi { @Override public LPConfiguration getConfiguration() { - return new LPConfigurationLink(plugin.getConfiguration()); + return new me.lucko.luckperms.common.api.internal.LPConfigurationLink(plugin.getConfiguration()); } @Override public Datastore getDatastore() { - return new DatastoreLink(plugin, plugin.getDatastore()); + return new me.lucko.luckperms.common.api.internal.DatastoreLink(plugin, plugin.getDatastore()); } @Override public UuidCache getUuidCache() { - return new UuidCacheLink(plugin.getUuidCache()); + return new me.lucko.luckperms.common.api.internal.UuidCacheLink(plugin.getUuidCache()); } @Override @@ -115,12 +114,12 @@ public class ApiProvider implements LuckPermsApi { @Override 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) { return null; } - return new UserLink(user); + return new me.lucko.luckperms.common.api.internal.UserLink(user); } @Override @@ -130,12 +129,12 @@ public class ApiProvider implements LuckPermsApi { @Override 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) { return null; } - return new UserLink(user); + return new me.lucko.luckperms.common.api.internal.UserLink(user); } @Override @@ -145,7 +144,7 @@ public class ApiProvider implements LuckPermsApi { @Override public Set 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 @@ -155,18 +154,18 @@ public class ApiProvider implements LuckPermsApi { @Override public void cleanupUser(@NonNull User user) { - Utils.checkUser(user); - plugin.getUserManager().cleanup(((UserLink) user).getMaster()); + me.lucko.luckperms.common.api.internal.Utils.checkUser(user); + plugin.getUserManager().cleanup(((me.lucko.luckperms.common.api.internal.UserLink) user).getMaster()); } @Override 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) { return null; } - return new GroupLink(group); + return new me.lucko.luckperms.common.api.internal.GroupLink(group); } @Override @@ -176,7 +175,7 @@ public class ApiProvider implements LuckPermsApi { @Override public Set 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 @@ -186,12 +185,12 @@ public class ApiProvider implements LuckPermsApi { @Override 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) { return null; } - return new TrackLink(track); + return new me.lucko.luckperms.common.api.internal.TrackLink(track); } @Override @@ -201,7 +200,7 @@ public class ApiProvider implements LuckPermsApi { @Override public Set 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 @@ -211,7 +210,7 @@ public class ApiProvider implements LuckPermsApi { @Override 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") diff --git a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/DatastoreLink.java b/common/src/main/java/me/lucko/luckperms/common/api/internal/DatastoreLink.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/api/implementation/internal/DatastoreLink.java rename to common/src/main/java/me/lucko/luckperms/common/api/internal/DatastoreLink.java index 70711249..f3730eb9 100644 --- a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/DatastoreLink.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/internal/DatastoreLink.java @@ -20,15 +20,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.implementation.internal; +package me.lucko.luckperms.common.api.internal; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; import lombok.NonNull; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.*; import me.lucko.luckperms.api.data.Callback; +import me.lucko.luckperms.common.LuckPermsPlugin; import java.util.Set; import java.util.UUID; @@ -36,21 +36,21 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; 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"}) public class DatastoreLink implements Datastore { 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 Sync sync; 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.master = master; this.async = new Async(master); @@ -93,7 +93,7 @@ public class DatastoreLink implements Datastore { @AllArgsConstructor public class Async implements Datastore.Async { - private final me.lucko.luckperms.storage.Datastore master; + private final me.lucko.luckperms.common.storage.Datastore master; @Override public void logAction(@NonNull LogEntry entry, Callback callback) { @@ -206,7 +206,7 @@ public class DatastoreLink implements Datastore { @AllArgsConstructor public class Sync implements Datastore.Sync { - private final me.lucko.luckperms.storage.Datastore master; + private final me.lucko.luckperms.common.storage.Datastore master; @Override public boolean logAction(@NonNull LogEntry entry) { @@ -319,7 +319,7 @@ public class DatastoreLink implements Datastore { @AllArgsConstructor public class Future implements Datastore.Future { - private final me.lucko.luckperms.storage.Datastore master; + private final me.lucko.luckperms.common.storage.Datastore master; @Override public java.util.concurrent.Future logAction(@NonNull LogEntry entry) { diff --git a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/GroupLink.java b/common/src/main/java/me/lucko/luckperms/common/api/internal/GroupLink.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/api/implementation/internal/GroupLink.java rename to common/src/main/java/me/lucko/luckperms/common/api/internal/GroupLink.java index c2ac46a0..3b578225 100644 --- a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/GroupLink.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/internal/GroupLink.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.implementation.internal; +package me.lucko.luckperms.common.api.internal; import lombok.AccessLevel; import lombok.EqualsAndHashCode; @@ -32,22 +32,22 @@ import me.lucko.luckperms.exceptions.ObjectLacksException; 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) @SuppressWarnings("unused") public class GroupLink extends PermissionHolderLink implements Group { @Getter(AccessLevel.PACKAGE) - private final me.lucko.luckperms.groups.Group master; + private final me.lucko.luckperms.common.groups.Group master; @Getter 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); this.master = master; this.name = master.getName(); diff --git a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/LPConfigurationLink.java b/common/src/main/java/me/lucko/luckperms/common/api/internal/LPConfigurationLink.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/api/implementation/internal/LPConfigurationLink.java rename to common/src/main/java/me/lucko/luckperms/common/api/internal/LPConfigurationLink.java index 89a4b963..99732e08 100644 --- a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/LPConfigurationLink.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/internal/LPConfigurationLink.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.implementation.internal; +package me.lucko.luckperms.common.api.internal; import lombok.AllArgsConstructor; import me.lucko.luckperms.api.LPConfiguration; @@ -30,11 +30,11 @@ import me.lucko.luckperms.api.data.MySQLConfiguration; 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 public class LPConfigurationLink implements LPConfiguration { - private final me.lucko.luckperms.config.LPConfiguration master; + private final me.lucko.luckperms.common.config.LPConfiguration master; @Override public String getServer() { diff --git a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/LogLink.java b/common/src/main/java/me/lucko/luckperms/common/api/internal/LogLink.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/api/implementation/internal/LogLink.java rename to common/src/main/java/me/lucko/luckperms/common/api/internal/LogLink.java index 397370ec..45227a0e 100644 --- a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/LogLink.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/internal/LogLink.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.implementation.internal; +package me.lucko.luckperms.common.api.internal; import lombok.AllArgsConstructor; import lombok.NonNull; @@ -31,14 +31,14 @@ import java.util.SortedMap; import java.util.SortedSet; 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 public class LogLink implements Log { - private final me.lucko.luckperms.data.Log master; + private final me.lucko.luckperms.common.data.Log master; @Override public SortedSet getContent() { diff --git a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/PermissionHolderLink.java b/common/src/main/java/me/lucko/luckperms/common/api/internal/PermissionHolderLink.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/api/implementation/internal/PermissionHolderLink.java rename to common/src/main/java/me/lucko/luckperms/common/api/internal/PermissionHolderLink.java index e389dfcf..797d4eaf 100644 --- a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/PermissionHolderLink.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/internal/PermissionHolderLink.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.implementation.internal; +package me.lucko.luckperms.common.api.internal; import lombok.AllArgsConstructor; import lombok.NonNull; @@ -30,18 +30,18 @@ import me.lucko.luckperms.exceptions.ObjectLacksException; import java.util.*; -import static me.lucko.luckperms.api.implementation.internal.Utils.*; -import static me.lucko.luckperms.core.PermissionHolder.exportToLegacy; +import static me.lucko.luckperms.common.api.internal.Utils.*; +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") @AllArgsConstructor public class PermissionHolderLink implements PermissionHolder { @NonNull - private final me.lucko.luckperms.core.PermissionHolder master; + private final me.lucko.luckperms.common.core.PermissionHolder master; @Override public String getObjectName() { diff --git a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/TrackLink.java b/common/src/main/java/me/lucko/luckperms/common/api/internal/TrackLink.java similarity index 92% rename from common/src/main/java/me/lucko/luckperms/api/implementation/internal/TrackLink.java rename to common/src/main/java/me/lucko/luckperms/common/api/internal/TrackLink.java index 9d20c453..376f8c55 100644 --- a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/TrackLink.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/internal/TrackLink.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.implementation.internal; +package me.lucko.luckperms.common.api.internal; import lombok.AccessLevel; import lombok.EqualsAndHashCode; @@ -33,22 +33,22 @@ import me.lucko.luckperms.exceptions.ObjectLacksException; 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"}) @SuppressWarnings("unused") public class TrackLink implements Track { @Getter(AccessLevel.PACKAGE) - private final me.lucko.luckperms.tracks.Track master; + private final me.lucko.luckperms.common.tracks.Track master; @Getter 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.name = master.getName(); } diff --git a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/UserLink.java b/common/src/main/java/me/lucko/luckperms/common/api/internal/UserLink.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/api/implementation/internal/UserLink.java rename to common/src/main/java/me/lucko/luckperms/common/api/internal/UserLink.java index 0838a838..cd5f0220 100644 --- a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/UserLink.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/internal/UserLink.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.implementation.internal; +package me.lucko.luckperms.common.api.internal; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -33,22 +33,22 @@ import me.lucko.luckperms.exceptions.ObjectLacksException; import java.util.List; 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) @SuppressWarnings("unused") public class UserLink extends PermissionHolderLink implements User { @Getter - private final me.lucko.luckperms.users.User master; + private final me.lucko.luckperms.common.users.User master; @Getter 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); this.master = master; this.uuid = master.getUuid(); diff --git a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/Utils.java b/common/src/main/java/me/lucko/luckperms/common/api/internal/Utils.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/api/implementation/internal/Utils.java rename to common/src/main/java/me/lucko/luckperms/common/api/internal/Utils.java index 5b946967..2f32dcb0 100644 --- a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/Utils.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/internal/Utils.java @@ -20,13 +20,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.implementation.internal; +package me.lucko.luckperms.common.api.internal; import lombok.experimental.UtilityClass; import me.lucko.luckperms.api.Group; import me.lucko.luckperms.api.Track; import me.lucko.luckperms.api.User; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.utils.ArgumentChecker; @UtilityClass public class Utils { diff --git a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/UuidCacheLink.java b/common/src/main/java/me/lucko/luckperms/common/api/internal/UuidCacheLink.java similarity index 91% rename from common/src/main/java/me/lucko/luckperms/api/implementation/internal/UuidCacheLink.java rename to common/src/main/java/me/lucko/luckperms/common/api/internal/UuidCacheLink.java index 9555da05..8c050f77 100644 --- a/common/src/main/java/me/lucko/luckperms/api/implementation/internal/UuidCacheLink.java +++ b/common/src/main/java/me/lucko/luckperms/common/api/internal/UuidCacheLink.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.implementation.internal; +package me.lucko.luckperms.common.api.internal; import lombok.AllArgsConstructor; import me.lucko.luckperms.api.UuidCache; @@ -28,11 +28,11 @@ import me.lucko.luckperms.api.UuidCache; 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 public class UuidCacheLink implements UuidCache { - private final me.lucko.luckperms.core.UuidCache master; + private final me.lucko.luckperms.common.core.UuidCache master; @Override public UUID getUUID(UUID external) { diff --git a/common/src/main/java/me/lucko/luckperms/caching/MetaData.java b/common/src/main/java/me/lucko/luckperms/common/caching/MetaData.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/caching/MetaData.java rename to common/src/main/java/me/lucko/luckperms/common/caching/MetaData.java index 794447f2..fd2a4e33 100644 --- a/common/src/main/java/me/lucko/luckperms/caching/MetaData.java +++ b/common/src/main/java/me/lucko/luckperms/common/caching/MetaData.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.caching; +package me.lucko.luckperms.common.caching; import com.google.common.collect.ImmutableMap; import lombok.Getter; diff --git a/common/src/main/java/me/lucko/luckperms/caching/PermissionData.java b/common/src/main/java/me/lucko/luckperms/common/caching/PermissionData.java similarity index 93% rename from common/src/main/java/me/lucko/luckperms/caching/PermissionData.java rename to common/src/main/java/me/lucko/luckperms/common/caching/PermissionData.java index 4d0ef6c0..7c5e6db5 100644 --- a/common/src/main/java/me/lucko/luckperms/caching/PermissionData.java +++ b/common/src/main/java/me/lucko/luckperms/common/caching/PermissionData.java @@ -20,15 +20,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.caching; +package me.lucko.luckperms.common.caching; import com.google.common.collect.ImmutableMap; import lombok.NonNull; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Tristate; -import me.lucko.luckperms.calculators.CalculatorFactory; -import me.lucko.luckperms.calculators.PermissionCalculator; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.calculators.CalculatorFactory; +import me.lucko.luckperms.common.calculators.PermissionCalculator; +import me.lucko.luckperms.common.users.User; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/common/src/main/java/me/lucko/luckperms/caching/UserData.java b/common/src/main/java/me/lucko/luckperms/common/caching/UserData.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/caching/UserData.java rename to common/src/main/java/me/lucko/luckperms/common/caching/UserData.java index 6e89d652..967148fd 100644 --- a/common/src/main/java/me/lucko/luckperms/caching/UserData.java +++ b/common/src/main/java/me/lucko/luckperms/common/caching/UserData.java @@ -20,12 +20,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.caching; +package me.lucko.luckperms.common.caching; import lombok.RequiredArgsConstructor; import me.lucko.luckperms.api.Contexts; -import me.lucko.luckperms.calculators.CalculatorFactory; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.calculators.CalculatorFactory; +import me.lucko.luckperms.common.users.User; import java.util.Collections; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/calculators/CalculatorFactory.java b/common/src/main/java/me/lucko/luckperms/common/calculators/CalculatorFactory.java similarity index 93% rename from common/src/main/java/me/lucko/luckperms/calculators/CalculatorFactory.java rename to common/src/main/java/me/lucko/luckperms/common/calculators/CalculatorFactory.java index b6fb94c5..5bd48a57 100644 --- a/common/src/main/java/me/lucko/luckperms/calculators/CalculatorFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculators/CalculatorFactory.java @@ -20,10 +20,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.calculators; +package me.lucko.luckperms.common.calculators; import me.lucko.luckperms.api.Contexts; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.users.User; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/calculators/MapProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculators/MapProcessor.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/calculators/MapProcessor.java rename to common/src/main/java/me/lucko/luckperms/common/calculators/MapProcessor.java index 00357ef1..35cf624c 100644 --- a/common/src/main/java/me/lucko/luckperms/calculators/MapProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculators/MapProcessor.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.calculators; +package me.lucko.luckperms.common.calculators; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/common/src/main/java/me/lucko/luckperms/calculators/PermissionCalculator.java b/common/src/main/java/me/lucko/luckperms/common/calculators/PermissionCalculator.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/calculators/PermissionCalculator.java rename to common/src/main/java/me/lucko/luckperms/common/calculators/PermissionCalculator.java index b29aa009..e1b10dd6 100644 --- a/common/src/main/java/me/lucko/luckperms/calculators/PermissionCalculator.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculators/PermissionCalculator.java @@ -20,11 +20,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.calculators; +package me.lucko.luckperms.common.calculators; import lombok.RequiredArgsConstructor; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.Tristate; +import me.lucko.luckperms.common.LuckPermsPlugin; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/calculators/PermissionProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculators/PermissionProcessor.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/calculators/PermissionProcessor.java rename to common/src/main/java/me/lucko/luckperms/common/calculators/PermissionProcessor.java index fbdb7b0f..d90886be 100644 --- a/common/src/main/java/me/lucko/luckperms/calculators/PermissionProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculators/PermissionProcessor.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.calculators; +package me.lucko.luckperms.common.calculators; import me.lucko.luckperms.api.Tristate; diff --git a/common/src/main/java/me/lucko/luckperms/calculators/RegexProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculators/RegexProcessor.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/calculators/RegexProcessor.java rename to common/src/main/java/me/lucko/luckperms/common/calculators/RegexProcessor.java index 72f8a9f7..d5ad4ecb 100644 --- a/common/src/main/java/me/lucko/luckperms/calculators/RegexProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculators/RegexProcessor.java @@ -20,12 +20,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.calculators; +package me.lucko.luckperms.common.calculators; import lombok.AllArgsConstructor; import lombok.Getter; 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.regex.Pattern; diff --git a/common/src/main/java/me/lucko/luckperms/calculators/WildcardProcessor.java b/common/src/main/java/me/lucko/luckperms/common/calculators/WildcardProcessor.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/calculators/WildcardProcessor.java rename to common/src/main/java/me/lucko/luckperms/common/calculators/WildcardProcessor.java index ca23b586..ab2ad0de 100644 --- a/common/src/main/java/me/lucko/luckperms/calculators/WildcardProcessor.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculators/WildcardProcessor.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.calculators; +package me.lucko.luckperms.common.calculators; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/common/src/main/java/me/lucko/luckperms/commands/Arg.java b/common/src/main/java/me/lucko/luckperms/common/commands/Arg.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/commands/Arg.java rename to common/src/main/java/me/lucko/luckperms/common/commands/Arg.java index 130e7e25..87b48a2f 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/Arg.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/Arg.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands; +package me.lucko.luckperms.common.commands; import com.google.common.collect.ImmutableList; import lombok.AccessLevel; diff --git a/common/src/main/java/me/lucko/luckperms/commands/CommandManager.java b/common/src/main/java/me/lucko/luckperms/common/commands/CommandManager.java similarity index 87% rename from common/src/main/java/me/lucko/luckperms/commands/CommandManager.java rename to common/src/main/java/me/lucko/luckperms/common/commands/CommandManager.java index fdebbf4d..34b89eee 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/CommandManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/CommandManager.java @@ -20,26 +20,26 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands; +package me.lucko.luckperms.common.commands; import com.google.common.collect.ImmutableList; import lombok.AllArgsConstructor; import lombok.Getter; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.data.Callback; -import me.lucko.luckperms.commands.group.CreateGroup; -import me.lucko.luckperms.commands.group.DeleteGroup; -import me.lucko.luckperms.commands.group.GroupMainCommand; -import me.lucko.luckperms.commands.group.ListGroups; -import me.lucko.luckperms.commands.log.LogMainCommand; -import me.lucko.luckperms.commands.migration.MigrationMainCommand; -import me.lucko.luckperms.commands.misc.*; -import me.lucko.luckperms.commands.track.CreateTrack; -import me.lucko.luckperms.commands.track.DeleteTrack; -import me.lucko.luckperms.commands.track.ListTracks; -import me.lucko.luckperms.commands.track.TrackMainCommand; -import me.lucko.luckperms.commands.user.UserMainCommand; -import me.lucko.luckperms.commands.usersbulkedit.UsersBulkEditMainCommand; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.group.CreateGroup; +import me.lucko.luckperms.common.commands.group.DeleteGroup; +import me.lucko.luckperms.common.commands.group.GroupMainCommand; +import me.lucko.luckperms.common.commands.group.ListGroups; +import me.lucko.luckperms.common.commands.log.LogMainCommand; +import me.lucko.luckperms.common.commands.migration.MigrationMainCommand; +import me.lucko.luckperms.common.commands.misc.*; +import me.lucko.luckperms.common.commands.track.CreateTrack; +import me.lucko.luckperms.common.commands.track.DeleteTrack; +import me.lucko.luckperms.common.commands.track.ListTracks; +import me.lucko.luckperms.common.commands.track.TrackMainCommand; +import me.lucko.luckperms.common.commands.user.UserMainCommand; +import me.lucko.luckperms.common.commands.usersbulkedit.UsersBulkEditMainCommand; import java.util.ArrayList; import java.util.Collections; diff --git a/common/src/main/java/me/lucko/luckperms/commands/CommandResult.java b/common/src/main/java/me/lucko/luckperms/common/commands/CommandResult.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/commands/CommandResult.java rename to common/src/main/java/me/lucko/luckperms/common/commands/CommandResult.java index e619f75d..4634c392 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/CommandResult.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/CommandResult.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands; +package me.lucko.luckperms.common.commands; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/me/lucko/luckperms/commands/ConsecutiveExecutor.java b/common/src/main/java/me/lucko/luckperms/common/commands/ConsecutiveExecutor.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/commands/ConsecutiveExecutor.java rename to common/src/main/java/me/lucko/luckperms/common/commands/ConsecutiveExecutor.java index b2b57ee1..47d667ad 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/ConsecutiveExecutor.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/ConsecutiveExecutor.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands; +package me.lucko.luckperms.common.commands; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/common/src/main/java/me/lucko/luckperms/commands/MainCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/MainCommand.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/commands/MainCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/MainCommand.java index 8decd134..e5a06132 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/MainCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/MainCommand.java @@ -20,13 +20,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands; +package me.lucko.luckperms.common.commands; import com.google.common.collect.ImmutableList; import lombok.AllArgsConstructor; import lombok.Getter; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.constants.Message; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.constants.Message; import java.util.ArrayList; import java.util.Collections; diff --git a/common/src/main/java/me/lucko/luckperms/commands/Predicate.java b/common/src/main/java/me/lucko/luckperms/common/commands/Predicate.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/commands/Predicate.java rename to common/src/main/java/me/lucko/luckperms/common/commands/Predicate.java index 179c91b2..b5733e44 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/Predicate.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/Predicate.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands; +package me.lucko.luckperms.common.commands; import lombok.experimental.UtilityClass; diff --git a/common/src/main/java/me/lucko/luckperms/commands/Sender.java b/common/src/main/java/me/lucko/luckperms/common/commands/Sender.java similarity index 90% rename from common/src/main/java/me/lucko/luckperms/commands/Sender.java rename to common/src/main/java/me/lucko/luckperms/common/commands/Sender.java index ca672082..4c6072c3 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/Sender.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/Sender.java @@ -20,10 +20,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands; +package me.lucko.luckperms.common.commands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.constants.Permission; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.constants.Permission; import java.util.UUID; diff --git a/common/src/main/java/me/lucko/luckperms/commands/SenderFactory.java b/common/src/main/java/me/lucko/luckperms/common/commands/SenderFactory.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/commands/SenderFactory.java rename to common/src/main/java/me/lucko/luckperms/common/commands/SenderFactory.java index 2e7fc384..50ba3b19 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/SenderFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/SenderFactory.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands; +package me.lucko.luckperms.common.commands; import com.google.common.collect.ImmutableMap; import lombok.Getter; import lombok.RequiredArgsConstructor; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.constants.Constants; -import me.lucko.luckperms.constants.Permission; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.constants.Constants; +import me.lucko.luckperms.common.constants.Permission; import java.lang.ref.WeakReference; import java.util.*; diff --git a/common/src/main/java/me/lucko/luckperms/commands/SingleMainCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/SingleMainCommand.java similarity index 94% rename from common/src/main/java/me/lucko/luckperms/commands/SingleMainCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/SingleMainCommand.java index 4966b230..c8a0fce6 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/SingleMainCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/SingleMainCommand.java @@ -20,10 +20,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands; +package me.lucko.luckperms.common.commands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.constants.Permission; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.constants.Permission; import java.util.Collections; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/SubCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/SubCommand.java similarity index 94% rename from common/src/main/java/me/lucko/luckperms/commands/SubCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/SubCommand.java index c1790743..67363ed4 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/SubCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/SubCommand.java @@ -20,17 +20,17 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands; +package me.lucko.luckperms.common.commands; import com.google.common.collect.ImmutableList; import lombok.AllArgsConstructor; import lombok.Getter; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.LuckPermsPlugin; +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.common.tracks.Track; +import me.lucko.luckperms.common.users.User; import java.util.ArrayList; import java.util.Arrays; diff --git a/common/src/main/java/me/lucko/luckperms/commands/Util.java b/common/src/main/java/me/lucko/luckperms/common/commands/Util.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/commands/Util.java rename to common/src/main/java/me/lucko/luckperms/common/commands/Util.java index 9b543fc0..e84117d6 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/Util.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/Util.java @@ -20,15 +20,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands; +package me.lucko.luckperms.common.commands; import lombok.experimental.UtilityClass; import me.lucko.luckperms.api.LocalizedNode; import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.Tristate; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Patterns; -import me.lucko.luckperms.utils.DateUtil; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Patterns; +import me.lucko.luckperms.common.utils.DateUtil; import java.util.*; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/CreateGroup.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/CreateGroup.java similarity index 83% rename from common/src/main/java/me/lucko/luckperms/commands/group/CreateGroup.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/CreateGroup.java index 76a97944..45a70409 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/CreateGroup.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/CreateGroup.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.group; +package me.lucko.luckperms.common.commands.group; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SingleMainCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SingleMainCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/DeleteGroup.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/DeleteGroup.java similarity index 87% rename from common/src/main/java/me/lucko/luckperms/commands/group/DeleteGroup.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/DeleteGroup.java index 8baaa2c0..1c559233 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/DeleteGroup.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/DeleteGroup.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.group; +package me.lucko.luckperms.common.commands.group; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SingleMainCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; -import me.lucko.luckperms.groups.Group; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SingleMainCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.groups.Group; import java.util.ArrayList; import java.util.Collections; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/GroupMainCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupMainCommand.java similarity index 85% rename from common/src/main/java/me/lucko/luckperms/commands/group/GroupMainCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/GroupMainCommand.java index 9569a97d..4bdda155 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/GroupMainCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupMainCommand.java @@ -20,17 +20,17 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.group; +package me.lucko.luckperms.common.commands.group; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.MainCommand; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SubCommand; -import me.lucko.luckperms.commands.group.subcommands.*; -import me.lucko.luckperms.commands.meta.MetaCommands; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.groups.Group; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.MainCommand; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SubCommand; +import me.lucko.luckperms.common.commands.group.subcommands.*; +import me.lucko.luckperms.common.commands.meta.MetaCommands; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.groups.Group; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/ListGroups.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/ListGroups.java similarity index 81% rename from common/src/main/java/me/lucko/luckperms/commands/group/ListGroups.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/ListGroups.java index d5b95c07..98e3f52f 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/ListGroups.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/ListGroups.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.group; +package me.lucko.luckperms.common.commands.group; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SingleMainCommand; -import me.lucko.luckperms.commands.Util; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.groups.Group; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SingleMainCommand; +import me.lucko.luckperms.common.commands.Util; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.groups.Group; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupBulkChange.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupBulkChange.java similarity index 87% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupBulkChange.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupBulkChange.java index 568f04e5..8f926a26 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupBulkChange.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupBulkChange.java @@ -20,16 +20,16 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +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.ObjectLacksException; -import me.lucko.luckperms.groups.Group; import java.util.HashSet; import java.util.Iterator; @@ -74,7 +74,7 @@ public class GroupBulkChange extends SubCommand { } 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 { while (iterator.hasNext()) { @@ -85,7 +85,7 @@ public class GroupBulkChange extends SubCommand { } 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()); } } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupClear.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupClear.java similarity index 87% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupClear.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupClear.java index 33cc6c89..df87e74b 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupClear.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupClear.java @@ -20,15 +20,15 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.utils.ArgumentChecker; import java.util.List; import java.util.stream.Collectors; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupClone.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupClone.java similarity index 86% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupClone.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupClone.java index 8e4fe18d..e696f92d 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupClone.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupClone.java @@ -20,15 +20,15 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupHasPerm.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupHasPerm.java similarity index 86% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupHasPerm.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupHasPerm.java index db2ceef2..18ce1797 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupHasPerm.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupHasPerm.java @@ -20,15 +20,15 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.core.Node; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.core.Node; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInfo.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupInfo.java similarity index 78% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInfo.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupInfo.java index bbd43bb6..7f4f6156 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupInfo.java @@ -20,16 +20,16 @@ * 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.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SubCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.groups.Group; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SubCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.groups.Group; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInheritsPerm.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupInheritsPerm.java similarity index 87% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInheritsPerm.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupInheritsPerm.java index 58f25d07..6504c133 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInheritsPerm.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupInheritsPerm.java @@ -20,16 +20,16 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.core.InheritanceInfo; -import me.lucko.luckperms.core.Node; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.core.InheritanceInfo; +import me.lucko.luckperms.common.core.Node; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListNodes.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupListNodes.java similarity index 85% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListNodes.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupListNodes.java index c290fbc1..3e0d09d5 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListNodes.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupListNodes.java @@ -20,13 +20,13 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.groups.Group; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.groups.Group; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListParents.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupListParents.java similarity index 85% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListParents.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupListParents.java index 03e30277..113382ff 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListParents.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupListParents.java @@ -20,13 +20,13 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.groups.Group; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.groups.Group; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRename.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupRename.java similarity index 87% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRename.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupRename.java index 2ed84d36..aa105d2b 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRename.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupRename.java @@ -20,15 +20,15 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetInherit.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetInherit.java similarity index 91% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetInherit.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetInherit.java index 7bf51e5f..7bb67604 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetInherit.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetInherit.java @@ -20,16 +20,16 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.groups.Group; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetPermission.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetPermission.java similarity index 91% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetPermission.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetPermission.java index f94890a7..cbc05bea 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetPermission.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetPermission.java @@ -20,16 +20,16 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.groups.Group; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempInherit.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetTempInherit.java similarity index 92% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempInherit.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetTempInherit.java index c66a537f..4e924bb3 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempInherit.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetTempInherit.java @@ -20,17 +20,17 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.groups.Group; -import me.lucko.luckperms.utils.ArgumentChecker; -import me.lucko.luckperms.utils.DateUtil; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempPermission.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetTempPermission.java similarity index 92% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempPermission.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetTempPermission.java index 2dfbdd82..21e060a8 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempPermission.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupSetTempPermission.java @@ -20,17 +20,17 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.groups.Group; -import me.lucko.luckperms.utils.ArgumentChecker; -import me.lucko.luckperms.utils.DateUtil; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupShowTracks.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupShowTracks.java similarity index 85% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupShowTracks.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupShowTracks.java index 20910861..94c3e1a9 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupShowTracks.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupShowTracks.java @@ -20,14 +20,14 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.tracks.Track; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +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.common.tracks.Track; import java.util.List; import java.util.stream.Collectors; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnSetPermission.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnSetPermission.java similarity index 90% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnSetPermission.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnSetPermission.java index 00d1b062..a70de0e1 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnSetPermission.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnSetPermission.java @@ -20,16 +20,16 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.groups.Group; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetInherit.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnsetInherit.java similarity index 91% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetInherit.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnsetInherit.java index 00395125..eaaafb02 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetInherit.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnsetInherit.java @@ -20,16 +20,16 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.groups.Group; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempInherit.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnsetTempInherit.java similarity index 91% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempInherit.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnsetTempInherit.java index 176e665f..826c9ce7 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempInherit.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnsetTempInherit.java @@ -20,16 +20,16 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.groups.Group; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempPermission.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnsetTempPermission.java similarity index 91% rename from common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempPermission.java rename to common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnsetTempPermission.java index 6350fc30..35b762c9 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempPermission.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/subcommands/GroupUnsetTempPermission.java @@ -20,16 +20,16 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.groups.Group; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/log/LogMainCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogMainCommand.java similarity index 89% rename from common/src/main/java/me/lucko/luckperms/commands/log/LogMainCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/log/LogMainCommand.java index d5e97246..ed6141a2 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/log/LogMainCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogMainCommand.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.log; +package me.lucko.luckperms.common.commands.log; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.MainCommand; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SubCommand; -import me.lucko.luckperms.commands.log.subcommands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.data.Log; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.MainCommand; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SubCommand; +import me.lucko.luckperms.common.commands.log.subcommands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.data.Log; import java.util.Collections; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogExport.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogExport.java similarity index 93% rename from common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogExport.java rename to common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogExport.java index 7c4ddac4..1210941b 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogExport.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogExport.java @@ -20,14 +20,14 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.Log; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.Log; import java.io.File; import java.io.IOException; diff --git a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogGroupHistory.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogGroupHistory.java similarity index 88% rename from common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogGroupHistory.java rename to common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogGroupHistory.java index c4a38a4e..ba24e4e5 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogGroupHistory.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogGroupHistory.java @@ -20,16 +20,16 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.Log; -import me.lucko.luckperms.utils.ArgumentChecker; -import me.lucko.luckperms.utils.DateUtil; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.Log; +import me.lucko.luckperms.common.utils.ArgumentChecker; +import me.lucko.luckperms.common.utils.DateUtil; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogNotify.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogNotify.java similarity index 91% rename from common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogNotify.java rename to common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogNotify.java index 74f7ca22..cc91151e 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogNotify.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogNotify.java @@ -20,13 +20,13 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.Log; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.Log; import java.util.List; import java.util.Set; diff --git a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogRecent.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogRecent.java similarity index 92% rename from common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogRecent.java rename to common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogRecent.java index 3e4b1bac..953c3c08 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogRecent.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogRecent.java @@ -20,16 +20,16 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Patterns; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.Log; -import me.lucko.luckperms.utils.DateUtil; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Patterns; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.Log; +import me.lucko.luckperms.common.utils.DateUtil; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogSearch.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogSearch.java similarity index 89% rename from common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogSearch.java rename to common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogSearch.java index 7d73cc68..277f471f 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogSearch.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogSearch.java @@ -20,15 +20,15 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.Log; -import me.lucko.luckperms.utils.DateUtil; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.Log; +import me.lucko.luckperms.common.utils.DateUtil; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogTrackHistory.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogTrackHistory.java similarity index 88% rename from common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogTrackHistory.java rename to common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogTrackHistory.java index 83bb9991..aed4d136 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogTrackHistory.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogTrackHistory.java @@ -20,16 +20,16 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.Log; -import me.lucko.luckperms.utils.ArgumentChecker; -import me.lucko.luckperms.utils.DateUtil; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.Log; +import me.lucko.luckperms.common.utils.ArgumentChecker; +import me.lucko.luckperms.common.utils.DateUtil; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogUserHistory.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogUserHistory.java similarity index 90% rename from common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogUserHistory.java rename to common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogUserHistory.java index a5139db6..3fd72f69 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogUserHistory.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogUserHistory.java @@ -20,16 +20,16 @@ * 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.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Patterns; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.Log; -import me.lucko.luckperms.utils.DateUtil; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Patterns; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.Log; +import me.lucko.luckperms.common.utils.DateUtil; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/commands/meta/MetaCommands.java b/common/src/main/java/me/lucko/luckperms/common/commands/meta/MetaCommands.java similarity index 92% rename from common/src/main/java/me/lucko/luckperms/commands/meta/MetaCommands.java rename to common/src/main/java/me/lucko/luckperms/common/commands/meta/MetaCommands.java index 8310efed..97b0f72b 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/meta/MetaCommands.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/meta/MetaCommands.java @@ -20,16 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.meta; +package me.lucko.luckperms.common.commands.meta; import com.google.common.collect.ImmutableList; -import lombok.RequiredArgsConstructor; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.commands.meta.subcommands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.core.PermissionHolder; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.commands.meta.subcommands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.core.PermissionHolder; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/meta/MetaSubCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/meta/MetaSubCommand.java similarity index 87% rename from common/src/main/java/me/lucko/luckperms/commands/meta/MetaSubCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/meta/MetaSubCommand.java index 20a03ee6..8e8d1d5f 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/meta/MetaSubCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/meta/MetaSubCommand.java @@ -20,21 +20,21 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.meta; +package me.lucko.luckperms.common.commands.meta; import com.google.common.collect.ImmutableList; import lombok.AllArgsConstructor; import lombok.Getter; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.Arg; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.Util; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.core.PermissionHolder; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.Arg; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.Util; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.core.PermissionHolder; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.users.User; import java.util.List; import java.util.function.Predicate; diff --git a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddPrefix.java b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddPrefix.java similarity index 87% rename from common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddPrefix.java rename to common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddPrefix.java index 41c2c030..c6715298 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddPrefix.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddPrefix.java @@ -20,20 +20,20 @@ * 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.commands.Arg; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.meta.MetaSubCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.core.PermissionHolder; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.Arg; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.meta.MetaSubCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.ObjectAlreadyHasException; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddSuffix.java b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddSuffix.java similarity index 87% rename from common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddSuffix.java rename to common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddSuffix.java index 296c4568..9c082b42 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddSuffix.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddSuffix.java @@ -20,20 +20,20 @@ * 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.commands.Arg; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.meta.MetaSubCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.core.PermissionHolder; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.Arg; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.meta.MetaSubCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.ObjectAlreadyHasException; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddTempPrefix.java b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddTempPrefix.java similarity index 88% rename from common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddTempPrefix.java rename to common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddTempPrefix.java index 2455313a..25c22dad 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddTempPrefix.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddTempPrefix.java @@ -20,21 +20,21 @@ * 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.commands.Arg; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.meta.MetaSubCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.core.PermissionHolder; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.Arg; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.meta.MetaSubCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.common.utils.DateUtil; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; -import me.lucko.luckperms.utils.ArgumentChecker; -import me.lucko.luckperms.utils.DateUtil; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddTempSuffix.java b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddTempSuffix.java similarity index 88% rename from common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddTempSuffix.java rename to common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddTempSuffix.java index d5704660..cc5b2173 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaAddTempSuffix.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaAddTempSuffix.java @@ -20,21 +20,21 @@ * 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.commands.Arg; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.meta.MetaSubCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.core.PermissionHolder; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.Arg; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.meta.MetaSubCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.common.utils.DateUtil; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; -import me.lucko.luckperms.utils.ArgumentChecker; -import me.lucko.luckperms.utils.DateUtil; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaClear.java b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaClear.java similarity index 81% rename from common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaClear.java rename to common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaClear.java index 60ec680c..54111ba2 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaClear.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaClear.java @@ -20,19 +20,19 @@ * 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.commands.Arg; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.meta.MetaSubCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.core.PermissionHolder; -import me.lucko.luckperms.data.LogEntry; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.Arg; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.meta.MetaSubCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.core.PermissionHolder; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.utils.ArgumentChecker; import java.util.List; import java.util.stream.Collectors; diff --git a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaInfo.java b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaInfo.java similarity index 86% rename from common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaInfo.java rename to common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaInfo.java index b3b3fcb1..1aa8a0b1 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaInfo.java @@ -20,19 +20,19 @@ * 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.Node; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.Util; -import me.lucko.luckperms.commands.meta.MetaSubCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.core.PermissionHolder; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.Util; +import me.lucko.luckperms.common.commands.meta.MetaSubCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.core.PermissionHolder; import java.util.*; diff --git a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemovePrefix.java b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemovePrefix.java similarity index 90% rename from common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemovePrefix.java rename to common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemovePrefix.java index 55db000b..4dbde7bd 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemovePrefix.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemovePrefix.java @@ -20,21 +20,21 @@ * 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.commands.Arg; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.meta.MetaSubCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.core.PermissionHolder; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.Arg; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.meta.MetaSubCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.utils.ArgumentChecker; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemoveSuffix.java b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemoveSuffix.java similarity index 90% rename from common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemoveSuffix.java rename to common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemoveSuffix.java index a577299d..2725071b 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemoveSuffix.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemoveSuffix.java @@ -20,21 +20,21 @@ * 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.commands.Arg; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.meta.MetaSubCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.core.PermissionHolder; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.Arg; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.meta.MetaSubCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.utils.ArgumentChecker; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemoveTempPrefix.java b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemoveTempPrefix.java similarity index 90% rename from common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemoveTempPrefix.java rename to common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemoveTempPrefix.java index 972a5ee4..5b568844 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemoveTempPrefix.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemoveTempPrefix.java @@ -20,21 +20,21 @@ * 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.commands.Arg; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.meta.MetaSubCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.core.PermissionHolder; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.Arg; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.meta.MetaSubCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.utils.ArgumentChecker; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemoveTempSuffix.java b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemoveTempSuffix.java similarity index 90% rename from common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemoveTempSuffix.java rename to common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemoveTempSuffix.java index 3b8525d4..20d14636 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/meta/subcommands/MetaRemoveTempSuffix.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/meta/subcommands/MetaRemoveTempSuffix.java @@ -20,21 +20,21 @@ * 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.commands.Arg; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.meta.MetaSubCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.core.PermissionHolder; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.Arg; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.meta.MetaSubCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +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.utils.ArgumentChecker; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/migration/MigrationMainCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/MigrationMainCommand.java similarity index 88% rename from common/src/main/java/me/lucko/luckperms/commands/migration/MigrationMainCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/migration/MigrationMainCommand.java index 825c8457..60c51947 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/migration/MigrationMainCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/MigrationMainCommand.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.migration; +package me.lucko.luckperms.common.commands.migration; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.MainCommand; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SubCommand; -import me.lucko.luckperms.commands.migration.subcommands.*; -import me.lucko.luckperms.constants.Constants; -import me.lucko.luckperms.constants.Message; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.MainCommand; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SubCommand; +import me.lucko.luckperms.common.commands.migration.subcommands.*; +import me.lucko.luckperms.common.constants.Constants; +import me.lucko.luckperms.common.constants.Message; import java.util.ArrayList; import java.util.Collections; diff --git a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBPermissions.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationBPermissions.java similarity index 92% rename from common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBPermissions.java rename to common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationBPermissions.java index 49b3e6c9..5c171a9a 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBPermissions.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationBPermissions.java @@ -20,26 +20,26 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.migration.subcommands; +package me.lucko.luckperms.common.commands.migration.subcommands; import de.bananaco.bpermissions.api.*; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.Logger; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SubCommand; -import me.lucko.luckperms.constants.Constants; -import me.lucko.luckperms.core.PermissionHolder; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SubCommand; +import me.lucko.luckperms.common.constants.Constants; +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.ObjectAlreadyHasException; -import me.lucko.luckperms.utils.ArgumentChecker; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.*; -import static me.lucko.luckperms.constants.Permission.MIGRATION; +import static me.lucko.luckperms.common.constants.Permission.MIGRATION; public class MigrationBPermissions extends SubCommand { private static Field uConfigField; @@ -122,7 +122,7 @@ public class MigrationBPermissions extends SubCommand { // Make a LuckPerms group for the one being migrated. plugin.getDatastore().createAndLoadGroup(groupName); - me.lucko.luckperms.groups.Group lpGroup = plugin.getGroupManager().get(groupName); + me.lucko.luckperms.common.groups.Group lpGroup = plugin.getGroupManager().get(groupName); try { LogEntry.build() .actor(Constants.getConsoleUUID()).actorName(Constants.getConsoleName()) @@ -158,7 +158,7 @@ public class MigrationBPermissions extends SubCommand { // Make a LuckPerms user for the one being migrated. plugin.getDatastore().loadUser(uuid, "null"); - me.lucko.luckperms.users.User lpUser = plugin.getUserManager().get(uuid); + me.lucko.luckperms.common.users.User lpUser = plugin.getUserManager().get(uuid); migrateHolder(plugin, world, user, lpUser); diff --git a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBungeePerms.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationBungeePerms.java similarity index 94% rename from common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBungeePerms.java rename to common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationBungeePerms.java index 7b913a46..3a88c29e 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBungeePerms.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationBungeePerms.java @@ -20,19 +20,19 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.migration.subcommands; +package me.lucko.luckperms.common.commands.migration.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.Logger; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SubCommand; -import me.lucko.luckperms.constants.Constants; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SubCommand; +import me.lucko.luckperms.common.constants.Constants; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.utils.ArgumentChecker; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; -import me.lucko.luckperms.utils.ArgumentChecker; import net.alpenblock.bungeeperms.*; import java.util.List; @@ -64,7 +64,7 @@ public class MigrationBungeePerms extends SubCommand { // Make a LuckPerms group for the one being migrated plugin.getDatastore().createAndLoadGroup(g.getName().toLowerCase()); - me.lucko.luckperms.groups.Group group = plugin.getGroupManager().get(g.getName().toLowerCase()); + me.lucko.luckperms.common.groups.Group group = plugin.getGroupManager().get(g.getName().toLowerCase()); try { LogEntry.build() .actor(Constants.getConsoleUUID()).actorName(Constants.getConsoleName()) @@ -188,7 +188,7 @@ public class MigrationBungeePerms extends SubCommand { // Make a LuckPerms user for the one being migrated. plugin.getDatastore().loadUser(u.getUUID(), "null"); - me.lucko.luckperms.users.User user = plugin.getUserManager().get(u.getUUID()); + me.lucko.luckperms.common.users.User user = plugin.getUserManager().get(u.getUUID()); // Migrate global perms for (String perm : u.getPerms()) { diff --git a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationGroupManager.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationGroupManager.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationGroupManager.java rename to common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationGroupManager.java index ed43ce89..c52073e9 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationGroupManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationGroupManager.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.migration.subcommands; +package me.lucko.luckperms.common.commands.migration.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.Logger; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Constants; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Constants; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import org.anjocaido.groupmanager.GlobalGroups; import org.anjocaido.groupmanager.GroupManager; @@ -74,7 +74,7 @@ public class MigrationGroupManager extends SubCommand { for (Group g : gg.getGroupList()) { plugin.getDatastore().createAndLoadGroup(g.getName().toLowerCase()); - me.lucko.luckperms.groups.Group group = plugin.getGroupManager().get(g.getName().toLowerCase()); + me.lucko.luckperms.common.groups.Group group = plugin.getGroupManager().get(g.getName().toLowerCase()); try { LogEntry.build() .actor(Constants.getConsoleUUID()).actorName(Constants.getConsoleName()) @@ -203,7 +203,7 @@ public class MigrationGroupManager extends SubCommand { for (Map.Entry, Boolean>> e : groups.entrySet()) { plugin.getDatastore().createAndLoadGroup(e.getKey()); - me.lucko.luckperms.groups.Group group = plugin.getGroupManager().get(e.getKey()); + me.lucko.luckperms.common.groups.Group group = plugin.getGroupManager().get(e.getKey()); try { LogEntry.build() .actor(Constants.getConsoleUUID()).actorName(Constants.getConsoleName()) @@ -246,7 +246,7 @@ public class MigrationGroupManager extends SubCommand { for (Map.Entry, Boolean>> e : users.entrySet()) { plugin.getDatastore().loadUser(e.getKey(), "null"); - me.lucko.luckperms.users.User user = plugin.getUserManager().get(e.getKey()); + me.lucko.luckperms.common.users.User user = plugin.getUserManager().get(e.getKey()); for (Map.Entry, Boolean> n : e.getValue().entrySet()) { // n.key.key = world diff --git a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPermissionsEx.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationPermissionsEx.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPermissionsEx.java rename to common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationPermissionsEx.java index 62d4d749..65826a22 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPermissionsEx.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationPermissionsEx.java @@ -20,19 +20,19 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.migration.subcommands; +package me.lucko.luckperms.common.commands.migration.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.Logger; import me.lucko.luckperms.api.PlatformType; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Constants; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Constants; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +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.groups.Group; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; import ru.tehkode.permissions.NativeInterface; import ru.tehkode.permissions.PermissionGroup; import ru.tehkode.permissions.PermissionManager; diff --git a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPowerfulPerms.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationPowerfulPerms.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPowerfulPerms.java rename to common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationPowerfulPerms.java index d16e2f08..2221e77c 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPowerfulPerms.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationPowerfulPerms.java @@ -20,22 +20,22 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.migration.subcommands; +package me.lucko.luckperms.common.commands.migration.subcommands; import com.github.cheesesoftware.PowerfulPermsAPI.*; import com.google.common.util.concurrent.ListenableFuture; import com.zaxxer.hikari.HikariDataSource; import lombok.Cleanup; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.Logger; import me.lucko.luckperms.api.data.Callback; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.commands.migration.subcommands.utils.LPResultRunnable; -import me.lucko.luckperms.constants.Constants; -import me.lucko.luckperms.core.PermissionHolder; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.commands.migration.subcommands.utils.LPResultRunnable; +import me.lucko.luckperms.common.constants.Constants; +import me.lucko.luckperms.common.core.PermissionHolder; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.users.User; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; -import me.lucko.luckperms.users.User; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -47,7 +47,7 @@ import java.util.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; -import static me.lucko.luckperms.constants.Permission.MIGRATION; +import static me.lucko.luckperms.common.constants.Permission.MIGRATION; @SuppressWarnings("unchecked") public class MigrationPowerfulPerms extends SubCommand { @@ -247,7 +247,7 @@ public class MigrationPowerfulPerms extends SubCommand { Map groups = pm.getGroups(); // All versions for (Group g : groups.values()) { plugin.getDatastore().createAndLoadGroup(g.getName().toLowerCase()); - final me.lucko.luckperms.groups.Group group = plugin.getGroupManager().get(g.getName().toLowerCase()); + final me.lucko.luckperms.common.groups.Group group = plugin.getGroupManager().get(g.getName().toLowerCase()); try { LogEntry.build() .actor(Constants.getConsoleUUID()).actorName(Constants.getConsoleName()) diff --git a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationZPermissions.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationZPermissions.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationZPermissions.java rename to common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationZPermissions.java index 0476bcd1..aede139b 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationZPermissions.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationZPermissions.java @@ -20,19 +20,19 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.migration.subcommands; +package me.lucko.luckperms.common.commands.migration.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.Logger; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Constants; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Constants; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.utils.ArgumentChecker; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; import org.tyrannyofheaven.bukkit.zPermissions.ZPermissionsService; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/utils/LPResultRunnable.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/utils/LPResultRunnable.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/utils/LPResultRunnable.java rename to common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/utils/LPResultRunnable.java index cee24c8e..8687ced7 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/utils/LPResultRunnable.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/utils/LPResultRunnable.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.migration.subcommands.utils; +package me.lucko.luckperms.common.commands.migration.subcommands.utils; import com.github.cheesesoftware.PowerfulPermsAPI.ResultRunnable; diff --git a/common/src/main/java/me/lucko/luckperms/commands/misc/DebugCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/DebugCommand.java similarity index 83% rename from common/src/main/java/me/lucko/luckperms/commands/misc/DebugCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/misc/DebugCommand.java index 5dd4be8b..f21d8826 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/misc/DebugCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/DebugCommand.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.misc; +package me.lucko.luckperms.common.commands.misc; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SingleMainCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SingleMainCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/misc/ExportCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ExportCommand.java similarity index 92% rename from common/src/main/java/me/lucko/luckperms/commands/misc/ExportCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/misc/ExportCommand.java index a755a2b9..f499beac 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/misc/ExportCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ExportCommand.java @@ -20,21 +20,21 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.misc; +package me.lucko.luckperms.common.commands.misc; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.Logger; import me.lucko.luckperms.api.Node; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SingleMainCommand; -import me.lucko.luckperms.constants.Constants; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.storage.Datastore; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SingleMainCommand; +import me.lucko.luckperms.common.constants.Constants; +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.common.storage.Datastore; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.users.User; import java.io.BufferedWriter; import java.io.File; diff --git a/common/src/main/java/me/lucko/luckperms/commands/misc/ImportCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ImportCommand.java similarity index 86% rename from common/src/main/java/me/lucko/luckperms/commands/misc/ImportCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/misc/ImportCommand.java index fd3ac599..b9fc67c1 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/misc/ImportCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ImportCommand.java @@ -20,15 +20,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.misc; +package me.lucko.luckperms.common.commands.misc; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SingleMainCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.Importer; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SingleMainCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.Importer; import java.io.File; import java.io.IOException; diff --git a/common/src/main/java/me/lucko/luckperms/commands/misc/InfoCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/InfoCommand.java similarity index 81% rename from common/src/main/java/me/lucko/luckperms/commands/misc/InfoCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/misc/InfoCommand.java index 1453dd2d..e0009a21 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/misc/InfoCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/InfoCommand.java @@ -20,19 +20,19 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.misc; +package me.lucko.luckperms.common.commands.misc; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SingleMainCommand; -import me.lucko.luckperms.config.LPConfiguration; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SingleMainCommand; +import me.lucko.luckperms.common.config.LPConfiguration; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; import java.util.List; -import static me.lucko.luckperms.commands.Util.formatBoolean; +import static me.lucko.luckperms.common.commands.Util.formatBoolean; public class InfoCommand extends SingleMainCommand { public InfoCommand() { diff --git a/common/src/main/java/me/lucko/luckperms/commands/misc/QueueCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/QueueCommand.java similarity index 81% rename from common/src/main/java/me/lucko/luckperms/commands/misc/QueueCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/misc/QueueCommand.java index c0dbe873..fe3314ff 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/misc/QueueCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/QueueCommand.java @@ -20,15 +20,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.misc; +package me.lucko.luckperms.common.commands.misc; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.ConsecutiveExecutor; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SingleMainCommand; -import me.lucko.luckperms.constants.Constants; -import me.lucko.luckperms.constants.Permission; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.ConsecutiveExecutor; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SingleMainCommand; +import me.lucko.luckperms.common.constants.Constants; +import me.lucko.luckperms.common.constants.Permission; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/misc/SyncCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/SyncCommand.java similarity index 80% rename from common/src/main/java/me/lucko/luckperms/commands/misc/SyncCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/misc/SyncCommand.java index 4aca7671..f1f433ea 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/misc/SyncCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/SyncCommand.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.misc; +package me.lucko.luckperms.common.commands.misc; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SingleMainCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SingleMainCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/CreateTrack.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/CreateTrack.java similarity index 83% rename from common/src/main/java/me/lucko/luckperms/commands/track/CreateTrack.java rename to common/src/main/java/me/lucko/luckperms/common/commands/track/CreateTrack.java index 078134fc..8adbd628 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/CreateTrack.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/CreateTrack.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.track; +package me.lucko.luckperms.common.commands.track; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SingleMainCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SingleMainCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/DeleteTrack.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/DeleteTrack.java similarity index 86% rename from common/src/main/java/me/lucko/luckperms/commands/track/DeleteTrack.java rename to common/src/main/java/me/lucko/luckperms/common/commands/track/DeleteTrack.java index e75acdef..78307c54 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/DeleteTrack.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/DeleteTrack.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.track; +package me.lucko.luckperms.common.commands.track; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SingleMainCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; -import me.lucko.luckperms.tracks.Track; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SingleMainCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.tracks.Track; import java.util.ArrayList; import java.util.Collections; diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/ListTracks.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/ListTracks.java similarity index 81% rename from common/src/main/java/me/lucko/luckperms/commands/track/ListTracks.java rename to common/src/main/java/me/lucko/luckperms/common/commands/track/ListTracks.java index 366e2b66..657e9803 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/ListTracks.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/ListTracks.java @@ -20,15 +20,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.track; +package me.lucko.luckperms.common.commands.track; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SingleMainCommand; -import me.lucko.luckperms.commands.Util; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SingleMainCommand; +import me.lucko.luckperms.common.commands.Util; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/TrackMainCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackMainCommand.java similarity index 85% rename from common/src/main/java/me/lucko/luckperms/commands/track/TrackMainCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/track/TrackMainCommand.java index 52c8f21b..567aa363 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/TrackMainCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/TrackMainCommand.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.track; +package me.lucko.luckperms.common.commands.track; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.MainCommand; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SubCommand; -import me.lucko.luckperms.commands.track.subcommands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.tracks.Track; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.MainCommand; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SubCommand; +import me.lucko.luckperms.common.commands.track.subcommands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.tracks.Track; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackAppend.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackAppend.java similarity index 87% rename from common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackAppend.java rename to common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackAppend.java index 7e079f93..31b189f5 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackAppend.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackAppend.java @@ -20,17 +20,17 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.track.subcommands; +package me.lucko.luckperms.common.commands.track.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.utils.ArgumentChecker; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackClear.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackClear.java similarity index 77% rename from common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackClear.java rename to common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackClear.java index 69cd39c8..942ee292 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackClear.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackClear.java @@ -20,17 +20,17 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.track.subcommands; +package me.lucko.luckperms.common.commands.track.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SubCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; -import me.lucko.luckperms.tracks.Track; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SubCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.tracks.Track; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackClone.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackClone.java similarity index 86% rename from common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackClone.java rename to common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackClone.java index b092b2e9..85b20732 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackClone.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackClone.java @@ -20,15 +20,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.track.subcommands; +package me.lucko.luckperms.common.commands.track.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInfo.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackInfo.java similarity index 84% rename from common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInfo.java rename to common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackInfo.java index fb5dbbbc..36953292 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackInfo.java @@ -20,13 +20,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.track.subcommands; +package me.lucko.luckperms.common.commands.track.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.tracks.Track; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.tracks.Track; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInsert.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackInsert.java similarity index 89% rename from common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInsert.java rename to common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackInsert.java index f411b9a7..255ee767 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInsert.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackInsert.java @@ -20,17 +20,17 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.track.subcommands; +package me.lucko.luckperms.common.commands.track.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.utils.ArgumentChecker; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRemove.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackRemove.java similarity index 86% rename from common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRemove.java rename to common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackRemove.java index 9d399bc0..996aa186 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRemove.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackRemove.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.track.subcommands; +package me.lucko.luckperms.common.commands.track.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.utils.ArgumentChecker; import me.lucko.luckperms.exceptions.ObjectLacksException; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRename.java b/common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackRename.java similarity index 87% rename from common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRename.java rename to common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackRename.java index f9aadeb2..134c1291 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRename.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/track/subcommands/TrackRename.java @@ -20,15 +20,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.track.subcommands; +package me.lucko.luckperms.common.commands.track.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/UserMainCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserMainCommand.java similarity index 86% rename from common/src/main/java/me/lucko/luckperms/commands/user/UserMainCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/UserMainCommand.java index fc127179..812c171d 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/UserMainCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserMainCommand.java @@ -20,19 +20,19 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user; +package me.lucko.luckperms.common.commands.user; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.MainCommand; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SubCommand; -import me.lucko.luckperms.commands.Util; -import me.lucko.luckperms.commands.meta.MetaCommands; -import me.lucko.luckperms.commands.user.subcommands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Patterns; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.MainCommand; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SubCommand; +import me.lucko.luckperms.common.commands.Util; +import me.lucko.luckperms.common.commands.meta.MetaCommands; +import me.lucko.luckperms.common.commands.user.subcommands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Patterns; +import me.lucko.luckperms.common.users.User; import java.util.List; import java.util.UUID; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddGroup.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserAddGroup.java similarity index 90% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddGroup.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserAddGroup.java index c028bf77..1fb5c914 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddGroup.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserAddGroup.java @@ -20,17 +20,17 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +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.groups.Group; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempGroup.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserAddTempGroup.java similarity index 91% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempGroup.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserAddTempGroup.java index 30625cf0..b39f9253 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempGroup.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserAddTempGroup.java @@ -20,18 +20,18 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +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.common.utils.DateUtil; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; -import me.lucko.luckperms.utils.DateUtil; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserBulkChange.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserBulkChange.java similarity index 88% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserBulkChange.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserBulkChange.java index cd3d5662..509e3a61 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserBulkChange.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserBulkChange.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.Node; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.users.User; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectLacksException; -import me.lucko.luckperms.users.User; import java.util.HashSet; import java.util.Iterator; @@ -79,7 +79,7 @@ public class UserBulkChange extends SubCommand { } 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 { while (iterator.hasNext()) { @@ -95,7 +95,7 @@ public class UserBulkChange extends SubCommand { } 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()); } } diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserClear.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserClear.java similarity index 87% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserClear.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserClear.java index 46783b8f..3d283ca8 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserClear.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserClear.java @@ -20,15 +20,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.utils.ArgumentChecker; import java.util.List; import java.util.stream.Collectors; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserDemote.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserDemote.java similarity index 88% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserDemote.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserDemote.java index 51a54edc..3b980dfd 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserDemote.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserDemote.java @@ -20,22 +20,22 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.event.events.UserDemoteEvent; -import me.lucko.luckperms.api.implementation.internal.TrackLink; -import me.lucko.luckperms.api.implementation.internal.UserLink; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.api.internal.TrackLink; +import me.lucko.luckperms.common.api.internal.UserLink; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.tracks.Track; +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.ObjectLacksException; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserGetUUID.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserGetUUID.java similarity index 77% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserGetUUID.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserGetUUID.java index b6047eb1..632f8e36 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserGetUUID.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserGetUUID.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SubCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SubCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.users.User; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserHasPerm.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserHasPerm.java similarity index 86% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserHasPerm.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserHasPerm.java index 82d92773..ed76bf55 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserHasPerm.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserHasPerm.java @@ -20,15 +20,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.core.Node; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.core.Node; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInfo.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserInfo.java similarity index 79% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInfo.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserInfo.java index 731a8d36..e5e0378d 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserInfo.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Predicate; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SubCommand; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Predicate; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SubCommand; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.users.User; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInheritsPerm.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserInheritsPerm.java similarity index 87% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInheritsPerm.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserInheritsPerm.java index 8a61e588..e27cb7cc 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInheritsPerm.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserInheritsPerm.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.core.InheritanceInfo; -import me.lucko.luckperms.core.Node; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.core.InheritanceInfo; +import me.lucko.luckperms.common.core.Node; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListGroups.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserListGroups.java similarity index 85% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListGroups.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserListGroups.java index e3440dd4..e203cd72 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListGroups.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserListGroups.java @@ -20,13 +20,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.users.User; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListNodes.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserListNodes.java similarity index 85% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListNodes.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserListNodes.java index 7889b5a8..39f49477 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListNodes.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserListNodes.java @@ -20,13 +20,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.users.User; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserPromote.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserPromote.java similarity index 88% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserPromote.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserPromote.java index 2437854b..c7c916da 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserPromote.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserPromote.java @@ -20,22 +20,22 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.event.events.UserPromoteEvent; -import me.lucko.luckperms.api.implementation.internal.TrackLink; -import me.lucko.luckperms.api.implementation.internal.UserLink; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.api.internal.TrackLink; +import me.lucko.luckperms.common.api.internal.UserLink; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.tracks.Track; +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.ObjectLacksException; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveGroup.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserRemoveGroup.java similarity index 91% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveGroup.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserRemoveGroup.java index a85284b5..f526c036 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveGroup.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserRemoveGroup.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.utils.ArgumentChecker; import me.lucko.luckperms.exceptions.ObjectLacksException; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempGroup.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserRemoveTempGroup.java similarity index 91% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempGroup.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserRemoveTempGroup.java index 80d5b666..b36fe169 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempGroup.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserRemoveTempGroup.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.utils.ArgumentChecker; import me.lucko.luckperms.exceptions.ObjectLacksException; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPermission.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserSetPermission.java similarity index 91% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPermission.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserSetPermission.java index 1f13ede5..fb9bb240 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPermission.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserSetPermission.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.utils.ArgumentChecker; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPrimaryGroup.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserSetPrimaryGroup.java similarity index 87% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPrimaryGroup.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserSetPrimaryGroup.java index b1bbc2bc..221cd804 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPrimaryGroup.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserSetPrimaryGroup.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.users.User; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.users.User; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetTempPermission.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserSetTempPermission.java similarity index 92% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetTempPermission.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserSetTempPermission.java index 586f4bbf..fb054500 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetTempPermission.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserSetTempPermission.java @@ -20,17 +20,17 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.utils.ArgumentChecker; +import me.lucko.luckperms.common.utils.DateUtil; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; -import me.lucko.luckperms.utils.DateUtil; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowPos.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserShowPos.java similarity index 87% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowPos.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserShowPos.java index cfcb416f..9de7c10b 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowPos.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserShowPos.java @@ -20,15 +20,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowTracks.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserShowTracks.java similarity index 86% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowTracks.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserShowTracks.java index b90650d9..c46f349a 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowTracks.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserShowTracks.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.users.User; import java.util.List; import java.util.stream.Collectors; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnSetPermission.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserUnSetPermission.java similarity index 90% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnSetPermission.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserUnSetPermission.java index 6081f7f5..3c8fd1de 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnSetPermission.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserUnSetPermission.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.utils.ArgumentChecker; import me.lucko.luckperms.exceptions.ObjectLacksException; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnsetTempPermission.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserUnsetTempPermission.java similarity index 91% rename from common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnsetTempPermission.java rename to common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserUnsetTempPermission.java index 3384b8f1..0c2862aa 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnsetTempPermission.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/subcommands/UserUnsetTempPermission.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.user.subcommands; +package me.lucko.luckperms.common.commands.user.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.data.LogEntry; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.data.LogEntry; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.utils.ArgumentChecker; import me.lucko.luckperms.exceptions.ObjectLacksException; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.ArgumentChecker; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/usersbulkedit/UsersBulkEditMainCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/UsersBulkEditMainCommand.java similarity index 86% rename from common/src/main/java/me/lucko/luckperms/commands/usersbulkedit/UsersBulkEditMainCommand.java rename to common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/UsersBulkEditMainCommand.java index 9da6b87a..09126a0d 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/usersbulkedit/UsersBulkEditMainCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/UsersBulkEditMainCommand.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.usersbulkedit; +package me.lucko.luckperms.common.commands.usersbulkedit; import com.google.common.collect.ImmutableList; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.MainCommand; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.SubCommand; -import me.lucko.luckperms.commands.usersbulkedit.subcommands.BulkEditGroup; -import me.lucko.luckperms.commands.usersbulkedit.subcommands.BulkEditPermission; -import me.lucko.luckperms.storage.Datastore; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.MainCommand; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.SubCommand; +import me.lucko.luckperms.common.commands.usersbulkedit.subcommands.BulkEditGroup; +import me.lucko.luckperms.common.commands.usersbulkedit.subcommands.BulkEditPermission; +import me.lucko.luckperms.common.storage.Datastore; import java.util.Collections; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/commands/usersbulkedit/subcommands/BulkEditGroup.java b/common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/subcommands/BulkEditGroup.java similarity index 89% rename from common/src/main/java/me/lucko/luckperms/commands/usersbulkedit/subcommands/BulkEditGroup.java rename to common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/subcommands/BulkEditGroup.java index 93be422e..359760ed 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/usersbulkedit/subcommands/BulkEditGroup.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/subcommands/BulkEditGroup.java @@ -20,17 +20,17 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.usersbulkedit.subcommands; +package me.lucko.luckperms.common.commands.usersbulkedit.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.Node; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.storage.Datastore; +import me.lucko.luckperms.common.users.User; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectLacksException; -import me.lucko.luckperms.storage.Datastore; -import me.lucko.luckperms.users.User; import java.util.*; @@ -96,7 +96,7 @@ public class BulkEditGroup extends SubCommand { } 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 { while (iterator.hasNext()) { @@ -120,7 +120,7 @@ public class BulkEditGroup extends SubCommand { } 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()); } } diff --git a/common/src/main/java/me/lucko/luckperms/commands/usersbulkedit/subcommands/BulkEditPermission.java b/common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/subcommands/BulkEditPermission.java similarity index 88% rename from common/src/main/java/me/lucko/luckperms/commands/usersbulkedit/subcommands/BulkEditPermission.java rename to common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/subcommands/BulkEditPermission.java index c7204cb4..ba700c72 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/usersbulkedit/subcommands/BulkEditPermission.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/subcommands/BulkEditPermission.java @@ -20,17 +20,17 @@ * SOFTWARE. */ -package me.lucko.luckperms.commands.usersbulkedit.subcommands; +package me.lucko.luckperms.common.commands.usersbulkedit.subcommands; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.Node; -import me.lucko.luckperms.commands.*; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.*; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.storage.Datastore; +import me.lucko.luckperms.common.users.User; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectLacksException; -import me.lucko.luckperms.storage.Datastore; -import me.lucko.luckperms.users.User; import java.util.*; @@ -91,7 +91,7 @@ public class BulkEditPermission extends SubCommand { } 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 { while (iterator.hasNext()) { @@ -111,7 +111,7 @@ public class BulkEditPermission extends SubCommand { } 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()); } } diff --git a/common/src/main/java/me/lucko/luckperms/config/AbstractConfiguration.java b/common/src/main/java/me/lucko/luckperms/common/config/AbstractConfiguration.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/config/AbstractConfiguration.java rename to common/src/main/java/me/lucko/luckperms/common/config/AbstractConfiguration.java index 03ea36c8..4852ac57 100644 --- a/common/src/main/java/me/lucko/luckperms/config/AbstractConfiguration.java +++ b/common/src/main/java/me/lucko/luckperms/common/config/AbstractConfiguration.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.config; +package me.lucko.luckperms.common.config; import com.google.common.collect.ImmutableMap; import lombok.AccessLevel; import lombok.Getter; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.constants.Patterns; -import me.lucko.luckperms.storage.DatastoreConfiguration; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.constants.Patterns; +import me.lucko.luckperms.common.storage.DatastoreConfiguration; import java.util.Collections; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/config/LPConfiguration.java b/common/src/main/java/me/lucko/luckperms/common/config/LPConfiguration.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/config/LPConfiguration.java rename to common/src/main/java/me/lucko/luckperms/common/config/LPConfiguration.java index 631f4c71..eea23951 100644 --- a/common/src/main/java/me/lucko/luckperms/config/LPConfiguration.java +++ b/common/src/main/java/me/lucko/luckperms/common/config/LPConfiguration.java @@ -20,9 +20,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.config; +package me.lucko.luckperms.common.config; -import me.lucko.luckperms.storage.DatastoreConfiguration; +import me.lucko.luckperms.common.storage.DatastoreConfiguration; import java.util.Map; diff --git a/common/src/main/java/me/lucko/luckperms/constants/Constants.java b/common/src/main/java/me/lucko/luckperms/common/constants/Constants.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/constants/Constants.java rename to common/src/main/java/me/lucko/luckperms/common/constants/Constants.java index 4e38f4f4..d4e07d88 100644 --- a/common/src/main/java/me/lucko/luckperms/constants/Constants.java +++ b/common/src/main/java/me/lucko/luckperms/common/constants/Constants.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.constants; +package me.lucko.luckperms.common.constants; import lombok.Getter; import lombok.experimental.UtilityClass; diff --git a/common/src/main/java/me/lucko/luckperms/constants/Message.java b/common/src/main/java/me/lucko/luckperms/common/constants/Message.java similarity index 99% rename from common/src/main/java/me/lucko/luckperms/constants/Message.java rename to common/src/main/java/me/lucko/luckperms/common/constants/Message.java index 78464260..a7c21494 100644 --- a/common/src/main/java/me/lucko/luckperms/constants/Message.java +++ b/common/src/main/java/me/lucko/luckperms/common/constants/Message.java @@ -20,12 +20,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.constants; +package me.lucko.luckperms.common.constants; import lombok.AllArgsConstructor; import lombok.Getter; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.Util; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.Util; @SuppressWarnings("SpellCheckingInspection") @AllArgsConstructor diff --git a/common/src/main/java/me/lucko/luckperms/constants/Patterns.java b/common/src/main/java/me/lucko/luckperms/common/constants/Patterns.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/constants/Patterns.java rename to common/src/main/java/me/lucko/luckperms/common/constants/Patterns.java index a85b781b..fa9edb93 100644 --- a/common/src/main/java/me/lucko/luckperms/constants/Patterns.java +++ b/common/src/main/java/me/lucko/luckperms/common/constants/Patterns.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.constants; +package me.lucko.luckperms.common.constants; import lombok.experimental.UtilityClass; diff --git a/common/src/main/java/me/lucko/luckperms/constants/Permission.java b/common/src/main/java/me/lucko/luckperms/common/constants/Permission.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/constants/Permission.java rename to common/src/main/java/me/lucko/luckperms/common/constants/Permission.java index d440d163..da8d5a63 100644 --- a/common/src/main/java/me/lucko/luckperms/constants/Permission.java +++ b/common/src/main/java/me/lucko/luckperms/common/constants/Permission.java @@ -20,11 +20,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.constants; +package me.lucko.luckperms.common.constants; import lombok.AllArgsConstructor; import lombok.Getter; -import me.lucko.luckperms.commands.Sender; +import me.lucko.luckperms.common.commands.Sender; @SuppressWarnings("SpellCheckingInspection") @Getter diff --git a/common/src/main/java/me/lucko/luckperms/contexts/ContextManager.java b/common/src/main/java/me/lucko/luckperms/common/contexts/ContextManager.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/contexts/ContextManager.java rename to common/src/main/java/me/lucko/luckperms/common/contexts/ContextManager.java index ba2d94ce..998dd6ff 100644 --- a/common/src/main/java/me/lucko/luckperms/contexts/ContextManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/contexts/ContextManager.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.contexts; +package me.lucko.luckperms.common.contexts; import me.lucko.luckperms.api.context.ContextListener; import me.lucko.luckperms.api.context.IContextCalculator; diff --git a/common/src/main/java/me/lucko/luckperms/contexts/ServerCalculator.java b/common/src/main/java/me/lucko/luckperms/common/contexts/ServerCalculator.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/contexts/ServerCalculator.java rename to common/src/main/java/me/lucko/luckperms/common/contexts/ServerCalculator.java index 7d541a76..f6ae4d18 100644 --- a/common/src/main/java/me/lucko/luckperms/contexts/ServerCalculator.java +++ b/common/src/main/java/me/lucko/luckperms/common/contexts/ServerCalculator.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.contexts; +package me.lucko.luckperms.common.contexts; import lombok.AllArgsConstructor; import me.lucko.luckperms.api.context.ContextCalculator; diff --git a/common/src/main/java/me/lucko/luckperms/core/InheritanceInfo.java b/common/src/main/java/me/lucko/luckperms/common/core/InheritanceInfo.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/core/InheritanceInfo.java rename to common/src/main/java/me/lucko/luckperms/common/core/InheritanceInfo.java index 5e6c7cef..9cdae4ad 100644 --- a/common/src/main/java/me/lucko/luckperms/core/InheritanceInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/core/InheritanceInfo.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.core; +package me.lucko.luckperms.common.core; import lombok.*; import me.lucko.luckperms.api.LocalizedNode; diff --git a/common/src/main/java/me/lucko/luckperms/core/Node.java b/common/src/main/java/me/lucko/luckperms/common/core/Node.java similarity index 99% rename from common/src/main/java/me/lucko/luckperms/core/Node.java rename to common/src/main/java/me/lucko/luckperms/common/core/Node.java index 8612773a..e9e479da 100644 --- a/common/src/main/java/me/lucko/luckperms/core/Node.java +++ b/common/src/main/java/me/lucko/luckperms/common/core/Node.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.core; +package me.lucko.luckperms.common.core; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import lombok.*; import me.lucko.luckperms.api.Tristate; -import me.lucko.luckperms.constants.Patterns; -import me.lucko.luckperms.utils.ArgumentChecker; +import me.lucko.luckperms.common.constants.Patterns; +import me.lucko.luckperms.common.utils.ArgumentChecker; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/common/src/main/java/me/lucko/luckperms/core/PermissionHolder.java b/common/src/main/java/me/lucko/luckperms/common/core/PermissionHolder.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/core/PermissionHolder.java rename to common/src/main/java/me/lucko/luckperms/common/core/PermissionHolder.java index e5af7dea..a36fa209 100644 --- a/common/src/main/java/me/lucko/luckperms/core/PermissionHolder.java +++ b/common/src/main/java/me/lucko/luckperms/common/core/PermissionHolder.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.core; +package me.lucko.luckperms.common.core; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -28,7 +28,6 @@ import com.google.common.collect.ImmutableSortedSet; import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.LocalizedNode; import me.lucko.luckperms.api.Node; @@ -37,11 +36,12 @@ import me.lucko.luckperms.api.event.events.GroupRemoveEvent; import me.lucko.luckperms.api.event.events.PermissionNodeExpireEvent; import me.lucko.luckperms.api.event.events.PermissionNodeSetEvent; import me.lucko.luckperms.api.event.events.PermissionNodeUnsetEvent; -import me.lucko.luckperms.api.implementation.internal.PermissionHolderLink; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.api.internal.PermissionHolderLink; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.utils.Cache; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectLacksException; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.utils.Cache; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -140,7 +140,7 @@ public abstract class PermissionHolder { this.nodes.clear(); this.nodes.addAll(nodes.entrySet().stream() - .map(e -> me.lucko.luckperms.core.Node.fromSerialisedNode(e.getKey(), e.getValue())) + .map(e -> me.lucko.luckperms.common.core.Node.fromSerialisedNode(e.getKey(), e.getValue())) .collect(Collectors.toList())); } @@ -250,11 +250,11 @@ public abstract class PermissionHolder { TreeSet combined = new TreeSet<>(PriorityComparator.reverse()); getNodes().stream() - .map(n -> me.lucko.luckperms.utils.LocalizedNode.of(n, getObjectName())) + .map(n -> me.lucko.luckperms.common.utils.LocalizedNode.of(n, getObjectName())) .forEach(combined::add); getTransientNodes().stream() - .map(n -> me.lucko.luckperms.utils.LocalizedNode.of(n, getObjectName())) + .map(n -> me.lucko.luckperms.common.utils.LocalizedNode.of(n, getObjectName())) .forEach(combined::add); TreeSet permissions = new TreeSet<>(PriorityComparator.reverse()); @@ -740,6 +740,6 @@ public abstract class PermissionHolder { } private static Node.Builder buildNode(String permission) { - return new me.lucko.luckperms.core.Node.Builder(permission); + return new me.lucko.luckperms.common.core.Node.Builder(permission); } } diff --git a/common/src/main/java/me/lucko/luckperms/core/PriorityComparator.java b/common/src/main/java/me/lucko/luckperms/common/core/PriorityComparator.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/core/PriorityComparator.java rename to common/src/main/java/me/lucko/luckperms/common/core/PriorityComparator.java index 90784266..61ac68bc 100644 --- a/common/src/main/java/me/lucko/luckperms/core/PriorityComparator.java +++ b/common/src/main/java/me/lucko/luckperms/common/core/PriorityComparator.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.core; +package me.lucko.luckperms.common.core; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/common/src/main/java/me/lucko/luckperms/core/UuidCache.java b/common/src/main/java/me/lucko/luckperms/common/core/UuidCache.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/core/UuidCache.java rename to common/src/main/java/me/lucko/luckperms/common/core/UuidCache.java index 51eab71d..09030961 100644 --- a/common/src/main/java/me/lucko/luckperms/core/UuidCache.java +++ b/common/src/main/java/me/lucko/luckperms/common/core/UuidCache.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.core; +package me.lucko.luckperms.common.core; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; diff --git a/common/src/main/java/me/lucko/luckperms/data/Importer.java b/common/src/main/java/me/lucko/luckperms/common/data/Importer.java similarity index 93% rename from common/src/main/java/me/lucko/luckperms/data/Importer.java rename to common/src/main/java/me/lucko/luckperms/common/data/Importer.java index 243daf6e..1586014c 100644 --- a/common/src/main/java/me/lucko/luckperms/data/Importer.java +++ b/common/src/main/java/me/lucko/luckperms/common/data/Importer.java @@ -20,20 +20,20 @@ * SOFTWARE. */ -package me.lucko.luckperms.data; +package me.lucko.luckperms.common.data; import com.google.common.base.Splitter; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.commands.CommandManager; -import me.lucko.luckperms.commands.CommandResult; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.commands.Util; -import me.lucko.luckperms.constants.Constants; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandManager; +import me.lucko.luckperms.common.commands.CommandResult; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.commands.Util; +import me.lucko.luckperms.common.constants.Constants; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; import java.util.*; import java.util.stream.Collectors; diff --git a/common/src/main/java/me/lucko/luckperms/data/Log.java b/common/src/main/java/me/lucko/luckperms/common/data/Log.java similarity index 99% rename from common/src/main/java/me/lucko/luckperms/data/Log.java rename to common/src/main/java/me/lucko/luckperms/common/data/Log.java index 7126eae1..30752053 100644 --- a/common/src/main/java/me/lucko/luckperms/data/Log.java +++ b/common/src/main/java/me/lucko/luckperms/common/data/Log.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.data; +package me.lucko.luckperms.common.data; import com.google.common.collect.ImmutableSortedSet; import lombok.Getter; diff --git a/common/src/main/java/me/lucko/luckperms/data/LogEntry.java b/common/src/main/java/me/lucko/luckperms/common/data/LogEntry.java similarity index 91% rename from common/src/main/java/me/lucko/luckperms/data/LogEntry.java rename to common/src/main/java/me/lucko/luckperms/common/data/LogEntry.java index 302e01cd..105d0a2f 100644 --- a/common/src/main/java/me/lucko/luckperms/data/LogEntry.java +++ b/common/src/main/java/me/lucko/luckperms/common/data/LogEntry.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.data; +package me.lucko.luckperms.common.data; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.event.events.LogNotifyEvent; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.core.PermissionHolder; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.core.PermissionHolder; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.users.User; import java.util.List; diff --git a/common/src/main/java/me/lucko/luckperms/groups/Group.java b/common/src/main/java/me/lucko/luckperms/common/groups/Group.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/groups/Group.java rename to common/src/main/java/me/lucko/luckperms/common/groups/Group.java index 28aa3d60..faf2f8fa 100644 --- a/common/src/main/java/me/lucko/luckperms/groups/Group.java +++ b/common/src/main/java/me/lucko/luckperms/common/groups/Group.java @@ -20,19 +20,19 @@ * SOFTWARE. */ -package me.lucko.luckperms.groups; +package me.lucko.luckperms.common.groups; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.event.events.GroupAddEvent; -import me.lucko.luckperms.api.implementation.internal.GroupLink; -import me.lucko.luckperms.api.implementation.internal.PermissionHolderLink; -import me.lucko.luckperms.core.PermissionHolder; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.api.internal.GroupLink; +import me.lucko.luckperms.common.api.internal.PermissionHolderLink; +import me.lucko.luckperms.common.core.PermissionHolder; +import me.lucko.luckperms.common.utils.Identifiable; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectLacksException; -import me.lucko.luckperms.utils.Identifiable; @ToString(of = {"name"}) @EqualsAndHashCode(of = {"name"}, callSuper = false) diff --git a/common/src/main/java/me/lucko/luckperms/groups/GroupManager.java b/common/src/main/java/me/lucko/luckperms/common/groups/GroupManager.java similarity index 91% rename from common/src/main/java/me/lucko/luckperms/groups/GroupManager.java rename to common/src/main/java/me/lucko/luckperms/common/groups/GroupManager.java index 097e555c..bc497f61 100644 --- a/common/src/main/java/me/lucko/luckperms/groups/GroupManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/groups/GroupManager.java @@ -20,11 +20,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.groups; +package me.lucko.luckperms.common.groups; import lombok.RequiredArgsConstructor; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.utils.AbstractManager; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.utils.AbstractManager; @RequiredArgsConstructor public class GroupManager extends AbstractManager { diff --git a/common/src/main/java/me/lucko/luckperms/runnables/ExpireTemporaryTask.java b/common/src/main/java/me/lucko/luckperms/common/runnables/ExpireTemporaryTask.java similarity index 88% rename from common/src/main/java/me/lucko/luckperms/runnables/ExpireTemporaryTask.java rename to common/src/main/java/me/lucko/luckperms/common/runnables/ExpireTemporaryTask.java index e8f5def6..2d1a1bca 100644 --- a/common/src/main/java/me/lucko/luckperms/runnables/ExpireTemporaryTask.java +++ b/common/src/main/java/me/lucko/luckperms/common/runnables/ExpireTemporaryTask.java @@ -20,13 +20,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.runnables; +package me.lucko.luckperms.common.runnables; import lombok.AllArgsConstructor; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.core.PermissionHolder; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.core.PermissionHolder; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.users.User; @AllArgsConstructor public class ExpireTemporaryTask implements Runnable { diff --git a/common/src/main/java/me/lucko/luckperms/runnables/UpdateTask.java b/common/src/main/java/me/lucko/luckperms/common/runnables/UpdateTask.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/runnables/UpdateTask.java rename to common/src/main/java/me/lucko/luckperms/common/runnables/UpdateTask.java index 1893af5c..2842e18d 100644 --- a/common/src/main/java/me/lucko/luckperms/runnables/UpdateTask.java +++ b/common/src/main/java/me/lucko/luckperms/common/runnables/UpdateTask.java @@ -20,12 +20,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.runnables; +package me.lucko.luckperms.common.runnables; import lombok.AllArgsConstructor; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.event.events.PostSyncEvent; import me.lucko.luckperms.api.event.events.PreSyncEvent; +import me.lucko.luckperms.common.LuckPermsPlugin; @AllArgsConstructor public class UpdateTask implements Runnable { diff --git a/common/src/main/java/me/lucko/luckperms/storage/Datastore.java b/common/src/main/java/me/lucko/luckperms/common/storage/Datastore.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/storage/Datastore.java rename to common/src/main/java/me/lucko/luckperms/common/storage/Datastore.java index b1c65aaf..9d55a18c 100644 --- a/common/src/main/java/me/lucko/luckperms/storage/Datastore.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/Datastore.java @@ -20,19 +20,19 @@ * SOFTWARE. */ -package me.lucko.luckperms.storage; +package me.lucko.luckperms.common.storage; import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.LogEntry; import me.lucko.luckperms.api.data.Callback; -import me.lucko.luckperms.data.Log; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.data.Log; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.users.User; import java.util.Set; import java.util.UUID; diff --git a/common/src/main/java/me/lucko/luckperms/storage/DatastoreConfiguration.java b/common/src/main/java/me/lucko/luckperms/common/storage/DatastoreConfiguration.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/storage/DatastoreConfiguration.java rename to common/src/main/java/me/lucko/luckperms/common/storage/DatastoreConfiguration.java index a492d537..fa1be048 100644 --- a/common/src/main/java/me/lucko/luckperms/storage/DatastoreConfiguration.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/DatastoreConfiguration.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.storage; +package me.lucko.luckperms.common.storage; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/common/src/main/java/me/lucko/luckperms/storage/SplitDatastore.java b/common/src/main/java/me/lucko/luckperms/common/storage/SplitDatastore.java similarity index 94% rename from common/src/main/java/me/lucko/luckperms/storage/SplitDatastore.java rename to common/src/main/java/me/lucko/luckperms/common/storage/SplitDatastore.java index ddb792ca..e15d7d30 100644 --- a/common/src/main/java/me/lucko/luckperms/storage/SplitDatastore.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/SplitDatastore.java @@ -20,15 +20,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.storage; +package me.lucko.luckperms.common.storage; import com.google.common.collect.ImmutableMap; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.LogEntry; -import me.lucko.luckperms.data.Log; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.data.Log; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.users.User; import java.util.Map; import java.util.Set; diff --git a/common/src/main/java/me/lucko/luckperms/storage/StorageFactory.java b/common/src/main/java/me/lucko/luckperms/common/storage/StorageFactory.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/storage/StorageFactory.java rename to common/src/main/java/me/lucko/luckperms/common/storage/StorageFactory.java index 9ac6bea1..e1553cf6 100644 --- a/common/src/main/java/me/lucko/luckperms/storage/StorageFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/StorageFactory.java @@ -20,12 +20,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.storage; +package me.lucko.luckperms.common.storage; import com.google.common.collect.ImmutableSet; import lombok.experimental.UtilityClass; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.storage.methods.*; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.storage.methods.*; import java.io.File; import java.util.HashMap; diff --git a/common/src/main/java/me/lucko/luckperms/storage/methods/FlatfileDatastore.java b/common/src/main/java/me/lucko/luckperms/common/storage/methods/FlatfileDatastore.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/storage/methods/FlatfileDatastore.java rename to common/src/main/java/me/lucko/luckperms/common/storage/methods/FlatfileDatastore.java index eb196867..d6ef1ca6 100644 --- a/common/src/main/java/me/lucko/luckperms/storage/methods/FlatfileDatastore.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/methods/FlatfileDatastore.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.storage.methods; +package me.lucko.luckperms.common.storage.methods; import lombok.Cleanup; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.LogEntry; -import me.lucko.luckperms.constants.Constants; -import me.lucko.luckperms.data.Log; -import me.lucko.luckperms.storage.Datastore; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.constants.Constants; +import me.lucko.luckperms.common.data.Log; +import me.lucko.luckperms.common.storage.Datastore; import java.io.*; import java.util.*; diff --git a/common/src/main/java/me/lucko/luckperms/storage/methods/H2Datastore.java b/common/src/main/java/me/lucko/luckperms/common/storage/methods/H2Datastore.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/storage/methods/H2Datastore.java rename to common/src/main/java/me/lucko/luckperms/common/storage/methods/H2Datastore.java index 8a58e8e2..bc50f263 100644 --- a/common/src/main/java/me/lucko/luckperms/storage/methods/H2Datastore.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/methods/H2Datastore.java @@ -20,10 +20,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.storage.methods; +package me.lucko.luckperms.common.storage.methods; import lombok.Cleanup; -import me.lucko.luckperms.LuckPermsPlugin; +import me.lucko.luckperms.common.LuckPermsPlugin; import java.io.File; import java.sql.*; diff --git a/common/src/main/java/me/lucko/luckperms/storage/methods/JSONDatastore.java b/common/src/main/java/me/lucko/luckperms/common/storage/methods/JSONDatastore.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/storage/methods/JSONDatastore.java rename to common/src/main/java/me/lucko/luckperms/common/storage/methods/JSONDatastore.java index fb0636cb..e888a89f 100644 --- a/common/src/main/java/me/lucko/luckperms/storage/methods/JSONDatastore.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/methods/JSONDatastore.java @@ -20,26 +20,26 @@ * SOFTWARE. */ -package me.lucko.luckperms.storage.methods; +package me.lucko.luckperms.common.storage.methods; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import lombok.Cleanup; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.core.Node; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.groups.GroupManager; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.tracks.TrackManager; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.users.UserIdentifier; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.core.Node; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.groups.GroupManager; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.tracks.TrackManager; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.users.UserIdentifier; import java.io.*; import java.util.*; import java.util.concurrent.Callable; import java.util.stream.Collectors; -import static me.lucko.luckperms.core.PermissionHolder.exportToLegacy; +import static me.lucko.luckperms.common.core.PermissionHolder.exportToLegacy; @SuppressWarnings("ResultOfMethodCallIgnored") public class JSONDatastore extends FlatfileDatastore { diff --git a/common/src/main/java/me/lucko/luckperms/storage/methods/MongoDBDatastore.java b/common/src/main/java/me/lucko/luckperms/common/storage/methods/MongoDBDatastore.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/storage/methods/MongoDBDatastore.java rename to common/src/main/java/me/lucko/luckperms/common/storage/methods/MongoDBDatastore.java index c73cfe2a..ae0854ac 100644 --- a/common/src/main/java/me/lucko/luckperms/storage/methods/MongoDBDatastore.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/methods/MongoDBDatastore.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.storage.methods; +package me.lucko.luckperms.common.storage.methods; import com.mongodb.MongoClient; import com.mongodb.MongoCredential; @@ -29,24 +29,24 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoCursor; import com.mongodb.client.MongoDatabase; import com.mongodb.client.model.InsertOneOptions; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.LogEntry; -import me.lucko.luckperms.data.Log; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.groups.GroupManager; -import me.lucko.luckperms.storage.Datastore; -import me.lucko.luckperms.storage.DatastoreConfiguration; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.tracks.TrackManager; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.users.UserIdentifier; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.data.Log; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.groups.GroupManager; +import me.lucko.luckperms.common.storage.Datastore; +import me.lucko.luckperms.common.storage.DatastoreConfiguration; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.tracks.TrackManager; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.users.UserIdentifier; import org.bson.Document; import java.util.*; import java.util.concurrent.Callable; import java.util.stream.Collectors; -import static me.lucko.luckperms.core.PermissionHolder.exportToLegacy; +import static me.lucko.luckperms.common.core.PermissionHolder.exportToLegacy; @SuppressWarnings("unchecked") public class MongoDBDatastore extends Datastore { diff --git a/common/src/main/java/me/lucko/luckperms/storage/methods/MySQLDatastore.java b/common/src/main/java/me/lucko/luckperms/common/storage/methods/MySQLDatastore.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/storage/methods/MySQLDatastore.java rename to common/src/main/java/me/lucko/luckperms/common/storage/methods/MySQLDatastore.java index 5b9893fc..5500d7fa 100644 --- a/common/src/main/java/me/lucko/luckperms/storage/methods/MySQLDatastore.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/methods/MySQLDatastore.java @@ -20,13 +20,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.storage.methods; +package me.lucko.luckperms.common.storage.methods; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import lombok.Cleanup; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.storage.DatastoreConfiguration; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.storage.DatastoreConfiguration; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/common/src/main/java/me/lucko/luckperms/storage/methods/SQLDatastore.java b/common/src/main/java/me/lucko/luckperms/common/storage/methods/SQLDatastore.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/storage/methods/SQLDatastore.java rename to common/src/main/java/me/lucko/luckperms/common/storage/methods/SQLDatastore.java index 824c7ec2..ec139fd4 100644 --- a/common/src/main/java/me/lucko/luckperms/storage/methods/SQLDatastore.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/methods/SQLDatastore.java @@ -20,20 +20,20 @@ * SOFTWARE. */ -package me.lucko.luckperms.storage.methods; +package me.lucko.luckperms.common.storage.methods; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.LogEntry; -import me.lucko.luckperms.data.Log; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.groups.GroupManager; -import me.lucko.luckperms.storage.Datastore; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.tracks.TrackManager; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.users.UserIdentifier; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.data.Log; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.groups.GroupManager; +import me.lucko.luckperms.common.storage.Datastore; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.tracks.TrackManager; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.users.UserIdentifier; import java.lang.reflect.Type; import java.sql.Connection; @@ -42,7 +42,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.*; -import static me.lucko.luckperms.core.PermissionHolder.exportToLegacy; +import static me.lucko.luckperms.common.core.PermissionHolder.exportToLegacy; abstract class SQLDatastore extends Datastore { private static final QueryPS EMPTY_PS = preparedStatement -> {}; diff --git a/common/src/main/java/me/lucko/luckperms/storage/methods/SQLiteDatastore.java b/common/src/main/java/me/lucko/luckperms/common/storage/methods/SQLiteDatastore.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/storage/methods/SQLiteDatastore.java rename to common/src/main/java/me/lucko/luckperms/common/storage/methods/SQLiteDatastore.java index 9ef64744..9b08a376 100644 --- a/common/src/main/java/me/lucko/luckperms/storage/methods/SQLiteDatastore.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/methods/SQLiteDatastore.java @@ -20,10 +20,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.storage.methods; +package me.lucko.luckperms.common.storage.methods; import lombok.Cleanup; -import me.lucko.luckperms.LuckPermsPlugin; +import me.lucko.luckperms.common.LuckPermsPlugin; import java.io.File; import java.sql.*; diff --git a/common/src/main/java/me/lucko/luckperms/storage/methods/YAMLDatastore.java b/common/src/main/java/me/lucko/luckperms/common/storage/methods/YAMLDatastore.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/storage/methods/YAMLDatastore.java rename to common/src/main/java/me/lucko/luckperms/common/storage/methods/YAMLDatastore.java index 64be5a07..ae52b488 100644 --- a/common/src/main/java/me/lucko/luckperms/storage/methods/YAMLDatastore.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/methods/YAMLDatastore.java @@ -20,17 +20,17 @@ * SOFTWARE. */ -package me.lucko.luckperms.storage.methods; +package me.lucko.luckperms.common.storage.methods; import lombok.Cleanup; -import me.lucko.luckperms.LuckPermsPlugin; -import me.lucko.luckperms.core.Node; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.groups.GroupManager; -import me.lucko.luckperms.tracks.Track; -import me.lucko.luckperms.tracks.TrackManager; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.users.UserIdentifier; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.core.Node; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.groups.GroupManager; +import me.lucko.luckperms.common.tracks.Track; +import me.lucko.luckperms.common.tracks.TrackManager; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.users.UserIdentifier; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; @@ -39,7 +39,7 @@ import java.util.*; import java.util.concurrent.Callable; import java.util.stream.Collectors; -import static me.lucko.luckperms.core.PermissionHolder.exportToLegacy; +import static me.lucko.luckperms.common.core.PermissionHolder.exportToLegacy; @SuppressWarnings({"unchecked", "ResultOfMethodCallIgnored"}) public class YAMLDatastore extends FlatfileDatastore { diff --git a/common/src/main/java/me/lucko/luckperms/tracks/Track.java b/common/src/main/java/me/lucko/luckperms/common/tracks/Track.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/tracks/Track.java rename to common/src/main/java/me/lucko/luckperms/common/tracks/Track.java index dab0fdf8..67817b42 100644 --- a/common/src/main/java/me/lucko/luckperms/tracks/Track.java +++ b/common/src/main/java/me/lucko/luckperms/common/tracks/Track.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.tracks; +package me.lucko.luckperms.common.tracks; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.ToString; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.utils.Identifiable; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectLacksException; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.utils.Identifiable; import java.util.ArrayList; import java.util.Collections; diff --git a/common/src/main/java/me/lucko/luckperms/tracks/TrackManager.java b/common/src/main/java/me/lucko/luckperms/common/tracks/TrackManager.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/tracks/TrackManager.java rename to common/src/main/java/me/lucko/luckperms/common/tracks/TrackManager.java index 7ebbe83e..73d7143d 100644 --- a/common/src/main/java/me/lucko/luckperms/tracks/TrackManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/tracks/TrackManager.java @@ -20,9 +20,9 @@ * SOFTWARE. */ -package me.lucko.luckperms.tracks; +package me.lucko.luckperms.common.tracks; -import me.lucko.luckperms.utils.AbstractManager; +import me.lucko.luckperms.common.utils.AbstractManager; import java.util.Set; import java.util.stream.Collectors; diff --git a/common/src/main/java/me/lucko/luckperms/users/User.java b/common/src/main/java/me/lucko/luckperms/common/users/User.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/users/User.java rename to common/src/main/java/me/lucko/luckperms/common/users/User.java index f907ab3f..dc296e9c 100644 --- a/common/src/main/java/me/lucko/luckperms/users/User.java +++ b/common/src/main/java/me/lucko/luckperms/common/users/User.java @@ -20,22 +20,22 @@ * SOFTWARE. */ -package me.lucko.luckperms.users; +package me.lucko.luckperms.common.users; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.event.events.GroupAddEvent; -import me.lucko.luckperms.api.implementation.internal.GroupLink; -import me.lucko.luckperms.api.implementation.internal.PermissionHolderLink; -import me.lucko.luckperms.caching.UserData; -import me.lucko.luckperms.core.PermissionHolder; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.api.internal.GroupLink; +import me.lucko.luckperms.common.api.internal.PermissionHolderLink; +import me.lucko.luckperms.common.caching.UserData; +import me.lucko.luckperms.common.core.PermissionHolder; +import me.lucko.luckperms.common.groups.Group; +import me.lucko.luckperms.common.utils.Identifiable; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectLacksException; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.utils.Identifiable; import java.util.UUID; diff --git a/common/src/main/java/me/lucko/luckperms/users/UserIdentifier.java b/common/src/main/java/me/lucko/luckperms/common/users/UserIdentifier.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/users/UserIdentifier.java rename to common/src/main/java/me/lucko/luckperms/common/users/UserIdentifier.java index 00e0e9cd..d7a9b999 100644 --- a/common/src/main/java/me/lucko/luckperms/users/UserIdentifier.java +++ b/common/src/main/java/me/lucko/luckperms/common/users/UserIdentifier.java @@ -20,13 +20,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.users; +package me.lucko.luckperms.common.users; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.ToString; -import me.lucko.luckperms.utils.Identifiable; +import me.lucko.luckperms.common.utils.Identifiable; import java.util.UUID; diff --git a/common/src/main/java/me/lucko/luckperms/users/UserManager.java b/common/src/main/java/me/lucko/luckperms/common/users/UserManager.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/users/UserManager.java rename to common/src/main/java/me/lucko/luckperms/common/users/UserManager.java index f2c44c6f..8f975c53 100644 --- a/common/src/main/java/me/lucko/luckperms/users/UserManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/users/UserManager.java @@ -20,15 +20,15 @@ * SOFTWARE. */ -package me.lucko.luckperms.users; +package me.lucko.luckperms.common.users; import lombok.RequiredArgsConstructor; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.data.Callback; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.utils.AbstractManager; +import me.lucko.luckperms.common.utils.Identifiable; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; -import me.lucko.luckperms.utils.AbstractManager; -import me.lucko.luckperms.utils.Identifiable; import java.util.UUID; diff --git a/common/src/main/java/me/lucko/luckperms/utils/AbstractListener.java b/common/src/main/java/me/lucko/luckperms/common/utils/AbstractListener.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/utils/AbstractListener.java rename to common/src/main/java/me/lucko/luckperms/common/utils/AbstractListener.java index a8b0fbec..a9f31c12 100644 --- a/common/src/main/java/me/lucko/luckperms/utils/AbstractListener.java +++ b/common/src/main/java/me/lucko/luckperms/common/utils/AbstractListener.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.utils; +package me.lucko.luckperms.common.utils; import lombok.AllArgsConstructor; -import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.api.data.Callback; import me.lucko.luckperms.api.event.events.UserFirstLoginEvent; -import me.lucko.luckperms.core.UuidCache; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.core.UuidCache; +import me.lucko.luckperms.common.users.User; import java.util.UUID; diff --git a/common/src/main/java/me/lucko/luckperms/utils/AbstractManager.java b/common/src/main/java/me/lucko/luckperms/common/utils/AbstractManager.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/utils/AbstractManager.java rename to common/src/main/java/me/lucko/luckperms/common/utils/AbstractManager.java index 60000521..21bc2d16 100644 --- a/common/src/main/java/me/lucko/luckperms/utils/AbstractManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/utils/AbstractManager.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.utils; +package me.lucko.luckperms.common.utils; import com.google.common.collect.ImmutableMap; diff --git a/common/src/main/java/me/lucko/luckperms/utils/ArgumentChecker.java b/common/src/main/java/me/lucko/luckperms/common/utils/ArgumentChecker.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/utils/ArgumentChecker.java rename to common/src/main/java/me/lucko/luckperms/common/utils/ArgumentChecker.java index b45a4fc9..d97305a3 100644 --- a/common/src/main/java/me/lucko/luckperms/utils/ArgumentChecker.java +++ b/common/src/main/java/me/lucko/luckperms/common/utils/ArgumentChecker.java @@ -20,10 +20,10 @@ * SOFTWARE. */ -package me.lucko.luckperms.utils; +package me.lucko.luckperms.common.utils; import lombok.experimental.UtilityClass; -import me.lucko.luckperms.constants.Patterns; +import me.lucko.luckperms.common.constants.Patterns; @UtilityClass public class ArgumentChecker { diff --git a/common/src/main/java/me/lucko/luckperms/utils/Cache.java b/common/src/main/java/me/lucko/luckperms/common/utils/Cache.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/utils/Cache.java rename to common/src/main/java/me/lucko/luckperms/common/utils/Cache.java index 7290a56e..9ebb6381 100644 --- a/common/src/main/java/me/lucko/luckperms/utils/Cache.java +++ b/common/src/main/java/me/lucko/luckperms/common/utils/Cache.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.utils; +package me.lucko.luckperms.common.utils; import java.util.function.Supplier; diff --git a/common/src/main/java/me/lucko/luckperms/utils/DateUtil.java b/common/src/main/java/me/lucko/luckperms/common/utils/DateUtil.java similarity index 84% rename from common/src/main/java/me/lucko/luckperms/utils/DateUtil.java rename to common/src/main/java/me/lucko/luckperms/common/utils/DateUtil.java index 88c7284a..a4f304e7 100644 --- a/common/src/main/java/me/lucko/luckperms/utils/DateUtil.java +++ b/common/src/main/java/me/lucko/luckperms/common/utils/DateUtil.java @@ -1,4 +1,26 @@ -package me.lucko.luckperms.utils; +/* + * Copyright (c) 2016 Lucko (Luck) + * + * 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.common.utils; import lombok.experimental.UtilityClass; diff --git a/common/src/main/java/me/lucko/luckperms/utils/Identifiable.java b/common/src/main/java/me/lucko/luckperms/common/utils/Identifiable.java similarity index 96% rename from common/src/main/java/me/lucko/luckperms/utils/Identifiable.java rename to common/src/main/java/me/lucko/luckperms/common/utils/Identifiable.java index a13e0e62..bcb31dfc 100644 --- a/common/src/main/java/me/lucko/luckperms/utils/Identifiable.java +++ b/common/src/main/java/me/lucko/luckperms/common/utils/Identifiable.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.utils; +package me.lucko.luckperms.common.utils; public interface Identifiable { diff --git a/common/src/main/java/me/lucko/luckperms/utils/LocaleManager.java b/common/src/main/java/me/lucko/luckperms/common/utils/LocaleManager.java similarity index 95% rename from common/src/main/java/me/lucko/luckperms/utils/LocaleManager.java rename to common/src/main/java/me/lucko/luckperms/common/utils/LocaleManager.java index d7183767..95212e07 100644 --- a/common/src/main/java/me/lucko/luckperms/utils/LocaleManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/utils/LocaleManager.java @@ -20,11 +20,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.utils; +package me.lucko.luckperms.common.utils; import com.google.common.collect.ImmutableMap; import lombok.Cleanup; -import me.lucko.luckperms.constants.Message; +import me.lucko.luckperms.common.constants.Message; import org.yaml.snakeyaml.Yaml; import java.io.File; diff --git a/common/src/main/java/me/lucko/luckperms/utils/LocalizedNode.java b/common/src/main/java/me/lucko/luckperms/common/utils/LocalizedNode.java similarity index 99% rename from common/src/main/java/me/lucko/luckperms/utils/LocalizedNode.java rename to common/src/main/java/me/lucko/luckperms/common/utils/LocalizedNode.java index 69f61d64..ea6de976 100644 --- a/common/src/main/java/me/lucko/luckperms/utils/LocalizedNode.java +++ b/common/src/main/java/me/lucko/luckperms/common/utils/LocalizedNode.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.utils; +package me.lucko.luckperms.common.utils; import lombok.*; import me.lucko.luckperms.api.Node; diff --git a/common/src/main/java/me/lucko/luckperms/utils/LogFactory.java b/common/src/main/java/me/lucko/luckperms/common/utils/LogFactory.java similarity index 98% rename from common/src/main/java/me/lucko/luckperms/utils/LogFactory.java rename to common/src/main/java/me/lucko/luckperms/common/utils/LogFactory.java index 9b834307..1a5199b1 100644 --- a/common/src/main/java/me/lucko/luckperms/utils/LogFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/utils/LogFactory.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.utils; +package me.lucko.luckperms.common.utils; import lombok.experimental.UtilityClass; import me.lucko.luckperms.api.Logger; diff --git a/sponge/pom.xml b/sponge/pom.xml index 93f53843..e451658d 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -77,7 +77,7 @@ false - me.lucko.luckperms.utils.VersionUtil + me.lucko.luckperms.sponge.utils.VersionUtil version diff --git a/sponge/src/main/java/me/lucko/luckperms/LPSpongePlugin.java b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java similarity index 87% rename from sponge/src/main/java/me/lucko/luckperms/LPSpongePlugin.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java index fb37def5..8effe5f0 100644 --- a/sponge/src/main/java/me/lucko/luckperms/LPSpongePlugin.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java @@ -20,35 +20,37 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.sponge; import com.google.inject.Inject; import lombok.Getter; +import me.lucko.luckperms.ApiHandler; import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.LuckPermsApi; import me.lucko.luckperms.api.PlatformType; -import me.lucko.luckperms.api.implementation.ApiProvider; -import me.lucko.luckperms.api.sponge.LuckPermsService; -import me.lucko.luckperms.calculators.CalculatorFactory; -import me.lucko.luckperms.commands.ConsecutiveExecutor; -import me.lucko.luckperms.commands.Sender; -import me.lucko.luckperms.config.LPConfiguration; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.constants.Permission; -import me.lucko.luckperms.contexts.ContextManager; -import me.lucko.luckperms.contexts.ServerCalculator; -import me.lucko.luckperms.contexts.WorldCalculator; -import me.lucko.luckperms.core.UuidCache; -import me.lucko.luckperms.data.Importer; -import me.lucko.luckperms.groups.GroupManager; -import me.lucko.luckperms.runnables.ExpireTemporaryTask; -import me.lucko.luckperms.runnables.UpdateTask; -import me.lucko.luckperms.storage.Datastore; -import me.lucko.luckperms.storage.StorageFactory; -import me.lucko.luckperms.tracks.TrackManager; -import me.lucko.luckperms.users.UserManager; -import me.lucko.luckperms.utils.LocaleManager; -import me.lucko.luckperms.utils.LogFactory; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.api.ApiProvider; +import me.lucko.luckperms.common.calculators.CalculatorFactory; +import me.lucko.luckperms.common.commands.ConsecutiveExecutor; +import me.lucko.luckperms.common.commands.Sender; +import me.lucko.luckperms.common.config.LPConfiguration; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.constants.Permission; +import me.lucko.luckperms.common.contexts.ContextManager; +import me.lucko.luckperms.common.contexts.ServerCalculator; +import me.lucko.luckperms.common.core.UuidCache; +import me.lucko.luckperms.common.data.Importer; +import me.lucko.luckperms.common.groups.GroupManager; +import me.lucko.luckperms.common.runnables.ExpireTemporaryTask; +import me.lucko.luckperms.common.runnables.UpdateTask; +import me.lucko.luckperms.common.storage.Datastore; +import me.lucko.luckperms.common.storage.StorageFactory; +import me.lucko.luckperms.common.tracks.TrackManager; +import me.lucko.luckperms.common.users.UserManager; +import me.lucko.luckperms.common.utils.LocaleManager; +import me.lucko.luckperms.common.utils.LogFactory; +import me.lucko.luckperms.sponge.contexts.WorldCalculator; +import me.lucko.luckperms.sponge.service.LuckPermsService; import org.slf4j.Logger; import org.spongepowered.api.Game; import org.spongepowered.api.Sponge; @@ -151,7 +153,7 @@ public class LPSpongePlugin implements LuckPermsPlugin { getLog().info("Registering API..."); apiProvider = new ApiProvider(this); - LuckPerms.registerProvider(apiProvider); + ApiHandler.registerProvider(apiProvider); Sponge.getServiceManager().setProvider(this, LuckPermsApi.class, apiProvider); int mins = getConfiguration().getSyncTime(); @@ -176,7 +178,7 @@ public class LPSpongePlugin implements LuckPermsPlugin { datastore.shutdown(); getLog().info("Unregistering API..."); - LuckPerms.unregisterProvider(); + ApiHandler.unregisterProvider(); } @Listener diff --git a/sponge/src/main/java/me/lucko/luckperms/SpongeCalculatorFactory.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCalculatorFactory.java similarity index 87% rename from sponge/src/main/java/me/lucko/luckperms/SpongeCalculatorFactory.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCalculatorFactory.java index 6b829de9..cf23e4a1 100644 --- a/sponge/src/main/java/me/lucko/luckperms/SpongeCalculatorFactory.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCalculatorFactory.java @@ -20,13 +20,15 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.sponge; import lombok.AllArgsConstructor; import me.lucko.luckperms.api.Contexts; -import me.lucko.luckperms.api.sponge.LuckPermsService; -import me.lucko.luckperms.calculators.*; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.calculators.*; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.sponge.calculators.DefaultsProcessor; +import me.lucko.luckperms.sponge.calculators.SpongeWildcardProcessor; +import me.lucko.luckperms.sponge.service.LuckPermsService; import java.util.ArrayList; import java.util.List; diff --git a/sponge/src/main/java/me/lucko/luckperms/SpongeCommand.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommand.java similarity index 93% rename from sponge/src/main/java/me/lucko/luckperms/SpongeCommand.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommand.java index 6f7e450d..af8dc407 100644 --- a/sponge/src/main/java/me/lucko/luckperms/SpongeCommand.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommand.java @@ -20,13 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.sponge; import com.google.common.base.Splitter; import me.lucko.luckperms.api.data.Callback; -import me.lucko.luckperms.commands.CommandManager; -import me.lucko.luckperms.commands.Util; -import me.lucko.luckperms.constants.Patterns; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.CommandManager; +import me.lucko.luckperms.common.commands.Util; +import me.lucko.luckperms.common.constants.Patterns; import org.spongepowered.api.command.CommandCallable; import org.spongepowered.api.command.CommandException; import org.spongepowered.api.command.CommandResult; diff --git a/sponge/src/main/java/me/lucko/luckperms/SpongeConfig.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeConfig.java similarity index 97% rename from sponge/src/main/java/me/lucko/luckperms/SpongeConfig.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/SpongeConfig.java index e45a45d2..a530d262 100644 --- a/sponge/src/main/java/me/lucko/luckperms/SpongeConfig.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeConfig.java @@ -20,10 +20,10 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.sponge; import com.google.common.base.Splitter; -import me.lucko.luckperms.config.AbstractConfiguration; +import me.lucko.luckperms.common.config.AbstractConfiguration; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.commented.CommentedConfigurationNode; import ninja.leaping.configurate.hocon.HoconConfigurationLoader; diff --git a/sponge/src/main/java/me/lucko/luckperms/SpongeListener.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeListener.java similarity index 93% rename from sponge/src/main/java/me/lucko/luckperms/SpongeListener.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/SpongeListener.java index 7fd81a1f..3243033a 100644 --- a/sponge/src/main/java/me/lucko/luckperms/SpongeListener.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeListener.java @@ -20,13 +20,13 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.sponge; -import me.lucko.luckperms.api.sponge.LuckPermsService; -import me.lucko.luckperms.caching.UserData; -import me.lucko.luckperms.constants.Message; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.utils.AbstractListener; +import me.lucko.luckperms.common.caching.UserData; +import me.lucko.luckperms.common.constants.Message; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.utils.AbstractListener; +import me.lucko.luckperms.sponge.service.LuckPermsService; import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.event.Listener; import org.spongepowered.api.event.network.ClientConnectionEvent; diff --git a/sponge/src/main/java/me/lucko/luckperms/SpongeSenderFactory.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java similarity index 92% rename from sponge/src/main/java/me/lucko/luckperms/SpongeSenderFactory.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java index d7c1d500..f9012755 100644 --- a/sponge/src/main/java/me/lucko/luckperms/SpongeSenderFactory.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java @@ -20,10 +20,11 @@ * SOFTWARE. */ -package me.lucko.luckperms; +package me.lucko.luckperms.sponge; -import me.lucko.luckperms.commands.SenderFactory; -import me.lucko.luckperms.constants.Constants; +import me.lucko.luckperms.common.LuckPermsPlugin; +import me.lucko.luckperms.common.commands.SenderFactory; +import me.lucko.luckperms.common.constants.Constants; import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.text.serializer.TextSerializers; diff --git a/sponge/src/main/java/me/lucko/luckperms/calculators/DefaultsProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculators/DefaultsProcessor.java similarity index 89% rename from sponge/src/main/java/me/lucko/luckperms/calculators/DefaultsProcessor.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/calculators/DefaultsProcessor.java index 1f04eb8c..12fc7e98 100644 --- a/sponge/src/main/java/me/lucko/luckperms/calculators/DefaultsProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculators/DefaultsProcessor.java @@ -20,16 +20,17 @@ * SOFTWARE. */ -package me.lucko.luckperms.calculators; +package me.lucko.luckperms.sponge.calculators; import lombok.AllArgsConstructor; -import me.lucko.luckperms.api.sponge.LuckPermsService; +import me.lucko.luckperms.common.calculators.PermissionProcessor; +import me.lucko.luckperms.sponge.service.LuckPermsService; import org.spongepowered.api.service.context.Context; import org.spongepowered.api.util.Tristate; import java.util.Set; -import static me.lucko.luckperms.api.sponge.LuckPermsService.convertTristate; +import static me.lucko.luckperms.sponge.service.LuckPermsService.convertTristate; @AllArgsConstructor public class DefaultsProcessor implements PermissionProcessor { diff --git a/sponge/src/main/java/me/lucko/luckperms/calculators/SpongeWildcardProcessor.java b/sponge/src/main/java/me/lucko/luckperms/sponge/calculators/SpongeWildcardProcessor.java similarity index 95% rename from sponge/src/main/java/me/lucko/luckperms/calculators/SpongeWildcardProcessor.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/calculators/SpongeWildcardProcessor.java index c07753c1..dec08ae2 100644 --- a/sponge/src/main/java/me/lucko/luckperms/calculators/SpongeWildcardProcessor.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/calculators/SpongeWildcardProcessor.java @@ -20,10 +20,11 @@ * SOFTWARE. */ -package me.lucko.luckperms.calculators; +package me.lucko.luckperms.sponge.calculators; import lombok.AllArgsConstructor; import lombok.Getter; +import me.lucko.luckperms.common.calculators.PermissionProcessor; import java.util.Map; diff --git a/sponge/src/main/java/me/lucko/luckperms/contexts/SpongeCalculatorLink.java b/sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeCalculatorLink.java similarity index 98% rename from sponge/src/main/java/me/lucko/luckperms/contexts/SpongeCalculatorLink.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeCalculatorLink.java index b1ec5c84..efc72cee 100644 --- a/sponge/src/main/java/me/lucko/luckperms/contexts/SpongeCalculatorLink.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeCalculatorLink.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.contexts; +package me.lucko.luckperms.sponge.contexts; import lombok.AllArgsConstructor; import me.lucko.luckperms.api.context.ContextCalculator; diff --git a/sponge/src/main/java/me/lucko/luckperms/contexts/WorldCalculator.java b/sponge/src/main/java/me/lucko/luckperms/sponge/contexts/WorldCalculator.java similarity index 97% rename from sponge/src/main/java/me/lucko/luckperms/contexts/WorldCalculator.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/contexts/WorldCalculator.java index e8ed9682..2ae81f30 100644 --- a/sponge/src/main/java/me/lucko/luckperms/contexts/WorldCalculator.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/contexts/WorldCalculator.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.contexts; +package me.lucko.luckperms.sponge.contexts; import lombok.RequiredArgsConstructor; import me.lucko.luckperms.api.context.ContextCalculator; diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsGroupSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsGroupSubject.java similarity index 97% rename from sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsGroupSubject.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsGroupSubject.java index baa3aa09..60ac279b 100644 --- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsGroupSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsGroupSubject.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.sponge; +package me.lucko.luckperms.sponge.service; import com.google.common.collect.ImmutableList; import lombok.EqualsAndHashCode; @@ -28,7 +28,7 @@ import lombok.Getter; import lombok.NonNull; import me.lucko.luckperms.api.LocalizedNode; import me.lucko.luckperms.api.Node; -import me.lucko.luckperms.groups.Group; +import me.lucko.luckperms.common.groups.Group; import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.service.context.Context; import org.spongepowered.api.service.permission.NodeTree; @@ -43,7 +43,7 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import static me.lucko.luckperms.utils.ArgumentChecker.unescapeCharacters; +import static me.lucko.luckperms.common.utils.ArgumentChecker.unescapeCharacters; @EqualsAndHashCode(of = "group") public class LuckPermsGroupSubject implements Subject { diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsService.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java similarity index 93% rename from sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsService.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java index 38d363f9..c561ad38 100644 --- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsService.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java @@ -20,19 +20,19 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.sponge; +package me.lucko.luckperms.sponge.service; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import lombok.*; -import me.lucko.luckperms.LPSpongePlugin; import me.lucko.luckperms.api.Contexts; -import me.lucko.luckperms.api.sponge.collections.GroupCollection; -import me.lucko.luckperms.api.sponge.collections.UserCollection; -import me.lucko.luckperms.api.sponge.simple.SimpleCollection; -import me.lucko.luckperms.api.sponge.simple.persisted.SimplePersistedCollection; -import me.lucko.luckperms.api.sponge.simple.persisted.SubjectStorage; -import me.lucko.luckperms.contexts.SpongeCalculatorLink; +import me.lucko.luckperms.sponge.LPSpongePlugin; +import me.lucko.luckperms.sponge.contexts.SpongeCalculatorLink; +import me.lucko.luckperms.sponge.service.collections.GroupCollection; +import me.lucko.luckperms.sponge.service.collections.UserCollection; +import me.lucko.luckperms.sponge.service.persisted.PersistedCollection; +import me.lucko.luckperms.sponge.service.persisted.SubjectStorage; +import me.lucko.luckperms.sponge.service.simple.SimpleCollection; import org.spongepowered.api.plugin.PluginContainer; import org.spongepowered.api.service.context.Context; import org.spongepowered.api.service.context.ContextCalculator; @@ -64,7 +64,7 @@ public class LuckPermsService implements PermissionService { private final GroupCollection groupSubjects; @Getter - private final SimplePersistedCollection defaultSubjects; + private final PersistedCollection defaultSubjects; @Getter private final Set descriptionSet; @@ -78,7 +78,7 @@ public class LuckPermsService implements PermissionService { userSubjects = new UserCollection(this, plugin.getUserManager()); groupSubjects = new GroupCollection(this, plugin.getGroupManager()); - defaultSubjects = new SimplePersistedCollection(this, "defaults"); + defaultSubjects = new PersistedCollection(this, "defaults"); defaultSubjects.loadAll(); subjects = new ConcurrentHashMap<>(); diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsSubjectData.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsSubjectData.java similarity index 95% rename from sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsSubjectData.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsSubjectData.java index 60534983..aec3c2bb 100644 --- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsSubjectData.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsSubjectData.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.sponge; +package me.lucko.luckperms.sponge.service; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -28,11 +28,11 @@ import com.google.common.collect.ImmutableSet; import lombok.AllArgsConstructor; import lombok.Getter; import me.lucko.luckperms.api.Node; -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.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectLacksException; -import me.lucko.luckperms.groups.Group; -import me.lucko.luckperms.users.User; import org.spongepowered.api.service.context.Context; import org.spongepowered.api.service.permission.Subject; import org.spongepowered.api.service.permission.SubjectData; @@ -41,7 +41,7 @@ import org.spongepowered.api.util.Tristate; import java.util.*; import java.util.stream.Collectors; -import static me.lucko.luckperms.utils.ArgumentChecker.escapeCharacters; +import static me.lucko.luckperms.common.utils.ArgumentChecker.escapeCharacters; @AllArgsConstructor public class LuckPermsSubjectData implements SubjectData { @@ -108,7 +108,7 @@ public class LuckPermsSubjectData implements SubjectData { public boolean setPermission(Set set, String s, Tristate tristate) { if (tristate == Tristate.UNDEFINED) { // Unset - Node.Builder builder = new me.lucko.luckperms.core.Node.Builder(s); + Node.Builder builder = new me.lucko.luckperms.common.core.Node.Builder(s); for (Context ct : set) { builder.withExtraContext(ct.getKey(), ct.getValue()); @@ -126,7 +126,7 @@ public class LuckPermsSubjectData implements SubjectData { return true; } - Node.Builder builder = new me.lucko.luckperms.core.Node.Builder(s) + Node.Builder builder = new me.lucko.luckperms.common.core.Node.Builder(s) .setValue(tristate.asBoolean()); for (Context ct : set) { @@ -233,11 +233,11 @@ public class LuckPermsSubjectData implements SubjectData { try { if (enduring) { - holder.setPermission(new me.lucko.luckperms.core.Node.Builder("group." + permsSubject.getIdentifier()) + holder.setPermission(new me.lucko.luckperms.common.core.Node.Builder("group." + permsSubject.getIdentifier()) .withExtraContext(contexts) .build()); } else { - holder.setTransientPermission(new me.lucko.luckperms.core.Node.Builder("group." + permsSubject.getIdentifier()) + holder.setTransientPermission(new me.lucko.luckperms.common.core.Node.Builder("group." + permsSubject.getIdentifier()) .withExtraContext(contexts) .build()); } @@ -257,11 +257,11 @@ public class LuckPermsSubjectData implements SubjectData { try { if (enduring) { - holder.unsetPermission(new me.lucko.luckperms.core.Node.Builder("group." + permsSubject.getIdentifier()) + holder.unsetPermission(new me.lucko.luckperms.common.core.Node.Builder("group." + permsSubject.getIdentifier()) .withExtraContext(contexts) .build()); } else { - holder.unsetTransientPermission(new me.lucko.luckperms.core.Node.Builder("group." + permsSubject.getIdentifier()) + holder.unsetTransientPermission(new me.lucko.luckperms.common.core.Node.Builder("group." + permsSubject.getIdentifier()) .withExtraContext(contexts) .build()); } @@ -442,12 +442,12 @@ public class LuckPermsSubjectData implements SubjectData { try { if (enduring) { - holder.setPermission(new me.lucko.luckperms.core.Node.Builder("meta." + key + "." + value) + holder.setPermission(new me.lucko.luckperms.common.core.Node.Builder("meta." + key + "." + value) .withExtraContext(context) .build() ); } else { - holder.setTransientPermission(new me.lucko.luckperms.core.Node.Builder("meta." + key + "." + value) + holder.setTransientPermission(new me.lucko.luckperms.common.core.Node.Builder("meta." + key + "." + value) .withExtraContext(context) .build() ); diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsUserSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsUserSubject.java similarity index 97% rename from sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsUserSubject.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsUserSubject.java index ea24859a..e4007e8d 100644 --- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsUserSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsUserSubject.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.sponge; +package me.lucko.luckperms.sponge.service; import com.google.common.collect.ImmutableList; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NonNull; -import me.lucko.luckperms.caching.MetaData; -import me.lucko.luckperms.users.User; +import me.lucko.luckperms.common.caching.MetaData; +import me.lucko.luckperms.common.users.User; import org.spongepowered.api.Sponge; import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.entity.living.player.Player; diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/collections/GroupCollection.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/collections/GroupCollection.java similarity index 92% rename from sponge/src/main/java/me/lucko/luckperms/api/sponge/collections/GroupCollection.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/collections/GroupCollection.java index af108241..43ecca94 100644 --- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/collections/GroupCollection.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/collections/GroupCollection.java @@ -20,13 +20,13 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.sponge.collections; +package me.lucko.luckperms.sponge.service.collections; import lombok.NonNull; -import me.lucko.luckperms.api.sponge.LuckPermsService; -import me.lucko.luckperms.api.sponge.LuckPermsGroupSubject; -import me.lucko.luckperms.api.sponge.simple.SimpleCollection; -import me.lucko.luckperms.groups.GroupManager; +import me.lucko.luckperms.common.groups.GroupManager; +import me.lucko.luckperms.sponge.service.LuckPermsGroupSubject; +import me.lucko.luckperms.sponge.service.LuckPermsService; +import me.lucko.luckperms.sponge.service.simple.SimpleCollection; import org.spongepowered.api.service.context.Context; import org.spongepowered.api.service.permission.PermissionService; import org.spongepowered.api.service.permission.Subject; diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/collections/UserCollection.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/collections/UserCollection.java similarity index 92% rename from sponge/src/main/java/me/lucko/luckperms/api/sponge/collections/UserCollection.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/collections/UserCollection.java index af4918eb..dade49d9 100644 --- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/collections/UserCollection.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/collections/UserCollection.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.sponge.collections; +package me.lucko.luckperms.sponge.service.collections; import lombok.Getter; import lombok.NonNull; -import me.lucko.luckperms.api.sponge.LuckPermsService; -import me.lucko.luckperms.api.sponge.LuckPermsUserSubject; -import me.lucko.luckperms.api.sponge.simple.SimpleCollection; -import me.lucko.luckperms.commands.Util; -import me.lucko.luckperms.users.User; -import me.lucko.luckperms.users.UserManager; +import me.lucko.luckperms.common.commands.Util; +import me.lucko.luckperms.common.users.User; +import me.lucko.luckperms.common.users.UserManager; +import me.lucko.luckperms.sponge.service.LuckPermsService; +import me.lucko.luckperms.sponge.service.LuckPermsUserSubject; +import me.lucko.luckperms.sponge.service.simple.SimpleCollection; import org.spongepowered.api.service.context.Context; import org.spongepowered.api.service.permission.PermissionService; import org.spongepowered.api.service.permission.Subject; diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/persisted/SimplePersistedCollection.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedCollection.java similarity index 83% rename from sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/persisted/SimplePersistedCollection.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedCollection.java index 00faeb38..e6d0d5ee 100644 --- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/persisted/SimplePersistedCollection.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedCollection.java @@ -20,12 +20,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.sponge.simple.persisted; +package me.lucko.luckperms.sponge.service.persisted; import lombok.Getter; import lombok.NonNull; import lombok.RequiredArgsConstructor; -import me.lucko.luckperms.api.sponge.LuckPermsService; +import me.lucko.luckperms.sponge.service.LuckPermsService; import org.spongepowered.api.service.context.Context; import org.spongepowered.api.service.permission.Subject; import org.spongepowered.api.service.permission.SubjectCollection; @@ -42,18 +42,18 @@ import java.util.stream.Collectors; * A simple persistable subject collection */ @RequiredArgsConstructor -public class SimplePersistedCollection implements SubjectCollection { +public class PersistedCollection implements SubjectCollection { private final LuckPermsService service; @Getter private final String identifier; - private final Map subjects = new ConcurrentHashMap<>(); + private final Map subjects = new ConcurrentHashMap<>(); public void loadAll() { - Map holders = service.getStorage().loadAllFromFile(identifier); - for (Map.Entry e : holders.entrySet()) { - SimplePersistedSubject subject = new SimplePersistedSubject(e.getKey(), service, this); + Map holders = service.getStorage().loadAllFromFile(identifier); + for (Map.Entry e : holders.entrySet()) { + PersistedSubject subject = new PersistedSubject(e.getKey(), service, this); subject.loadData(e.getValue()); subjects.put(e.getKey(), subject); } @@ -62,7 +62,7 @@ public class SimplePersistedCollection implements SubjectCollection { @Override public synchronized Subject get(@NonNull String id) { if (!subjects.containsKey(id)) { - subjects.put(id, new SimplePersistedSubject(id, service, this)); + subjects.put(id, new PersistedSubject(id, service, this)); } return subjects.get(id); diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/persisted/SimplePersistedSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubject.java similarity index 92% rename from sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/persisted/SimplePersistedSubject.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubject.java index a8dd9c8d..d49bee84 100644 --- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/persisted/SimplePersistedSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubject.java @@ -20,12 +20,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.sponge.simple.persisted; +package me.lucko.luckperms.sponge.service.persisted; import com.google.common.collect.ImmutableList; import lombok.Getter; import lombok.NonNull; -import me.lucko.luckperms.api.sponge.LuckPermsService; +import me.lucko.luckperms.sponge.service.LuckPermsService; import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.service.context.Context; import org.spongepowered.api.service.permission.MemorySubjectData; @@ -44,23 +44,23 @@ import java.util.Set; * A simple persistable Subject implementation */ @Getter -public class SimplePersistedSubject implements Subject { +public class PersistedSubject implements Subject { private final String identifier; private final LuckPermsService service; private final SubjectCollection containingCollection; - private final SimplePersistedSubjectData subjectData; + private final PersistedSubjectData subjectData; private final MemorySubjectData transientSubjectData; - public SimplePersistedSubject(String identifier, LuckPermsService service, SubjectCollection containingCollection) { + public PersistedSubject(String identifier, LuckPermsService service, SubjectCollection containingCollection) { this.identifier = identifier; this.service = service; this.containingCollection = containingCollection; - this.subjectData = new SimplePersistedSubjectData(service, this); + this.subjectData = new PersistedSubjectData(service, this); this.transientSubjectData = new MemorySubjectData(service); } - public void loadData(SimpleSubjectDataHolder dataHolder) { + public void loadData(SubjectDataHolder dataHolder) { subjectData.setSave(false); dataHolder.copyTo(subjectData, service); subjectData.setSave(true); diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/persisted/SimplePersistedSubjectData.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubjectData.java similarity index 92% rename from sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/persisted/SimplePersistedSubjectData.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubjectData.java index 681c7078..e2390471 100644 --- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/persisted/SimplePersistedSubjectData.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubjectData.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.sponge.simple.persisted; +package me.lucko.luckperms.sponge.service.persisted; import lombok.Getter; import lombok.Setter; @@ -36,14 +36,14 @@ import java.util.Set; /** * Extension of MemorySubjectData which persists data when modified */ -public class SimplePersistedSubjectData extends MemorySubjectData { - private final SimplePersistedSubject subject; +public class PersistedSubjectData extends MemorySubjectData { + private final PersistedSubject subject; @Getter @Setter private boolean save = true; - public SimplePersistedSubjectData(PermissionService service, SimplePersistedSubject subject) { + public PersistedSubjectData(PermissionService service, PersistedSubject subject) { super(service); this.subject = subject; } diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/persisted/SimpleSubjectDataHolder.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/SubjectDataHolder.java similarity index 90% rename from sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/persisted/SimpleSubjectDataHolder.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/SubjectDataHolder.java index c7ccf662..e0103d36 100644 --- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/persisted/SimpleSubjectDataHolder.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/SubjectDataHolder.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.sponge.simple.persisted; +package me.lucko.luckperms.sponge.service.persisted; import org.spongepowered.api.service.context.Context; import org.spongepowered.api.service.permission.MemorySubjectData; @@ -30,17 +30,17 @@ import org.spongepowered.api.util.Tristate; import java.util.*; import java.util.stream.Collectors; -import static me.lucko.luckperms.api.sponge.LuckPermsService.convertContexts; +import static me.lucko.luckperms.sponge.service.LuckPermsService.convertContexts; /** * Holds SubjectData in a "gson friendly" format for serialization */ -public class SimpleSubjectDataHolder { +public class SubjectDataHolder { private final Map, Map> permissions; private final Map, Map> options; private final Map, List>> parents; - public SimpleSubjectDataHolder(Map, Map> options, Map, Map> permissions, Map, List>> parents) { + public SubjectDataHolder(Map, Map> options, Map, Map> permissions, Map, List>> parents) { this.options = new HashMap<>(); for (Map.Entry, Map> e : options.entrySet()) { this.options.put(convertContexts(e.getKey()), new HashMap<>(e.getValue())); @@ -57,7 +57,7 @@ public class SimpleSubjectDataHolder { } } - public SimpleSubjectDataHolder(MemorySubjectData data) { + public SubjectDataHolder(MemorySubjectData data) { this( data.getAllOptions(), data.getAllPermissions(), diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/persisted/SubjectStorage.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/SubjectStorage.java similarity index 78% rename from sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/persisted/SubjectStorage.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/SubjectStorage.java index 5df97833..90489d30 100644 --- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/persisted/SubjectStorage.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/SubjectStorage.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.sponge.simple.persisted; +package me.lucko.luckperms.sponge.service.persisted; import com.google.common.io.Files; import com.google.gson.Gson; @@ -51,7 +51,7 @@ public class SubjectStorage { this.container.getParentFile().mkdirs(); } - public void saveToFile(SimplePersistedSubject subject) throws IOException { + public void saveToFile(PersistedSubject subject) throws IOException { checkContainer(); File collection = new File(container, subject.getContainingCollection().getIdentifier()); if (!collection.exists()) { @@ -62,21 +62,21 @@ public class SubjectStorage { saveToFile(subject, subjectFile); } - public void saveToFile(SimplePersistedSubject subject, File file) throws IOException { + public void saveToFile(PersistedSubject subject, File file) throws IOException { file.getParentFile().mkdirs(); if (file.exists()) { file.delete(); } file.createNewFile(); - Files.write(saveToString(new SimpleSubjectDataHolder(subject.getSubjectData())), file, Charset.defaultCharset()); + Files.write(saveToString(new SubjectDataHolder(subject.getSubjectData())), file, Charset.defaultCharset()); } - public String saveToString(SimpleSubjectDataHolder subject) { + public String saveToString(SubjectDataHolder subject) { return gson.toJson(subject); } - public Map loadAllFromFile(String collectionName) { + public Map loadAllFromFile(String collectionName) { checkContainer(); File collection = new File(container, collectionName); if (!collection.exists()) { @@ -86,12 +86,12 @@ public class SubjectStorage { String[] fileNames = collection.list((dir, name) -> name.endsWith(".json")); if (fileNames == null) return Collections.emptyMap(); - Map holders = new HashMap<>(); + Map holders = new HashMap<>(); for (String name : fileNames) { File subject = new File(collection, name); try { - Map.Entry s = loadFromFile(subject); + Map.Entry s = loadFromFile(subject); if (s != null) { holders.put(s.getKey(), s.getValue()); } @@ -103,7 +103,7 @@ public class SubjectStorage { return holders; } - public Map.Entry loadFromFile(String collectionName, String subjectName) throws IOException { + public Map.Entry loadFromFile(String collectionName, String subjectName) throws IOException { checkContainer(); File collection = new File(container, collectionName); if (!collection.exists()) { @@ -114,7 +114,7 @@ public class SubjectStorage { return new AbstractMap.SimpleEntry<>(subjectName.toLowerCase(), loadFromFile(subject).getValue()); } - public Map.Entry loadFromFile(File file) throws IOException { + public Map.Entry loadFromFile(File file) throws IOException { if (!file.exists()) { return null; } @@ -123,8 +123,8 @@ public class SubjectStorage { return new AbstractMap.SimpleEntry<>(file.getName().substring(file.getName().length() - 5).toLowerCase(), loadFromString(s)); } - public SimpleSubjectDataHolder loadFromString(String s) { - return gson.fromJson(s, SimpleSubjectDataHolder.class); + public SubjectDataHolder loadFromString(String s) { + return gson.fromJson(s, SubjectDataHolder.class); } } diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/SimpleCollection.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/simple/SimpleCollection.java similarity index 96% rename from sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/SimpleCollection.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/simple/SimpleCollection.java index 94c4072b..0d02dc43 100644 --- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/SimpleCollection.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/simple/SimpleCollection.java @@ -20,12 +20,12 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.sponge.simple; +package me.lucko.luckperms.sponge.service.simple; import lombok.Getter; import lombok.NonNull; import lombok.RequiredArgsConstructor; -import me.lucko.luckperms.api.sponge.LuckPermsService; +import me.lucko.luckperms.sponge.service.LuckPermsService; import org.spongepowered.api.service.context.Context; import org.spongepowered.api.service.permission.Subject; import org.spongepowered.api.service.permission.SubjectCollection; diff --git a/sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/SimpleSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/simple/SimpleSubject.java similarity index 99% rename from sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/SimpleSubject.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/service/simple/SimpleSubject.java index d6193502..f55f3f4d 100644 --- a/sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/SimpleSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/simple/SimpleSubject.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.api.sponge.simple; +package me.lucko.luckperms.sponge.service.simple; import com.google.common.collect.ImmutableList; import lombok.Getter; diff --git a/sponge/src/main/java/me/lucko/luckperms/utils/VersionUtil.java b/sponge/src/main/java/me/lucko/luckperms/sponge/utils/VersionUtil.java similarity index 96% rename from sponge/src/main/java/me/lucko/luckperms/utils/VersionUtil.java rename to sponge/src/main/java/me/lucko/luckperms/sponge/utils/VersionUtil.java index fe42ef2b..7941c277 100644 --- a/sponge/src/main/java/me/lucko/luckperms/utils/VersionUtil.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/utils/VersionUtil.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package me.lucko.luckperms.utils; +package me.lucko.luckperms.sponge.utils; import de.icongmbh.oss.maven.plugin.javassist.ClassTransformer; import javassist.*; import javassist.bytecode.AnnotationsAttribute; import javassist.bytecode.annotation.Annotation; import javassist.bytecode.annotation.StringMemberValue; -import me.lucko.luckperms.LPSpongePlugin; +import me.lucko.luckperms.sponge.LPSpongePlugin; import java.util.Properties;