Migrates the entire package nomenclature to be more direct and straightforward. (#17)

Signed-off-by: Paul Reilly <pawereus@gmail.com>

Corvo/src/main/java/fns/corvo/Corvo.java

@@ -1,6 +1,6 @@
-package me.totalfreedom.corvo;
+package fns.corvo;
 
-import me.totalfreedom.base.Patchwork;
+import fns.patchwork.base.Patchwork;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class Corvo extends JavaPlugin

Corvo/src/main/java/fns/corvo/listener/PlayerInteractionListener.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.corvo.listener;
+package fns.corvo.listener;
 
 import io.papermc.paper.event.block.BlockBreakBlockEvent;
 import org.bukkit.event.EventHandler;

Datura/src/main/java/fns/datura/Datura.java

@@ -1,13 +1,13 @@
-package me.totalfreedom.datura;
+package fns.datura;
 
-import me.totalfreedom.base.Patchwork;
+import fns.datura.features.CommandSpy;
-import me.totalfreedom.datura.features.Fuckoff;
+import fns.datura.features.Fuckoff;
-import me.totalfreedom.datura.features.CommandSpy;
+import fns.datura.punishment.Cager;
-import me.totalfreedom.datura.punishment.Cager;
+import fns.datura.punishment.Halter;
-import me.totalfreedom.datura.punishment.Halter;
+import fns.datura.punishment.Locker;
-import me.totalfreedom.datura.punishment.Locker;
+import fns.datura.sql.MySQL;
-import me.totalfreedom.datura.sql.MySQL;
+import fns.patchwork.base.Patchwork;
-import me.totalfreedom.service.SubscriptionProvider;
+import fns.patchwork.service.SubscriptionProvider;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 

Datura/src/main/java/fns/datura/cmd/AdminChatCommand.java

@@ -1,11 +1,11 @@
-package me.totalfreedom.datura.cmd;
+package fns.datura.cmd;
 
-import me.totalfreedom.base.Patchwork;
+import fns.patchwork.base.Patchwork;
-import me.totalfreedom.command.Commander;
+import fns.patchwork.command.Commander;
-import me.totalfreedom.command.annotation.Base;
+import fns.patchwork.command.annotation.Base;
-import me.totalfreedom.command.annotation.Info;
+import fns.patchwork.command.annotation.Info;
-import me.totalfreedom.command.annotation.Permissive;
+import fns.patchwork.command.annotation.Permissive;
-import me.totalfreedom.command.annotation.Subcommand;
+import fns.patchwork.command.annotation.Subcommand;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

Datura/src/main/java/fns/datura/cmd/CageCommand.java

@@ -19,15 +19,15 @@
  * THE SOFTWARE.
  */
 
-package me.totalfreedom.datura.cmd;
+package fns.datura.cmd;
 
-import me.totalfreedom.base.Shortcuts;
+import fns.datura.Datura;
-import me.totalfreedom.command.Commander;
+import fns.patchwork.base.Shortcuts;
-import me.totalfreedom.command.annotation.Completion;
+import fns.patchwork.command.Commander;
-import me.totalfreedom.command.annotation.Info;
+import fns.patchwork.command.annotation.Completion;
-import me.totalfreedom.command.annotation.Permissive;
+import fns.patchwork.command.annotation.Info;
-import me.totalfreedom.command.annotation.Subcommand;
+import fns.patchwork.command.annotation.Permissive;
-import me.totalfreedom.datura.Datura;
+import fns.patchwork.command.annotation.Subcommand;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

Datura/src/main/java/fns/datura/cmd/ClearDropsCommand.java

@@ -1,15 +1,15 @@
-package me.totalfreedom.datura.cmd;
+package fns.datura.cmd;
 
 
-import me.totalfreedom.base.Patchwork;
+import fns.datura.Datura;
-import me.totalfreedom.base.Shortcuts;
+import fns.patchwork.base.Patchwork;
-import me.totalfreedom.command.Commander;
+import fns.patchwork.base.Shortcuts;
-import me.totalfreedom.command.annotation.Base;
+import fns.patchwork.command.Commander;
-import me.totalfreedom.command.annotation.Completion;
+import fns.patchwork.command.annotation.Base;
-import me.totalfreedom.command.annotation.Info;
+import fns.patchwork.command.annotation.Completion;
-import me.totalfreedom.command.annotation.Permissive;
+import fns.patchwork.command.annotation.Info;
-import me.totalfreedom.command.annotation.Subcommand;
+import fns.patchwork.command.annotation.Permissive;
-import me.totalfreedom.datura.Datura;
+import fns.patchwork.command.annotation.Subcommand;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;

Datura/src/main/java/fns/datura/cmd/ClearEntitiesCommand.java

@@ -1,12 +1,12 @@
-package me.totalfreedom.datura.cmd;
+package fns.datura.cmd;
 
-import me.totalfreedom.command.Commander;
+import fns.patchwork.command.Commander;
-import me.totalfreedom.command.annotation.Base;
+import fns.patchwork.command.annotation.Base;
-import me.totalfreedom.command.annotation.Completion;
+import fns.patchwork.command.annotation.Completion;
-import me.totalfreedom.command.annotation.Info;
+import fns.patchwork.command.annotation.Info;
-import me.totalfreedom.command.annotation.Permissive;
+import fns.patchwork.command.annotation.Permissive;
-import me.totalfreedom.command.annotation.Subcommand;
+import fns.patchwork.command.annotation.Subcommand;
-import me.totalfreedom.utils.Tagged;
+import fns.patchwork.utils.Tagged;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;

Datura/src/main/java/fns/datura/cmd/CommandSpyCommand.java

@@ -1,11 +1,10 @@
-package me.totalfreedom.datura.cmd;
+package fns.datura.cmd;
 
-import me.totalfreedom.command.Commander;
+import fns.datura.Datura;
-import me.totalfreedom.command.annotation.Base;
+import fns.patchwork.command.Commander;
-import me.totalfreedom.command.annotation.Info;
+import fns.patchwork.command.annotation.Base;
-import me.totalfreedom.command.annotation.Permissive;
+import fns.patchwork.command.annotation.Info;
-import me.totalfreedom.datura.Datura;
+import fns.patchwork.command.annotation.Permissive;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
@@ -24,7 +23,7 @@ public class CommandSpyCommand extends Commander
      *
      * @param plugin The plugin which contains this command.
      */
-    public CommandSpyCommand(@NotNull JavaPlugin plugin)
+    public CommandSpyCommand(@NotNull final Datura plugin)
     {
         super(plugin);
     }
@@ -33,10 +32,10 @@ public class CommandSpyCommand extends Commander
     public void commandSpy(final Player sender)
     {
         final var commandSpy = ((Datura) getPlugin()).
-                getCommandSpy();
+            getCommandSpy();
 
         final var uuid = sender.
-                getUniqueId();
+            getUniqueId();
 
         if (commandSpy.isSpying(uuid))
         {

Datura/src/main/java/fns/datura/cmd/FuckoffCommand.java

@@ -1,10 +1,12 @@
-package me.totalfreedom.datura.cmd;
+package fns.datura.cmd;
 
-import me.totalfreedom.base.Shortcuts;
+import fns.datura.Datura;
-import me.totalfreedom.command.Commander;
+import fns.patchwork.base.Shortcuts;
-import me.totalfreedom.command.annotation.*;
+import fns.patchwork.command.Commander;
-import me.totalfreedom.datura.Datura;
+import fns.patchwork.command.annotation.Completion;
-import org.bukkit.command.CommandSender;
+import fns.patchwork.command.annotation.Info;
+import fns.patchwork.command.annotation.Permissive;
+import fns.patchwork.command.annotation.Subcommand;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
@@ -26,7 +28,7 @@ public class FuckoffCommand extends Commander
      *
      * @param plugin The plugin which contains this command.
      */
-    public FuckoffCommand(@NotNull JavaPlugin plugin)
+    public FuckoffCommand(@NotNull final JavaPlugin plugin)
     {
         super(plugin);
     }

Datura/src/main/java/fns/datura/cmd/HaltCommand.java

@@ -1,12 +1,12 @@
-package me.totalfreedom.datura.cmd;
+package fns.datura.cmd;
 
-import me.totalfreedom.base.Shortcuts;
+import fns.datura.Datura;
-import me.totalfreedom.command.Commander;
+import fns.patchwork.base.Shortcuts;
-import me.totalfreedom.command.annotation.Completion;
+import fns.patchwork.command.Commander;
-import me.totalfreedom.command.annotation.Info;
+import fns.patchwork.command.annotation.Completion;
-import me.totalfreedom.command.annotation.Permissive;
+import fns.patchwork.command.annotation.Info;
-import me.totalfreedom.command.annotation.Subcommand;
+import fns.patchwork.command.annotation.Permissive;
-import me.totalfreedom.datura.Datura;
+import fns.patchwork.command.annotation.Subcommand;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;

Datura/src/main/java/fns/datura/cmd/LockerCommand.java

@@ -1,11 +1,11 @@
-package me.totalfreedom.datura.cmd;
+package fns.datura.cmd;
 
-import me.totalfreedom.command.Commander;
+import fns.datura.Datura;
-import me.totalfreedom.command.annotation.Completion;
+import fns.patchwork.command.Commander;
-import me.totalfreedom.command.annotation.Info;
+import fns.patchwork.command.annotation.Completion;
-import me.totalfreedom.command.annotation.Permissive;
+import fns.patchwork.command.annotation.Info;
-import me.totalfreedom.command.annotation.Subcommand;
+import fns.patchwork.command.annotation.Permissive;
-import me.totalfreedom.datura.Datura;
+import fns.patchwork.command.annotation.Subcommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

Datura/src/main/java/fns/datura/cmd/ManageUserCommand.java

@@ -1,17 +1,17 @@
-package me.totalfreedom.datura.cmd;
+package fns.datura.cmd;
 
+import fns.datura.perms.PermissionNodeBuilder;
+import fns.patchwork.base.Shortcuts;
+import fns.patchwork.command.Commander;
+import fns.patchwork.command.annotation.Completion;
+import fns.patchwork.command.annotation.Info;
+import fns.patchwork.command.annotation.Permissive;
+import fns.patchwork.command.annotation.Subcommand;
+import fns.patchwork.security.Node;
+import fns.patchwork.security.NodeType;
+import fns.patchwork.security.PermissionHolder;
+import fns.patchwork.user.User;
 import java.time.Duration;
-import me.totalfreedom.base.Shortcuts;
-import me.totalfreedom.command.Commander;
-import me.totalfreedom.command.annotation.Completion;
-import me.totalfreedom.command.annotation.Info;
-import me.totalfreedom.command.annotation.Permissive;
-import me.totalfreedom.command.annotation.Subcommand;
-import me.totalfreedom.datura.perms.PermissionNodeBuilder;
-import me.totalfreedom.security.Node;
-import me.totalfreedom.security.NodeType;
-import me.totalfreedom.security.PermissionHolder;
-import me.totalfreedom.user.User;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;

Datura/src/main/java/fns/datura/cmd/SmiteCommand.java

@@ -1,10 +1,10 @@
-package me.totalfreedom.datura.cmd;
+package fns.datura.cmd;
 
-import me.totalfreedom.command.Commander;
+import fns.patchwork.command.Commander;
-import me.totalfreedom.command.annotation.Completion;
+import fns.patchwork.command.annotation.Completion;
-import me.totalfreedom.command.annotation.Info;
+import fns.patchwork.command.annotation.Info;
-import me.totalfreedom.command.annotation.Permissive;
+import fns.patchwork.command.annotation.Permissive;
-import me.totalfreedom.command.annotation.Subcommand;
+import fns.patchwork.command.annotation.Subcommand;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

Datura/src/main/java/fns/datura/event/UserDataUpdateEvent.java

@@ -1,7 +1,7 @@
-package me.totalfreedom.datura.event;
+package fns.datura.event;
 
-import me.totalfreedom.event.FEvent;
+import fns.patchwork.event.FEvent;
-import me.totalfreedom.user.UserData;
+import fns.patchwork.user.UserData;
 
 public class UserDataUpdateEvent extends FEvent
 {

Datura/src/main/java/fns/datura/features/CommandSpy.java

@@ -1,5 +1,8 @@
-package me.totalfreedom.datura.features;
+package fns.datura.features;
 
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
@@ -7,10 +10,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-
 public class CommandSpy implements Listener
 {
 

Datura/src/main/java/fns/datura/features/Fuckoff.java

@@ -1,13 +1,13 @@
-package me.totalfreedom.datura.features;
+package fns.datura.features;
 
-import me.totalfreedom.service.Service;
+import fns.patchwork.service.Service;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
 public class Fuckoff extends Service
 {
     private final Map<UUID, Integer> players = new ConcurrentHashMap<>();
@@ -30,7 +30,7 @@ public class Fuckoff extends Service
     @Override
     public void tick()
     {
-        for (Map.Entry<UUID, Integer> entry : players.entrySet())
+        for (final Map.Entry<UUID, Integer> entry : players.entrySet())
         {
             final var player = Bukkit.getPlayer(entry.getKey());
 
@@ -47,13 +47,15 @@ public class Fuckoff extends Service
     private void pushPlayers(@NotNull final Player player, final int radius)
     {
         Bukkit.getOnlinePlayers()
-                .stream()
+              .stream()
-                .filter(onlinePlayer -> onlinePlayer.getLocation().distanceSquared(player.getLocation()) < (radius * radius))
+              .filter(onlinePlayer -> onlinePlayer.getLocation()
-                .forEach(onlinePlayer -> {
+                                                  .clone()
-                    onlinePlayer.setVelocity(
+                                                  .distanceSquared(player.getLocation()) < Math.pow(radius, 2))
-                            player.getLocation().toVector()
+              .forEach(onlinePlayer ->
-                                    .add(onlinePlayer.getLocation().toVector()).normalize().multiply(radius)
+                           onlinePlayer.setVelocity(player.getLocation()
-                    );
+                                                          .toVector()
-        });
+                                                          .add(onlinePlayer.getLocation().toVector())
+                                                          .normalize()
+                                                          .multiply(radius)));
     }
 }

Datura/src/main/java/fns/datura/perms/DefaultNodes.java

@@ -1,7 +1,7 @@
-package me.totalfreedom.datura.perms;
+package fns.datura.perms;
 
-import me.totalfreedom.security.Node;
+import fns.patchwork.security.Node;
-import me.totalfreedom.security.NodeType;
+import fns.patchwork.security.NodeType;
 
 public class DefaultNodes
 {

Datura/src/main/java/fns/datura/perms/FreedomGroup.java

@@ -1,8 +1,12 @@
-package me.totalfreedom.datura.perms;
+package fns.datura.perms;
 
-import me.totalfreedom.base.Patchwork;
+import fns.patchwork.base.Patchwork;
-import me.totalfreedom.security.Group;
+import fns.patchwork.security.Group;
-import me.totalfreedom.security.Node;
+import fns.patchwork.security.Node;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
 import net.kyori.adventure.text.Component;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionAttachment;
@@ -11,11 +15,6 @@ import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
 public class FreedomGroup implements Group
 {
     private final Component name;

Datura/src/main/java/fns/datura/perms/FreedomUser.java

@@ -1,11 +1,16 @@
-package me.totalfreedom.datura.perms;
+package fns.datura.perms;
 
-import me.totalfreedom.base.Patchwork;
+import fns.datura.Datura;
-import me.totalfreedom.datura.Datura;
+import fns.datura.user.SimpleUserData;
-import me.totalfreedom.datura.user.SimpleUserData;
+import fns.patchwork.base.Patchwork;
-import me.totalfreedom.security.Node;
+import fns.patchwork.security.Node;
-import me.totalfreedom.user.User;
+import fns.patchwork.user.User;
-import me.totalfreedom.user.UserData;
+import fns.patchwork.user.UserData;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -16,12 +21,6 @@ import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
 /**
  * The superinterface User extends PermissionHolder, which is an extension of
  * {@link org.bukkit.permissions.Permissible}. This means that our permission data can be interchanged with other
@@ -33,7 +32,7 @@ public class FreedomUser implements User
     private final Set<Node> permissions;
     private final Map<Node, PermissionAttachment> bukkitAttachments = new HashMap<>();
     private final Component displayName;
-    private final String NOT_ONLINE = "Player is not online";
+    private static final String NOT_ONLINE = "Player is not online";
     private final UserData userData;
 
     public FreedomUser(final Player player)
@@ -96,7 +95,8 @@ public class FreedomUser implements User
     @Override
     public boolean addPermission(final Node node)
     {
-        final PermissionAttachment attachment = addAttachment(Patchwork.getInstance(), node.key(), node.value());
+        final boolean value = !node.isTemporary() || node.isExpired();
+        final PermissionAttachment attachment = addAttachment(Patchwork.getInstance(), node.key(), value);
         bukkitAttachments.put(node, attachment);
         return permissions().add(node);
     }

Datura/src/main/java/fns/datura/perms/PermissionNode.java

@@ -1,7 +1,7 @@
-package me.totalfreedom.datura.perms;
+package fns.datura.perms;
 
-import me.totalfreedom.security.Node;
+import fns.patchwork.security.Node;
-import me.totalfreedom.security.NodeType;
+import fns.patchwork.security.NodeType;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 

Datura/src/main/java/fns/datura/perms/PermissionNodeBuilder.java

@@ -1,8 +1,8 @@
-package me.totalfreedom.datura.perms;
+package fns.datura.perms;
 
-import me.totalfreedom.security.Node;
+import fns.patchwork.security.Node;
-import me.totalfreedom.security.NodeBuilder;
+import fns.patchwork.security.NodeBuilder;
-import me.totalfreedom.security.NodeType;
+import fns.patchwork.security.NodeType;
 
 public class PermissionNodeBuilder implements NodeBuilder
 {

Datura/src/main/java/fns/datura/punishment/Cager.java

@@ -1,17 +1,8 @@
-package me.totalfreedom.datura.punishment;
+package fns.datura.punishment;
-
-import me.totalfreedom.base.Patchwork;
-import me.totalfreedom.service.Service;
-import me.totalfreedom.utils.ShapeUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
 
+import fns.patchwork.base.Patchwork;
+import fns.patchwork.service.Service;
+import fns.patchwork.utils.ShapeUtils;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -20,6 +11,14 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.DoubleUnaryOperator;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 
 public class Cager extends Service
 {

Datura/src/main/java/fns/datura/punishment/Halter.java

@@ -1,12 +1,11 @@
-package me.totalfreedom.datura.punishment;
+package fns.datura.punishment;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerMoveEvent;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerMoveEvent;
 
 public class Halter implements Listener
 {

Datura/src/main/java/fns/datura/punishment/Locker.java

@@ -1,18 +1,17 @@
-package me.totalfreedom.datura.punishment;
+package fns.datura.punishment;
 
-import me.totalfreedom.base.Patchwork;
+import fns.patchwork.base.Patchwork;
-import me.totalfreedom.service.Service;
+import fns.patchwork.service.Service;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.SplittableRandom;
+import java.util.UUID;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.SplittableRandom;
-import java.util.UUID;
-
 public class Locker extends Service
 {
     private final Set<UUID> lockedPlayers = new HashSet<>();

Datura/src/main/java/fns/datura/sql/MySQL.java

@@ -1,9 +1,8 @@
-package me.totalfreedom.datura.sql;
+package fns.datura.sql;
-
-import me.totalfreedom.base.Patchwork;
-import me.totalfreedom.sql.SQL;
-import me.totalfreedom.utils.container.Identity;
 
+import fns.patchwork.base.Patchwork;
+import fns.patchwork.sql.SQL;
+import fns.patchwork.utils.container.Identity;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;

Datura/src/main/java/fns/datura/sql/Result.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.datura.sql;
+package fns.datura.sql;
 
 
 import com.google.errorprone.annotations.Immutable;

Datura/src/main/java/fns/datura/user/ServerEconomyHolder.java

@@ -1,7 +1,7 @@
-package me.totalfreedom.datura.user;
+package fns.datura.user;
 
-import me.totalfreedom.economy.EconomicEntity;
+import fns.patchwork.economy.EconomicEntity;
-import me.totalfreedom.economy.EconomicEntityData;
+import fns.patchwork.economy.EconomicEntityData;
 
 /**
  * Represents the server's economy holder.

Datura/src/main/java/fns/datura/user/SimpleUserData.java

@@ -1,24 +1,23 @@
-package me.totalfreedom.datura.user;
+package fns.datura.user;
 
-import me.totalfreedom.base.Patchwork;
+import fns.datura.event.UserDataUpdateEvent;
-import me.totalfreedom.datura.event.UserDataUpdateEvent;
+import fns.datura.perms.FreedomUser;
-import me.totalfreedom.datura.perms.FreedomUser;
+import fns.patchwork.base.Patchwork;
-import me.totalfreedom.display.adminchat.AdminChatFormat;
+import fns.patchwork.display.adminchat.AdminChatFormat;
-import me.totalfreedom.security.Group;
+import fns.patchwork.security.Group;
-import me.totalfreedom.sql.SQL;
+import fns.patchwork.sql.SQL;
-import me.totalfreedom.user.User;
+import fns.patchwork.user.User;
-import me.totalfreedom.user.UserData;
+import fns.patchwork.user.UserData;
-import me.totalfreedom.utils.logging.FreedomLogger;
+import fns.patchwork.utils.logging.FreedomLogger;
+import java.sql.SQLException;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.sql.SQLException;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
-
 public class SimpleUserData implements UserData
 {
     private final UUID uuid;

Fossil/src/main/java/fns/fossil/Fossil.java

@@ -1,9 +1,9 @@
-package me.totalfreedom.fossil;
+package fns.fossil;
 
-import me.totalfreedom.base.Patchwork;
+import fns.fossil.trail.Trailer;
-import me.totalfreedom.base.Registration;
+import fns.patchwork.base.Patchwork;
-import me.totalfreedom.fossil.trail.Trailer;
+import fns.patchwork.base.Registration;
-import me.totalfreedom.service.SubscriptionProvider;
+import fns.patchwork.service.SubscriptionProvider;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class Fossil extends JavaPlugin

Fossil/src/main/java/fns/fossil/bouncypads/BouncyPad.java

@@ -1,12 +1,11 @@
-package me.totalfreedom.fossil.bouncypads;
+package fns.fossil.bouncypads;
 
 import com.google.errorprone.annotations.Immutable;
+import java.util.SplittableRandom;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
-import java.util.SplittableRandom;
-
 /**
  * Represents a bouncy pad. Has a velocity and a type.
  */

Fossil/src/main/java/fns/fossil/bouncypads/PadHolder.java

@@ -1,7 +1,11 @@
-package me.totalfreedom.fossil.bouncypads;
+package fns.fossil.bouncypads;
 
-import me.totalfreedom.base.Patchwork;
+import fns.fossil.Fossil;
-import me.totalfreedom.fossil.Fossil;
+import fns.patchwork.base.Patchwork;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Stream;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Tag;
@@ -12,11 +16,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.stream.Stream;
-
 /**
  * Holds all the active pads for each player, and also manages player pad interaction.
  */

Fossil/src/main/java/fns/fossil/bouncypads/PadType.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.fossil.bouncypads;
+package fns.fossil.bouncypads;
 
 import org.bukkit.block.BlockFace;
 

Fossil/src/main/java/fns/fossil/cmd/CakeCommand.java

@@ -19,13 +19,13 @@
  * THE SOFTWARE.
  */
 
-package me.totalfreedom.fossil.cmd;
+package fns.fossil.cmd;
 
-import me.totalfreedom.command.Commander;
+import fns.patchwork.command.Commander;
-import me.totalfreedom.command.annotation.Base;
+import fns.patchwork.command.annotation.Base;
-import me.totalfreedom.command.annotation.Info;
+import fns.patchwork.command.annotation.Info;
-import me.totalfreedom.command.annotation.Permissive;
+import fns.patchwork.command.annotation.Permissive;
-import me.totalfreedom.utils.kyori.FreedomMiniMessage;
+import fns.patchwork.utils.kyori.FreedomMiniMessage;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
@@ -46,9 +46,11 @@ public class CakeCommand extends Commander
     @Base
     public void broadcastCake(final CommandSender sender)
     {
-        Bukkit.broadcast(FreedomMiniMessage.deserialize(true,
+        Bukkit.getServer().sendMessage(FreedomMiniMessage.deserialize(true,
-                "<rainbow>But there's no sense crying over every mistake. You just keep on trying till you run out of " +
+                                                                      "<rainbow>But there's no sense crying over " +
-                        "cake.</rainbow>"));
+                                                                          "every mistake. You just keep on trying " +
+                                                                          "till you run out of " +
+                                                                          "cake.</rainbow>"));
 
         final ItemStack stack = new ItemStack(Material.CAKE, 1);
         final ItemMeta meta = stack.getItemMeta();

Fossil/src/main/java/fns/fossil/economy/SimpleCompletedTransaction.java

@@ -1,9 +1,9 @@
-package me.totalfreedom.fossil.economy;
+package fns.fossil.economy;
 
-import me.totalfreedom.economy.CompletedTransaction;
+import fns.patchwork.economy.CompletedTransaction;
-import me.totalfreedom.economy.EconomicEntity;
+import fns.patchwork.economy.EconomicEntity;
-import me.totalfreedom.economy.Transaction;
+import fns.patchwork.economy.Transaction;
-import me.totalfreedom.economy.TransactionResult;
+import fns.patchwork.economy.TransactionResult;
 
 public class SimpleCompletedTransaction implements CompletedTransaction
 {

Fossil/src/main/java/fns/fossil/economy/SimpleLoggedTransactor.java

@@ -1,9 +1,9 @@
-package me.totalfreedom.fossil.economy;
+package fns.fossil.economy;
 
-import me.totalfreedom.economy.CompletedTransaction;
+import fns.patchwork.economy.CompletedTransaction;
-import me.totalfreedom.economy.MutableTransaction;
+import fns.patchwork.economy.MutableTransaction;
-import me.totalfreedom.economy.TransactionLogger;
+import fns.patchwork.economy.TransactionLogger;
-import me.totalfreedom.economy.Transactor;
+import fns.patchwork.economy.Transactor;
 
 public class SimpleLoggedTransactor implements Transactor
 {

Fossil/src/main/java/fns/fossil/economy/SimpleMutableTransaction.java

@@ -1,7 +1,7 @@
-package me.totalfreedom.fossil.economy;
+package fns.fossil.economy;
 
-import me.totalfreedom.economy.EconomicEntity;
+import fns.patchwork.economy.EconomicEntity;
-import me.totalfreedom.economy.MutableTransaction;
+import fns.patchwork.economy.MutableTransaction;
 
 public class SimpleMutableTransaction extends SimpleTransaction implements MutableTransaction
 {

Fossil/src/main/java/fns/fossil/economy/SimpleTransaction.java

@@ -1,8 +1,7 @@
-package me.totalfreedom.fossil.economy;
+package fns.fossil.economy;
-
-import me.totalfreedom.economy.EconomicEntity;
-import me.totalfreedom.economy.Transaction;
 
+import fns.patchwork.economy.EconomicEntity;
+import fns.patchwork.economy.Transaction;
 import java.util.concurrent.atomic.AtomicLong;
 
 public class SimpleTransaction implements Transaction

Fossil/src/main/java/fns/fossil/economy/SimpleTransactionLogger.java

@@ -1,11 +1,11 @@
-package me.totalfreedom.fossil.economy;
+package fns.fossil.economy;
 
-import me.totalfreedom.audience.MutableAudienceForwarder;
+import fns.patchwork.audience.MutableAudienceForwarder;
-import me.totalfreedom.economy.CompletedTransaction;
+import fns.patchwork.economy.CompletedTransaction;
-import me.totalfreedom.economy.EconomicEntity;
+import fns.patchwork.economy.EconomicEntity;
-import me.totalfreedom.economy.TransactionLogger;
+import fns.patchwork.economy.TransactionLogger;
-import me.totalfreedom.economy.TransactionResult;
+import fns.patchwork.economy.TransactionResult;
-import me.totalfreedom.utils.logging.FreedomLogger;
+import fns.patchwork.utils.logging.FreedomLogger;
 import net.kyori.adventure.text.Component;
 
 public class SimpleTransactionLogger implements TransactionLogger

Fossil/src/main/java/fns/fossil/economy/SimpleTransactionResult.java

@@ -1,6 +1,6 @@
-package me.totalfreedom.fossil.economy;
+package fns.fossil.economy;
 
-import me.totalfreedom.economy.TransactionResult;
+import fns.patchwork.economy.TransactionResult;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 
@@ -15,20 +15,20 @@ public class SimpleTransactionResult implements TransactionResult
             "The source has an insufficient balance to carry out this transaction.", false);
     private final String message;
     private final Component component;
-    private final boolean successful;
+    private final boolean isSuccessful;
 
-    public SimpleTransactionResult(final String message, final boolean successful)
+    public SimpleTransactionResult(final String message, final boolean isSuccessful)
     {
-        this(message, Component.text(message, successful
+        this(message, Component.text(message, isSuccessful
-                ? NamedTextColor.GREEN
+            ? NamedTextColor.GREEN
-                : NamedTextColor.RED), successful);
+            : NamedTextColor.RED), isSuccessful);
     }
 
-    public SimpleTransactionResult(final String message, final Component component, final boolean successful)
+    public SimpleTransactionResult(final String message, final Component component, final boolean isSuccessful)
     {
         this.message = message;
         this.component = component;
-        this.successful = successful;
+        this.isSuccessful = isSuccessful;
     }
 
     @Override
@@ -40,7 +40,7 @@ public class SimpleTransactionResult implements TransactionResult
     @Override
     public boolean isSuccessful()
     {
-        return successful;
+        return isSuccessful;
     }
 
     @Override

Fossil/src/main/java/fns/fossil/economy/SimpleTransactor.java

@@ -1,10 +1,10 @@
-package me.totalfreedom.fossil.economy;
+package fns.fossil.economy;
 
-import me.totalfreedom.economy.CompletedTransaction;
+import fns.patchwork.economy.CompletedTransaction;
-import me.totalfreedom.economy.EconomicEntity;
+import fns.patchwork.economy.EconomicEntity;
-import me.totalfreedom.economy.EconomicEntityData;
+import fns.patchwork.economy.EconomicEntityData;
-import me.totalfreedom.economy.MutableTransaction;
+import fns.patchwork.economy.MutableTransaction;
-import me.totalfreedom.economy.Transactor;
+import fns.patchwork.economy.Transactor;
 
 public class SimpleTransactor implements Transactor
 {

Fossil/src/main/java/fns/fossil/items/ClownfishItem.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.fossil.items;
+package fns.fossil.items;
 
 import org.bukkit.Location;
 import org.bukkit.Material;

Fossil/src/main/java/fns/fossil/items/ShopItem.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.fossil.items;
+package fns.fossil.items;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;

Fossil/src/main/java/fns/fossil/items/TrailItem.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.fossil.items;
+package fns.fossil.items;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;

Fossil/src/main/java/fns/fossil/reactions/CopyCatReaction.java

@@ -1,15 +1,13 @@
-package me.totalfreedom.fossil.reactions;
+package fns.fossil.reactions;
 
-import me.totalfreedom.display.BossBarDisplay;
+import fns.patchwork.display.BossBarDisplay;
-import me.totalfreedom.economy.EconomicEntity;
+import fns.patchwork.economy.EconomicEntity;
-import me.totalfreedom.shop.Reaction;
+import fns.patchwork.shop.Reaction;
-import me.totalfreedom.shop.ReactionType;
+import fns.patchwork.shop.ReactionType;
+import java.util.SplittableRandom;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.bossbar.BossBar;
 
-import java.util.SplittableRandom;
-import java.util.function.Consumer;
-
 /**
  * Represents a single chat reaction that can be performed by a player.
  */
@@ -29,12 +27,6 @@ public final class CopyCatReaction extends Reaction
         return reward;
     }
 
-    @Override
-    public void onReact(final Consumer<EconomicEntity> entity)
-    {
-        entity.accept(null);
-    }
-
     @Override
     public void display(final Audience audience)
     {
@@ -44,6 +36,12 @@ public final class CopyCatReaction extends Reaction
                                               .build();
     }
 
+    @Override
+    public void onReact(final EconomicEntity entity)
+    {
+        //
+    }
+
     public String getRandomCharacterString()
     {
         final SplittableRandom random = new SplittableRandom();

Fossil/src/main/java/fns/fossil/shop/Shoppe.java

@@ -0,0 +1,5 @@
+package fns.fossil.shop;
+
+public class Shoppe
+{
+}

Fossil/src/main/java/fns/fossil/shop/menus/MainMenu.java

@@ -1,6 +1,6 @@
-package me.totalfreedom.fossil.shop.menus;
+package fns.fossil.shop.menus;
 
-import me.totalfreedom.display.AbstractMenu;
+import fns.patchwork.display.AbstractMenu;
 
 public final class MainMenu extends AbstractMenu
 {

Fossil/src/main/java/fns/fossil/trail/Trailer.java

@@ -1,8 +1,7 @@
-package me.totalfreedom.fossil.trail;
+package fns.fossil.trail;
-
-import me.totalfreedom.particle.Trail;
-import me.totalfreedom.service.Service;
 
+import fns.patchwork.particle.Trail;
+import fns.patchwork.service.Service;
 import java.util.ArrayList;
 import java.util.List;
 

Fossil/src/main/java/fns/fossil/trail/types/BasicTrail.java

@@ -1,6 +1,6 @@
-package me.totalfreedom.fossil.trail.types;
+package fns.fossil.trail.types;
 
-import me.totalfreedom.particle.TrailType;
+import fns.patchwork.particle.TrailType;
 import org.bukkit.Color;
 import org.bukkit.Location;
 import org.bukkit.Particle;

Fossil/src/main/java/fns/fossil/trail/types/FlameTrail.java

@@ -1,6 +1,6 @@
-package me.totalfreedom.fossil.trail.types;
+package fns.fossil.trail.types;
 
-import me.totalfreedom.particle.TrailType;
+import fns.patchwork.particle.TrailType;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;

Fossil/src/main/java/fns/fossil/trail/types/HeartTrail.java

@@ -1,6 +1,6 @@
-package me.totalfreedom.fossil.trail.types;
+package fns.fossil.trail.types;
 
-import me.totalfreedom.particle.TrailType;
+import fns.patchwork.particle.TrailType;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 

Fossil/src/main/java/fns/fossil/trail/types/RainbowTrail.java

@@ -1,14 +1,13 @@
-package me.totalfreedom.fossil.trail.types;
+package fns.fossil.trail.types;
 
-import me.totalfreedom.particle.TrailType;
+import fns.patchwork.particle.TrailType;
-import me.totalfreedom.utils.InterpolationUtils;
+import fns.patchwork.utils.InterpolationUtils;
+import java.util.Iterator;
 import org.bukkit.Color;
 import org.bukkit.Location;
 import org.bukkit.Particle;
 import org.bukkit.entity.Player;
 
-import java.util.Iterator;
-
 public final class RainbowTrail extends SimpleTrail
 {
     private Iterator<Color> currentColor;

Fossil/src/main/java/fns/fossil/trail/types/SimpleTrail.java

@@ -1,7 +1,9 @@
-package me.totalfreedom.fossil.trail.types;
+package fns.fossil.trail.types;
 
-import me.totalfreedom.particle.Trail;
+import fns.patchwork.particle.Trail;
-import me.totalfreedom.particle.TrailType;
+import fns.patchwork.particle.TrailType;
+import java.util.Set;
+import java.util.UUID;
 import org.bukkit.Bukkit;
 import org.bukkit.Color;
 import org.bukkit.OfflinePlayer;
@@ -9,9 +11,6 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Set;
-import java.util.UUID;
-
 public abstract class SimpleTrail implements Trail
 {
     private final UUID associatedPlayerUUID;

Fossil/src/main/java/fns/fossil/trail/types/StrobeTrail.java

@@ -1,6 +1,6 @@
-package me.totalfreedom.fossil.trail.types;
+package fns.fossil.trail.types;
 
-import me.totalfreedom.particle.TrailType;
+import fns.patchwork.particle.TrailType;
 import org.bukkit.Color;
 import org.bukkit.Location;
 import org.bukkit.Particle;

Fossil/src/main/java/fns/fossil/trail/types/TrailProvider.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.fossil.trail.types;
+package fns.fossil.trail.types;
 
 import org.bukkit.entity.Player;
 

Fossil/src/main/java/me/totalfreedom/fossil/shop/Shoppe.java

@@ -1,5 +0,0 @@
-package me.totalfreedom.fossil.shop;
-
-public class Shoppe
-{
-}

Patchwork/src/main/java/fns/patchwork/api/Context.java

@@ -1,6 +1,7 @@
-package me.totalfreedom.api;
+package fns.patchwork.api;
 
-import me.totalfreedom.provider.ContextProvider;
+import fns.patchwork.provider.ContextProvider;
+import java.util.function.Function;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -12,8 +13,6 @@ import org.bukkit.event.block.Action;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.function.Function;
-
 /**
  * Represents an object context. This class is a simple generic type wrapper that can be used to ensure data types. This
  * class is also used to provide a simple way to map data types.

Patchwork/src/main/java/fns/patchwork/api/Interpolator.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.api;
+package fns.patchwork.api;
 
 /**
  * Interpolates a range of values and returns the results in a {@link Double} array.

Patchwork/src/main/java/fns/patchwork/api/Serializable.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.api;
+package fns.patchwork.api;
 
 /**
  * This interface represents a Serializable object. Objects which require custom serialization and cannot simply

Patchwork/src/main/java/fns/patchwork/audience/MutableAudienceForwarder.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.audience;
+package fns.patchwork.audience;
 
 import java.util.HashSet;
 import java.util.Set;

Patchwork/src/main/java/fns/patchwork/base/Patchwork.java

@@ -1,9 +1,9 @@
-package me.totalfreedom.base;
+package fns.patchwork.base;
 
-import me.totalfreedom.display.adminchat.AdminChatDisplay;
+import fns.patchwork.display.adminchat.AdminChatDisplay;
-import me.totalfreedom.event.EventBus;
+import fns.patchwork.event.EventBus;
-import me.totalfreedom.service.FreedomExecutor;
+import fns.patchwork.service.FreedomExecutor;
-import me.totalfreedom.service.SubscriptionProvider;
+import fns.patchwork.service.SubscriptionProvider;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 

Patchwork/src/main/java/fns/patchwork/base/Registration.java

@@ -1,11 +1,11 @@
-package me.totalfreedom.base;
+package fns.patchwork.base;
 
-import me.totalfreedom.data.ConfigRegistry;
+import fns.patchwork.data.ConfigRegistry;
-import me.totalfreedom.data.EventRegistry;
+import fns.patchwork.data.EventRegistry;
-import me.totalfreedom.data.GroupRegistry;
+import fns.patchwork.data.GroupRegistry;
-import me.totalfreedom.data.ModuleRegistry;
+import fns.patchwork.data.ModuleRegistry;
-import me.totalfreedom.data.ServiceTaskRegistry;
+import fns.patchwork.data.ServiceTaskRegistry;
-import me.totalfreedom.data.UserRegistry;
+import fns.patchwork.data.UserRegistry;
 
 /**
  * This class is a holder for each registry in the data package.

Patchwork/src/main/java/fns/patchwork/base/Shortcuts.java

@@ -1,7 +1,6 @@
-package me.totalfreedom.base;
+package fns.patchwork.base;
 
-import me.totalfreedom.api.Context;
+import fns.patchwork.user.User;
-import me.totalfreedom.user.User;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 

Patchwork/src/main/java/fns/patchwork/command/BukkitDelegate.java

@@ -1,13 +1,13 @@
-package me.totalfreedom.command;
+package fns.patchwork.command;
 
+import fns.patchwork.command.annotation.Completion;
+import fns.patchwork.command.annotation.Subcommand;
+import fns.patchwork.provider.ContextProvider;
+import fns.patchwork.utils.logging.FreedomLogger;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
-import me.totalfreedom.command.annotation.Completion;
-import me.totalfreedom.command.annotation.Subcommand;
-import me.totalfreedom.provider.ContextProvider;
-import me.totalfreedom.utils.logging.FreedomLogger;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

Patchwork/src/main/java/fns/patchwork/command/CommandHandler.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.command;
+package fns.patchwork.command;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandMap;

Patchwork/src/main/java/fns/patchwork/command/Commander.java

@@ -1,14 +1,10 @@
-package me.totalfreedom.command;
+package fns.patchwork.command;
-
-import me.totalfreedom.command.annotation.Base;
-import me.totalfreedom.command.annotation.Completion;
-import me.totalfreedom.command.annotation.Info;
-import me.totalfreedom.command.annotation.Permissive;
-import me.totalfreedom.command.annotation.Subcommand;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
+import fns.patchwork.command.annotation.Base;
+import fns.patchwork.command.annotation.Completion;
+import fns.patchwork.command.annotation.Info;
+import fns.patchwork.command.annotation.Permissive;
+import fns.patchwork.command.annotation.Subcommand;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -16,6 +12,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This is the base command class which should be extended when creating a new command. Commands must be annotated with

Patchwork/src/main/java/fns/patchwork/command/annotation/Base.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.command.annotation;
+package fns.patchwork.command.annotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

Patchwork/src/main/java/fns/patchwork/command/annotation/Completion.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.command.annotation;
+package fns.patchwork.command.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;

Patchwork/src/main/java/fns/patchwork/command/annotation/Completions.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.command.annotation;
+package fns.patchwork.command.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Patchwork/src/main/java/fns/patchwork/command/annotation/Info.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.command.annotation;
+package fns.patchwork.command.annotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

Patchwork/src/main/java/fns/patchwork/command/annotation/Permissive.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.command.annotation;
+package fns.patchwork.command.annotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

Patchwork/src/main/java/fns/patchwork/command/annotation/Subcommand.java

@@ -1,8 +1,7 @@
-package me.totalfreedom.command.annotation;
+package fns.patchwork.command.annotation;
-
-import me.totalfreedom.command.CommandHandler;
-import me.totalfreedom.provider.ContextProvider;
 
+import fns.patchwork.command.CommandHandler;
+import fns.patchwork.provider.ContextProvider;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

Patchwork/src/main/java/fns/patchwork/config/Configuration.java

@@ -1,8 +1,7 @@
-package me.totalfreedom.config;
+package fns.patchwork.config;
-
-import me.totalfreedom.api.Context;
-import me.totalfreedom.provider.ContextProvider;
 
+import fns.patchwork.api.Context;
+import fns.patchwork.provider.ContextProvider;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;

Patchwork/src/main/java/fns/patchwork/config/YamlWrapper.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.config;
+package fns.patchwork.config;
 
 public final class YamlWrapper
 {

Patchwork/src/main/java/fns/patchwork/data/ConfigRegistry.java

@@ -1,7 +1,6 @@
-package me.totalfreedom.data;
+package fns.patchwork.data;
-
-import me.totalfreedom.config.Configuration;
 
+import fns.patchwork.config.Configuration;
 import java.util.HashMap;
 import java.util.Map;
 

Patchwork/src/main/java/fns/patchwork/data/EventRegistry.java

@@ -1,8 +1,7 @@
-package me.totalfreedom.data;
+package fns.patchwork.data;
-
-import me.totalfreedom.event.FEvent;
-import me.totalfreedom.provider.EventProvider;
 
+import fns.patchwork.event.FEvent;
+import fns.patchwork.provider.EventProvider;
 import java.util.ArrayList;
 import java.util.List;
 

Patchwork/src/main/java/fns/patchwork/data/GroupRegistry.java

@@ -1,10 +1,9 @@
-package me.totalfreedom.data;
+package fns.patchwork.data;
-
-import me.totalfreedom.security.Group;
-import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 
+import fns.patchwork.security.Group;
 import java.util.ArrayList;
 import java.util.List;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 
 /**
  * A registry for {@link Group}s.

Patchwork/src/main/java/fns/patchwork/data/ModuleRegistry.java

@@ -1,10 +1,9 @@
-package me.totalfreedom.data;
+package fns.patchwork.data;
-
-import me.totalfreedom.provider.ModuleProvider;
-import org.bukkit.plugin.java.JavaPlugin;
 
+import fns.patchwork.provider.ModuleProvider;
 import java.util.ArrayList;
 import java.util.List;
+import org.bukkit.plugin.java.JavaPlugin;
 
 /**
  * A registry for modules.

Patchwork/src/main/java/fns/patchwork/data/ServiceTaskRegistry.java

@@ -1,14 +1,13 @@
-package me.totalfreedom.data;
+package fns.patchwork.data;
-
-import me.totalfreedom.service.Service;
-import me.totalfreedom.service.ServiceSubscription;
-import me.totalfreedom.service.SubscriptionProvider;
-import me.totalfreedom.service.Task;
-import me.totalfreedom.service.TaskSubscription;
-import org.jetbrains.annotations.Nullable;
 
+import fns.patchwork.service.Service;
+import fns.patchwork.service.ServiceSubscription;
+import fns.patchwork.service.SubscriptionProvider;
+import fns.patchwork.service.Task;
+import fns.patchwork.service.TaskSubscription;
 import java.util.ArrayList;
 import java.util.List;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A registry for all services and tasks registered with Patchwork.

Patchwork/src/main/java/fns/patchwork/data/UserRegistry.java

@@ -1,11 +1,10 @@
-package me.totalfreedom.data;
+package fns.patchwork.data;
-
-import me.totalfreedom.user.User;
-import me.totalfreedom.user.UserData;
-import org.bukkit.entity.Player;
 
+import fns.patchwork.user.User;
+import fns.patchwork.user.UserData;
 import java.util.HashMap;
 import java.util.Map;
+import org.bukkit.entity.Player;
 
 /**
  * A registry for {@link UserData} objects.

Patchwork/src/main/java/fns/patchwork/display/AbstractMenu.java

@@ -1,5 +1,10 @@
-package me.totalfreedom.display;
+package fns.patchwork.display;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -9,12 +14,6 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 /**
  * Represents a menu that can be opened by a player.
  */

Patchwork/src/main/java/fns/patchwork/display/BossBarDisplay.java

@@ -1,5 +1,8 @@
-package me.totalfreedom.display;
+package fns.patchwork.display;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.audience.ForwardingAudience;
 import net.kyori.adventure.bossbar.BossBar;
@@ -7,10 +10,6 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.TextColor;
 import org.jetbrains.annotations.Range;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 /**
  * This class is a wrapper for {@link BossBar} objects. It provides some handy methods for changing the boss bar's
  * properties, displaying the bar to {@link Audience}s, and a {@link BossBarBuilder} to easily create new boss bars.

Patchwork/src/main/java/fns/patchwork/display/BossBarTimer.java

@@ -1,9 +1,8 @@
-package me.totalfreedom.display;
+package fns.patchwork.display;
-
-import me.totalfreedom.service.Task;
-import org.bukkit.Bukkit;
 
+import fns.patchwork.service.Task;
 import java.time.Duration;
+import org.bukkit.Bukkit;
 
 public class BossBarTimer extends Task
 {

Patchwork/src/main/java/fns/patchwork/display/ClickAction.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.display;
+package fns.patchwork.display;
 
 import org.bukkit.entity.Player;
 

Patchwork/src/main/java/fns/patchwork/display/Displayable.java

@@ -1,5 +1,9 @@
-package me.totalfreedom.display;
+package fns.patchwork.display;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.HumanEntity;
@@ -10,11 +14,6 @@ import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ListIterator;
-
 /**
  * A class that represents an inventory that can be displayed to players. This class also represents the inventory
  * holder which contains the inventory.

Patchwork/src/main/java/fns/patchwork/display/DisplayableView.java

@@ -1,6 +1,6 @@
-package me.totalfreedom.display;
+package fns.patchwork.display;
 
-import me.totalfreedom.utils.kyori.FreedomAdventure;
+import fns.patchwork.utils.kyori.FreedomAdventure;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;

Patchwork/src/main/java/fns/patchwork/display/TitleDisplay.java

@@ -1,13 +1,12 @@
-package me.totalfreedom.display;
+package fns.patchwork.display;
 
+import java.time.Duration;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.audience.ForwardingAudience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.title.Title;
 
-import java.time.Duration;
-
 /**
  * A wrapper class for {@link Title}s that allows for easy display to an {@link Audience}.
  */

Patchwork/src/main/java/fns/patchwork/display/adminchat/ACFormatBuilder.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.display.adminchat;
+package fns.patchwork.display.adminchat;
 
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;

Patchwork/src/main/java/fns/patchwork/display/adminchat/AdminChatDisplay.java

@@ -1,10 +1,15 @@
-package me.totalfreedom.display.adminchat;
+package fns.patchwork.display.adminchat;
 
+import fns.patchwork.base.Patchwork;
+import fns.patchwork.base.Shortcuts;
+import fns.patchwork.security.Groups;
+import fns.patchwork.user.UserData;
 import io.papermc.paper.event.player.AsyncChatEvent;
-import me.totalfreedom.base.Patchwork;
+import java.util.HashMap;
-import me.totalfreedom.base.Shortcuts;
+import java.util.HashSet;
-import me.totalfreedom.security.Groups;
+import java.util.Map;
-import me.totalfreedom.user.UserData;
+import java.util.Set;
+import java.util.UUID;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -13,12 +18,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
 public class AdminChatDisplay
 {
     protected static final String ACPERM = "patchwork.adminchat";

Patchwork/src/main/java/fns/patchwork/display/adminchat/AdminChatFormat.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.display.adminchat;
+package fns.patchwork.display.adminchat;
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;

Patchwork/src/main/java/fns/patchwork/economy/CompletedTransaction.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.economy;
+package fns.patchwork.economy;
 
 /**
  * Represents an immutable transaction that has been fully handled by a {@link Transactor} instance

Patchwork/src/main/java/fns/patchwork/economy/EconomicEntity.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.economy;
+package fns.patchwork.economy;
 
 /**
  * An entity that is able to transfer sums of currency between other {@link EconomicEntity}

Patchwork/src/main/java/fns/patchwork/economy/EconomicEntityData.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.economy;
+package fns.patchwork.economy;
 
 /**
  * Metadata associated with a {@link EconomicEntity}

Patchwork/src/main/java/fns/patchwork/economy/MutableTransaction.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.economy;
+package fns.patchwork.economy;
 
 /**
  * A transaction that can be changed.

Patchwork/src/main/java/fns/patchwork/economy/Transaction.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.economy;
+package fns.patchwork.economy;
 
 /**
  * A class that denotes the transfer of currency between two EconomicEntity instances.

Patchwork/src/main/java/fns/patchwork/economy/TransactionLogger.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.economy;
+package fns.patchwork.economy;
 
 /**
  * A class that intercepts transactions after they are completed and logs them to a data point

Patchwork/src/main/java/fns/patchwork/economy/TransactionResult.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.economy;
+package fns.patchwork.economy;
 
 import net.kyori.adventure.text.Component;
 

Patchwork/src/main/java/fns/patchwork/economy/Transactor.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.economy;
+package fns.patchwork.economy;
 
 /**
  * A class that implements the completion of transactions.

Patchwork/src/main/java/fns/patchwork/event/Callback.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.event;
+package fns.patchwork.event;
 
 @FunctionalInterface
 public interface Callback<T extends FEvent>

Patchwork/src/main/java/fns/patchwork/event/EventBus.java

@@ -1,9 +1,8 @@
-package me.totalfreedom.event;
+package fns.patchwork.event;
-
-import me.totalfreedom.api.Context;
-import me.totalfreedom.base.Patchwork;
-import me.totalfreedom.service.Service;
 
+import fns.patchwork.api.Context;
+import fns.patchwork.base.Patchwork;
+import fns.patchwork.service.Service;
 import java.util.HashSet;
 import java.util.Set;
 

Patchwork/src/main/java/fns/patchwork/event/EventSubscription.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.event;
+package fns.patchwork.event;
 
 public record EventSubscription<T extends FEvent>(T event, Callback<T> callback)
 {