SimplexDevelopment
/
FreedomNetworkSuite
mirror of https://github.com/SimplexDevelopment/FreedomNetworkSuite.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Signed-off-by: Paul Reilly <pawereus@gmail.com>
This commit is contained in:
Paldiu 2023-08-01 22:34:18 -05:00 committed by GitHub
parent e1a6b5e587
commit 21463c50fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
146 changed files with 595 additions and 608 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Corvo/src/main/java/me/totalfreedom/corvo/Corvo.java → Corvo/src/main/java/fns/corvo/Corvo.java
View File

@ -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

2
Corvo/src/main/java/me/totalfreedom/corvo/listener/PlayerInteractionListener.java → Corvo/src/main/java/fns/corvo/listener/PlayerInteractionListener.java
View File

@ -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;

18
Datura/src/main/java/me/totalfreedom/datura/Datura.java → Datura/src/main/java/fns/datura/Datura.java
View File

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

14
Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java → Datura/src/main/java/fns/datura/cmd/AdminChatCommand.java
View File

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

16
Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java → Datura/src/main/java/fns/datura/cmd/CageCommand.java
View File

@ -19,15 +19,15 @@
* THE SOFTWARE.
*/
package me.totalfreedom.datura.cmd;
package fns.datura.cmd;
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.Datura;
import fns.datura.Datura;
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 org.bukkit.Material;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

20
Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java → Datura/src/main/java/fns/datura/cmd/ClearDropsCommand.java
View File

@ -1,15 +1,15 @@
package me.totalfreedom.datura.cmd;
package fns.datura.cmd;
import me.totalfreedom.base.Patchwork;
import me.totalfreedom.base.Shortcuts;
import me.totalfreedom.command.Commander;
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 me.totalfreedom.datura.Datura;
import fns.datura.Datura;
import fns.patchwork.base.Patchwork;
import fns.patchwork.base.Shortcuts;
import fns.patchwork.command.Commander;
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 org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity;

16
Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java → Datura/src/main/java/fns/datura/cmd/ClearEntitiesCommand.java
View File

@ -1,12 +1,12 @@
package me.totalfreedom.datura.cmd;
package fns.datura.cmd;
import me.totalfreedom.command.Commander;
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 me.totalfreedom.utils.Tagged;
import fns.patchwork.command.Commander;
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 fns.patchwork.utils.Tagged;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity;

19
Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java → Datura/src/main/java/fns/datura/cmd/CommandSpyCommand.java
View File

@ -1,11 +1,10 @@
package me.totalfreedom.datura.cmd;
package fns.datura.cmd;
import me.totalfreedom.command.Commander;
import me.totalfreedom.command.annotation.Base;
import me.totalfreedom.command.annotation.Info;
import me.totalfreedom.command.annotation.Permissive;
import me.totalfreedom.datura.Datura;
import org.bukkit.command.CommandSender;
import fns.datura.Datura;
import fns.patchwork.command.Commander;
import fns.patchwork.command.annotation.Base;
import fns.patchwork.command.annotation.Info;
import fns.patchwork.command.annotation.Permissive;
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))
{

16
Datura/src/main/java/me/totalfreedom/datura/cmd/FuckoffCommand.java → Datura/src/main/java/fns/datura/cmd/FuckoffCommand.java
View File

@ -1,10 +1,12 @@
package me.totalfreedom.datura.cmd;
package fns.datura.cmd;
import me.totalfreedom.base.Shortcuts;
import me.totalfreedom.command.Commander;
import me.totalfreedom.command.annotation.*;
import me.totalfreedom.datura.Datura;
import org.bukkit.command.CommandSender;
import fns.datura.Datura;
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 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);
}

16
Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java → Datura/src/main/java/fns/datura/cmd/HaltCommand.java
View File

@ -1,12 +1,12 @@
package me.totalfreedom.datura.cmd;
package fns.datura.cmd;
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.Datura;
import fns.datura.Datura;
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 net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.Bukkit;

14
Datura/src/main/java/me/totalfreedom/datura/cmd/LockerCommand.java → Datura/src/main/java/fns/datura/cmd/LockerCommand.java
View File

@ -1,11 +1,11 @@
package me.totalfreedom.datura.cmd;
package fns.datura.cmd;
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.Datura;
import fns.datura.Datura;
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 org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

24
Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java → Datura/src/main/java/fns/datura/cmd/ManageUserCommand.java
View File

@ -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;

12
Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java → Datura/src/main/java/fns/datura/cmd/SmiteCommand.java
View File

@ -1,10 +1,10 @@
package me.totalfreedom.datura.cmd;
package fns.datura.cmd;
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 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 org.bukkit.Location;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

6
Datura/src/main/java/me/totalfreedom/datura/event/UserDataUpdateEvent.java → Datura/src/main/java/fns/datura/event/UserDataUpdateEvent.java
View File

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

9
Datura/src/main/java/me/totalfreedom/datura/features/CommandSpy.java → Datura/src/main/java/fns/datura/features/CommandSpy.java
View File

@ -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
{

30
Datura/src/main/java/me/totalfreedom/datura/features/Fuckoff.java → Datura/src/main/java/fns/datura/features/Fuckoff.java
View File

@ -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()
.filter(onlinePlayer -> onlinePlayer.getLocation().distanceSquared(player.getLocation()) < (radius * radius))
.forEach(onlinePlayer -> {
onlinePlayer.setVelocity(
player.getLocation().toVector()
.add(onlinePlayer.getLocation().toVector()).normalize().multiply(radius)
);
});
.stream()
.filter(onlinePlayer -> onlinePlayer.getLocation()
.clone()
.distanceSquared(player.getLocation()) < Math.pow(radius, 2))
.forEach(onlinePlayer ->
onlinePlayer.setVelocity(player.getLocation()
.toVector()
.add(onlinePlayer.getLocation().toVector())
.normalize()
.multiply(radius)));
}
}

6
Datura/src/main/java/me/totalfreedom/datura/perms/DefaultNodes.java → Datura/src/main/java/fns/datura/perms/DefaultNodes.java
View File

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

17
Datura/src/main/java/me/totalfreedom/datura/perms/FreedomGroup.java → Datura/src/main/java/fns/datura/perms/FreedomGroup.java
View File

@ -1,8 +1,12 @@
package me.totalfreedom.datura.perms;
package fns.datura.perms;
import me.totalfreedom.base.Patchwork;
import me.totalfreedom.security.Group;
import me.totalfreedom.security.Node;
import fns.patchwork.base.Patchwork;
import fns.patchwork.security.Group;
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;

30
Datura/src/main/java/me/totalfreedom/datura/perms/FreedomUser.java → Datura/src/main/java/fns/datura/perms/FreedomUser.java
View File

@ -1,11 +1,16 @@
package me.totalfreedom.datura.perms;
package fns.datura.perms;
import me.totalfreedom.base.Patchwork;
import me.totalfreedom.datura.Datura;
import me.totalfreedom.datura.user.SimpleUserData;
import me.totalfreedom.security.Node;
import me.totalfreedom.user.User;
import me.totalfreedom.user.UserData;
import fns.datura.Datura;
import fns.datura.user.SimpleUserData;
import fns.patchwork.base.Patchwork;
import fns.patchwork.security.Node;
import fns.patchwork.user.User;
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);
}

6
Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNode.java → Datura/src/main/java/fns/datura/perms/PermissionNode.java
View File

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

8
Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNodeBuilder.java → Datura/src/main/java/fns/datura/perms/PermissionNodeBuilder.java
View File

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

25
Datura/src/main/java/me/totalfreedom/datura/punishment/Cager.java → Datura/src/main/java/fns/datura/punishment/Cager.java
View File

@ -1,17 +1,8 @@
package me.totalfreedom.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;
package fns.datura.punishment;
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
{

9
Datura/src/main/java/me/totalfreedom/datura/punishment/Halter.java → Datura/src/main/java/fns/datura/punishment/Halter.java
View File

@ -1,12 +1,11 @@
package me.totalfreedom.datura.punishment;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerMoveEvent;
package fns.datura.punishment;
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
{

15
Datura/src/main/java/me/totalfreedom/datura/punishment/Locker.java → Datura/src/main/java/fns/datura/punishment/Locker.java
View File

@ -1,18 +1,17 @@
package me.totalfreedom.datura.punishment;
package fns.datura.punishment;
import me.totalfreedom.base.Patchwork;
import me.totalfreedom.service.Service;
import fns.patchwork.base.Patchwork;
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<>();

9
Datura/src/main/java/me/totalfreedom/datura/sql/MySQL.java → Datura/src/main/java/fns/datura/sql/MySQL.java
View File

@ -1,9 +1,8 @@
package me.totalfreedom.datura.sql;
import me.totalfreedom.base.Patchwork;
import me.totalfreedom.sql.SQL;
import me.totalfreedom.utils.container.Identity;
package fns.datura.sql;
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;

2
Datura/src/main/java/me/totalfreedom/datura/sql/Result.java → Datura/src/main/java/fns/datura/sql/Result.java
View File

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

6
Datura/src/main/java/me/totalfreedom/datura/user/ServerEconomyHolder.java → Datura/src/main/java/fns/datura/user/ServerEconomyHolder.java
View File

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

27
Datura/src/main/java/me/totalfreedom/datura/user/SimpleUserData.java → Datura/src/main/java/fns/datura/user/SimpleUserData.java
View File

@ -1,24 +1,23 @@
package me.totalfreedom.datura.user;
package fns.datura.user;
import me.totalfreedom.base.Patchwork;
import me.totalfreedom.datura.event.UserDataUpdateEvent;
import me.totalfreedom.datura.perms.FreedomUser;
import me.totalfreedom.display.adminchat.AdminChatFormat;
import me.totalfreedom.security.Group;
import me.totalfreedom.sql.SQL;
import me.totalfreedom.user.User;
import me.totalfreedom.user.UserData;
import me.totalfreedom.utils.logging.FreedomLogger;
import fns.datura.event.UserDataUpdateEvent;
import fns.datura.perms.FreedomUser;
import fns.patchwork.base.Patchwork;
import fns.patchwork.display.adminchat.AdminChatFormat;
import fns.patchwork.security.Group;
import fns.patchwork.sql.SQL;
import fns.patchwork.user.User;
import fns.patchwork.user.UserData;
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;

10
Fossil/src/main/java/me/totalfreedom/fossil/Fossil.java → Fossil/src/main/java/fns/fossil/Fossil.java
View File

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

5
Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/BouncyPad.java → Fossil/src/main/java/fns/fossil/bouncypads/BouncyPad.java
View File

@ -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.
*/

15
Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/PadHolder.java → Fossil/src/main/java/fns/fossil/bouncypads/PadHolder.java
View File

@ -1,7 +1,11 @@
package me.totalfreedom.fossil.bouncypads;
package fns.fossil.bouncypads;
import me.totalfreedom.base.Patchwork;
import me.totalfreedom.fossil.Fossil;
import fns.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.
*/

2
Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/PadType.java → Fossil/src/main/java/fns/fossil/bouncypads/PadType.java
View File

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

20
Fossil/src/main/java/me/totalfreedom/fossil/cmd/CakeCommand.java → Fossil/src/main/java/fns/fossil/cmd/CakeCommand.java
View File

@ -19,13 +19,13 @@
* THE SOFTWARE.
*/
package me.totalfreedom.fossil.cmd;
package fns.fossil.cmd;
import me.totalfreedom.command.Commander;
import me.totalfreedom.command.annotation.Base;
import me.totalfreedom.command.annotation.Info;
import me.totalfreedom.command.annotation.Permissive;
import me.totalfreedom.utils.kyori.FreedomMiniMessage;
import fns.patchwork.command.Commander;
import fns.patchwork.command.annotation.Base;
import fns.patchwork.command.annotation.Info;
import fns.patchwork.command.annotation.Permissive;
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,
"<rainbow>But there's no sense crying over every mistake. You just keep on trying till you run out of " +
"cake.</rainbow>"));
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 " +
"cake.</rainbow>"));
final ItemStack stack = new ItemStack(Material.CAKE, 1);
final ItemMeta meta = stack.getItemMeta();

10
Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleCompletedTransaction.java → Fossil/src/main/java/fns/fossil/economy/SimpleCompletedTransaction.java
View File

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

10
Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleLoggedTransactor.java → Fossil/src/main/java/fns/fossil/economy/SimpleLoggedTransactor.java
View File

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

6
Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleMutableTransaction.java → Fossil/src/main/java/fns/fossil/economy/SimpleMutableTransaction.java
View File

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

7
Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransaction.java → Fossil/src/main/java/fns/fossil/economy/SimpleTransaction.java
View File

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

14
Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransactionLogger.java → Fossil/src/main/java/fns/fossil/economy/SimpleTransactionLogger.java
View File

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

20
Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransactionResult.java → Fossil/src/main/java/fns/fossil/economy/SimpleTransactionResult.java
View File

@ -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
? NamedTextColor.GREEN
: NamedTextColor.RED), successful);
this(message, Component.text(message, isSuccessful
? NamedTextColor.GREEN
: 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

12
Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransactor.java → Fossil/src/main/java/fns/fossil/economy/SimpleTransactor.java
View File

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

2
Fossil/src/main/java/me/totalfreedom/fossil/items/ClownfishItem.java → Fossil/src/main/java/fns/fossil/items/ClownfishItem.java
View File

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

2
Fossil/src/main/java/me/totalfreedom/fossil/items/ShopItem.java → Fossil/src/main/java/fns/fossil/items/ShopItem.java
View File

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

2
Fossil/src/main/java/me/totalfreedom/fossil/items/TrailItem.java → Fossil/src/main/java/fns/fossil/items/TrailItem.java
View File

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

26
Fossil/src/main/java/me/totalfreedom/fossil/reactions/CopyCatReaction.java → Fossil/src/main/java/fns/fossil/reactions/CopyCatReaction.java
View File

@ -1,15 +1,13 @@
package me.totalfreedom.fossil.reactions;
package fns.fossil.reactions;
import me.totalfreedom.display.BossBarDisplay;
import me.totalfreedom.economy.EconomicEntity;
import me.totalfreedom.shop.Reaction;
import me.totalfreedom.shop.ReactionType;
import fns.patchwork.display.BossBarDisplay;
import fns.patchwork.economy.EconomicEntity;
import fns.patchwork.shop.Reaction;
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();

5
Fossil/src/main/java/fns/fossil/shop/Shoppe.java Normal file
View File

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

4
Fossil/src/main/java/me/totalfreedom/fossil/shop/menus/MainMenu.java → Fossil/src/main/java/fns/fossil/shop/menus/MainMenu.java
View File

@ -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
{

7
Fossil/src/main/java/me/totalfreedom/fossil/trail/Trailer.java → Fossil/src/main/java/fns/fossil/trail/Trailer.java
View File

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

4
Fossil/src/main/java/me/totalfreedom/fossil/trail/types/BasicTrail.java → Fossil/src/main/java/fns/fossil/trail/types/BasicTrail.java
View File

@ -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;

4
Fossil/src/main/java/me/totalfreedom/fossil/trail/types/FlameTrail.java → Fossil/src/main/java/fns/fossil/trail/types/FlameTrail.java
View File

@ -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;

4
Fossil/src/main/java/me/totalfreedom/fossil/trail/types/HeartTrail.java → Fossil/src/main/java/fns/fossil/trail/types/HeartTrail.java
View File

@ -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;

9
Fossil/src/main/java/me/totalfreedom/fossil/trail/types/RainbowTrail.java → Fossil/src/main/java/fns/fossil/trail/types/RainbowTrail.java
View File

@ -1,14 +1,13 @@
package me.totalfreedom.fossil.trail.types;
package fns.fossil.trail.types;
import me.totalfreedom.particle.TrailType;
import me.totalfreedom.utils.InterpolationUtils;
import fns.patchwork.particle.TrailType;
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;

11
Fossil/src/main/java/me/totalfreedom/fossil/trail/types/SimpleTrail.java → Fossil/src/main/java/fns/fossil/trail/types/SimpleTrail.java
View File

@ -1,7 +1,9 @@
package me.totalfreedom.fossil.trail.types;
package fns.fossil.trail.types;
import me.totalfreedom.particle.Trail;
import me.totalfreedom.particle.TrailType;
import fns.patchwork.particle.Trail;
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;

4
Fossil/src/main/java/me/totalfreedom/fossil/trail/types/StrobeTrail.java → Fossil/src/main/java/fns/fossil/trail/types/StrobeTrail.java
View File

@ -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;

2
Fossil/src/main/java/me/totalfreedom/fossil/trail/types/TrailProvider.java → Fossil/src/main/java/fns/fossil/trail/types/TrailProvider.java
View File

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

5
Fossil/src/main/java/me/totalfreedom/fossil/shop/Shoppe.java
View File

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

7
Patchwork/src/main/java/me/totalfreedom/api/Context.java → Patchwork/src/main/java/fns/patchwork/api/Context.java
View File

@ -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.

2
Patchwork/src/main/java/me/totalfreedom/api/Interpolator.java → Patchwork/src/main/java/fns/patchwork/api/Interpolator.java
View File

@ -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.

2
Patchwork/src/main/java/me/totalfreedom/api/Serializable.java → Patchwork/src/main/java/fns/patchwork/api/Serializable.java
View File

@ -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

2
Patchwork/src/main/java/me/totalfreedom/audience/MutableAudienceForwarder.java → Patchwork/src/main/java/fns/patchwork/audience/MutableAudienceForwarder.java
View File

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

10
Patchwork/src/main/java/me/totalfreedom/base/Patchwork.java → Patchwork/src/main/java/fns/patchwork/base/Patchwork.java
View File

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

14
Patchwork/src/main/java/me/totalfreedom/base/Registration.java → Patchwork/src/main/java/fns/patchwork/base/Registration.java
View File

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

5
Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java → Patchwork/src/main/java/fns/patchwork/base/Shortcuts.java
View File

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

10
Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java → Patchwork/src/main/java/fns/patchwork/command/BukkitDelegate.java
View File

@ -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;

2
Patchwork/src/main/java/me/totalfreedom/command/CommandHandler.java → Patchwork/src/main/java/fns/patchwork/command/CommandHandler.java
View File

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

19
Patchwork/src/main/java/me/totalfreedom/command/Commander.java → Patchwork/src/main/java/fns/patchwork/command/Commander.java
View File

@ -1,14 +1,10 @@
package me.totalfreedom.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;
package fns.patchwork.command;
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

2
Patchwork/src/main/java/me/totalfreedom/command/annotation/Base.java → Patchwork/src/main/java/fns/patchwork/command/annotation/Base.java
View File

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

2
Patchwork/src/main/java/me/totalfreedom/command/annotation/Completion.java → Patchwork/src/main/java/fns/patchwork/command/annotation/Completion.java
View File

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

2
Patchwork/src/main/java/me/totalfreedom/command/annotation/Completions.java → Patchwork/src/main/java/fns/patchwork/command/annotation/Completions.java
View File

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

2
Patchwork/src/main/java/me/totalfreedom/command/annotation/Info.java → Patchwork/src/main/java/fns/patchwork/command/annotation/Info.java
View File

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

2
Patchwork/src/main/java/me/totalfreedom/command/annotation/Permissive.java → Patchwork/src/main/java/fns/patchwork/command/annotation/Permissive.java
View File

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

7
Patchwork/src/main/java/me/totalfreedom/command/annotation/Subcommand.java → Patchwork/src/main/java/fns/patchwork/command/annotation/Subcommand.java
View File

@ -1,8 +1,7 @@
package me.totalfreedom.command.annotation;
import me.totalfreedom.command.CommandHandler;
import me.totalfreedom.provider.ContextProvider;
package fns.patchwork.command.annotation;
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;

7
Patchwork/src/main/java/me/totalfreedom/config/Configuration.java → Patchwork/src/main/java/fns/patchwork/config/Configuration.java
View File

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

2
Patchwork/src/main/java/me/totalfreedom/config/YamlWrapper.java → Patchwork/src/main/java/fns/patchwork/config/YamlWrapper.java
View File

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

5
Patchwork/src/main/java/me/totalfreedom/data/ConfigRegistry.java → Patchwork/src/main/java/fns/patchwork/data/ConfigRegistry.java
View File

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

7
Patchwork/src/main/java/me/totalfreedom/data/EventRegistry.java → Patchwork/src/main/java/fns/patchwork/data/EventRegistry.java
View File

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

7
Patchwork/src/main/java/me/totalfreedom/data/GroupRegistry.java → Patchwork/src/main/java/fns/patchwork/data/GroupRegistry.java
View File

@ -1,10 +1,9 @@
package me.totalfreedom.data;
import me.totalfreedom.security.Group;
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
package fns.patchwork.data;
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.

7
Patchwork/src/main/java/me/totalfreedom/data/ModuleRegistry.java → Patchwork/src/main/java/fns/patchwork/data/ModuleRegistry.java
View File

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

15
Patchwork/src/main/java/me/totalfreedom/data/ServiceTaskRegistry.java → Patchwork/src/main/java/fns/patchwork/data/ServiceTaskRegistry.java
View File

@ -1,14 +1,13 @@
package me.totalfreedom.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;
package fns.patchwork.data;
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.

9
Patchwork/src/main/java/me/totalfreedom/data/UserRegistry.java → Patchwork/src/main/java/fns/patchwork/data/UserRegistry.java
View File

@ -1,11 +1,10 @@
package me.totalfreedom.data;
import me.totalfreedom.user.User;
import me.totalfreedom.user.UserData;
import org.bukkit.entity.Player;
package fns.patchwork.data;
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.

13
Patchwork/src/main/java/me/totalfreedom/display/AbstractMenu.java → Patchwork/src/main/java/fns/patchwork/display/AbstractMenu.java
View File

@ -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.
*/

9
Patchwork/src/main/java/me/totalfreedom/display/BossBarDisplay.java → Patchwork/src/main/java/fns/patchwork/display/BossBarDisplay.java
View File

@ -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.

7
Patchwork/src/main/java/me/totalfreedom/display/BossBarTimer.java → Patchwork/src/main/java/fns/patchwork/display/BossBarTimer.java
View File

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

2
Patchwork/src/main/java/me/totalfreedom/display/ClickAction.java → Patchwork/src/main/java/fns/patchwork/display/ClickAction.java
View File

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

11
Patchwork/src/main/java/me/totalfreedom/display/Displayable.java → Patchwork/src/main/java/fns/patchwork/display/Displayable.java
View File

@ -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.

4
Patchwork/src/main/java/me/totalfreedom/display/DisplayableView.java → Patchwork/src/main/java/fns/patchwork/display/DisplayableView.java
View File

@ -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;

5
Patchwork/src/main/java/me/totalfreedom/display/TitleDisplay.java → Patchwork/src/main/java/fns/patchwork/display/TitleDisplay.java
View File

@ -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}.
*/

2
Patchwork/src/main/java/me/totalfreedom/display/adminchat/ACFormatBuilder.java → Patchwork/src/main/java/fns/patchwork/display/adminchat/ACFormatBuilder.java
View File

@ -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;

21
Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatDisplay.java → Patchwork/src/main/java/fns/patchwork/display/adminchat/AdminChatDisplay.java
View File

@ -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 me.totalfreedom.base.Shortcuts;
import me.totalfreedom.security.Groups;
import me.totalfreedom.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.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";

2
Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatFormat.java → Patchwork/src/main/java/fns/patchwork/display/adminchat/AdminChatFormat.java
View File

@ -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;

2
Patchwork/src/main/java/me/totalfreedom/economy/CompletedTransaction.java → Patchwork/src/main/java/fns/patchwork/economy/CompletedTransaction.java
View File

@ -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

2
Patchwork/src/main/java/me/totalfreedom/economy/EconomicEntity.java → Patchwork/src/main/java/fns/patchwork/economy/EconomicEntity.java
View File

@ -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}

2
Patchwork/src/main/java/me/totalfreedom/economy/EconomicEntityData.java → Patchwork/src/main/java/fns/patchwork/economy/EconomicEntityData.java
View File

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

2
Patchwork/src/main/java/me/totalfreedom/economy/MutableTransaction.java → Patchwork/src/main/java/fns/patchwork/economy/MutableTransaction.java
View File

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

2
Patchwork/src/main/java/me/totalfreedom/economy/Transaction.java → Patchwork/src/main/java/fns/patchwork/economy/Transaction.java
View File

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

2
Patchwork/src/main/java/me/totalfreedom/economy/TransactionLogger.java → Patchwork/src/main/java/fns/patchwork/economy/TransactionLogger.java
View File

@ -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

2
Patchwork/src/main/java/me/totalfreedom/economy/TransactionResult.java → Patchwork/src/main/java/fns/patchwork/economy/TransactionResult.java
View File

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

2
Patchwork/src/main/java/me/totalfreedom/economy/Transactor.java → Patchwork/src/main/java/fns/patchwork/economy/Transactor.java
View File

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

2
Patchwork/src/main/java/me/totalfreedom/event/Callback.java → Patchwork/src/main/java/fns/patchwork/event/Callback.java
View File

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

9
Patchwork/src/main/java/me/totalfreedom/event/EventBus.java → Patchwork/src/main/java/fns/patchwork/event/EventBus.java
View File

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

2
Patchwork/src/main/java/me/totalfreedom/event/EventSubscription.java → Patchwork/src/main/java/fns/patchwork/event/EventSubscription.java
View File

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

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