From e18a0c08083d1dd6154c683c0451c189e14170e8 Mon Sep 17 00:00:00 2001 From: Paul Reilly Date: Sat, 10 Jun 2023 21:41:14 -0500 Subject: [PATCH 01/18] Minor fixes --- .../totalfreedom/datura/cmd/CageCommand.java | 44 ++++----- .../totalfreedom/datura/cmd/HaltCommand.java | 90 +++++++++++++++++++ .../datura/punishment/Halter.java | 9 ++ .../java/me/totalfreedom/base/Shortcuts.java | 15 ++++ .../totalfreedom/command/BukkitDelegate.java | 30 +++++-- .../command/annotation/Subcommand.java | 17 ++-- .../provider/ContextProvider.java | 45 ++++++++-- 7 files changed, 203 insertions(+), 47 deletions(-) create mode 100644 Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java create mode 100644 Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java index 38b2050..91c12fc 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java @@ -48,20 +48,16 @@ public class CageCommand extends Commander @Subcommand(permission = "datura.cage", args = {Player.class, String.class}) public void cagePlayer(final CommandSender sender, final Player player, final String string) { - switch (string.toLowerCase()) + if (string.equalsIgnoreCase("on")) { - case "on" -> - { - ((Datura) getPlugin()).getCager() - .cagePlayer(player.getUniqueId()); - sender.sendPlainMessage("Caged " + player.getName() + "."); - } - case "off" -> - { - ((Datura) getPlugin()).getCager() - .uncagePlayer(player.getUniqueId()); - sender.sendPlainMessage("Liberated " + player.getName() + "."); - } + ((Datura) getPlugin()).getCager() + .cagePlayer(player.getUniqueId()); + sender.sendPlainMessage("Caged " + player.getName() + "."); + } else if (string.equalsIgnoreCase("off")) + { + ((Datura) getPlugin()).getCager() + .uncagePlayer(player.getUniqueId()); + sender.sendPlainMessage("Liberated " + player.getName() + "."); } } @@ -70,20 +66,16 @@ public class CageCommand extends Commander public void cagePlayer(final CommandSender sender, final Player player, final String string, final Material material) { - switch (string.toLowerCase()) + if (string.equalsIgnoreCase("on")) { - case "on" -> - { - ((Datura) getPlugin()).getCager() - .cagePlayer(player.getUniqueId(), material); - sender.sendPlainMessage("Caged " + player.getName() + "."); - } - case "off" -> - { - ((Datura) getPlugin()).getCager() - .uncagePlayer(player.getUniqueId()); - sender.sendPlainMessage("Liberated " + player.getName() + "."); - } + ((Datura) getPlugin()).getCager() + .cagePlayer(player.getUniqueId(), material); + sender.sendPlainMessage("Caged " + player.getName() + "."); + } else if (string.equalsIgnoreCase("off")) + { + ((Datura) getPlugin()).getCager() + .uncagePlayer(player.getUniqueId()); + sender.sendPlainMessage("Liberated " + player.getName() + "."); } } } diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java new file mode 100644 index 0000000..0edca7c --- /dev/null +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java @@ -0,0 +1,90 @@ +package me.totalfreedom.datura.cmd; + +import me.totalfreedom.base.Shortcuts; +import me.totalfreedom.command.Commander; +import me.totalfreedom.command.annotation.Info; +import me.totalfreedom.command.annotation.Permissive; +import me.totalfreedom.command.annotation.Subcommand; +import me.totalfreedom.datura.Datura; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; +import org.jetbrains.annotations.NotNull; + +@Info(name = "halt", description = "Halt a single player, or every player.", usage = "/ ") +@Permissive(perm = "datura.halt") +public class HaltCommand extends Commander +{ + private final Datura plugin = Shortcuts.provideModule(Datura.class) + .getModule(); + + /** + * Initializes this command object. The provided {@link JavaPlugin} should be the plugin which contains the + * command. + *

+ * This constructor will automatically register all subcommands and completions for this command. It will also + * automatically infer all required information from the provided {@link Info} and {@link Permissive} annotations. + * + * @param plugin The plugin which contains this command. + */ + protected HaltCommand(@NotNull final JavaPlugin plugin) + { + super(plugin); + } + + + @Subcommand(permission = "datura.halt", args = {Player.class, String.class}) + public void haltPlayer(final CommandSender sender, final Player target, final String toggle) + { + if (toggle.equalsIgnoreCase("on")) + { + plugin.getHalter() + .halt(target.getUniqueId()); + + target.sendPlainMessage("You have been frozen!"); + sender.sendPlainMessage("You have halted " + target.getName() + "."); + } else if (toggle.equalsIgnoreCase("off")) + { + plugin.getHalter() + .stop(target.getUniqueId()); + + target.sendPlainMessage("You have been unfrozen!"); + sender.sendPlainMessage("You have unhalted " + target.getName() + "."); + } + } + + @Subcommand(permission = "datura.halt.all", args = {String.class, String.class}) + public void haltAll(final CommandSender sender, final String all, final String toggle) + { + if (all.equalsIgnoreCase("all")) + { + if (toggle.equalsIgnoreCase("on")) + { + Bukkit.getServer() + .getOnlinePlayers() + .forEach(player -> + { + plugin.getHalter() + .halt(player.getUniqueId()); + }); + + final Component message = sender.name() + .append(Component.text(": Freezing all players")) + .color(NamedTextColor.AQUA); + + Bukkit.broadcast(message); + sender.sendPlainMessage("All players have been halted."); + } else if (toggle.equalsIgnoreCase("off")) + { + plugin.getHalter() + .clear(); + + Bukkit.broadcast(Component.text("All players have been unfrozen!", NamedTextColor.AQUA)); + sender.sendPlainMessage("All players have been unhalted."); + } + } + } +} diff --git a/Datura/src/main/java/me/totalfreedom/datura/punishment/Halter.java b/Datura/src/main/java/me/totalfreedom/datura/punishment/Halter.java index 11ef9be..af61b9b 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/punishment/Halter.java +++ b/Datura/src/main/java/me/totalfreedom/datura/punishment/Halter.java @@ -22,6 +22,15 @@ public class Halter implements Listener this.haltedPlayers.add(uuid); } + public void stop(final UUID uuid) + { + this.haltedPlayers.remove(uuid); + } + + public void clear() { + this.haltedPlayers.clear(); + } + @EventHandler public void playerMove(final PlayerMoveEvent event) { diff --git a/Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java b/Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java new file mode 100644 index 0000000..2194026 --- /dev/null +++ b/Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java @@ -0,0 +1,15 @@ +package me.totalfreedom.base; + +import me.totalfreedom.provider.ModuleProvider; +import org.bukkit.plugin.java.JavaPlugin; + +public final class Shortcuts +{ + private Shortcuts() { + throw new AssertionError(); + } + + public static ModuleProvider provideModule(final Class pluginClass) { + return CommonsBase.getInstance().getRegistrations().getModuleRegistry().getProvider(pluginClass); + } +} diff --git a/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java b/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java index 0a740d6..c122527 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java +++ b/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java @@ -1,12 +1,12 @@ package me.totalfreedom.command; -import me.totalfreedom.api.Context; 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; import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -120,7 +120,7 @@ public final class BukkitDelegate extends Command implements PluginIdentifiableC final Subcommand node) { final Class[] argTypes = node.args(); - if (argTypes.length != args.length) + if (argTypes.length > args.length) return; final Object[] objects = new Object[argTypes.length + 1]; @@ -130,11 +130,27 @@ public final class BukkitDelegate extends Command implements PluginIdentifiableC final Class argType = argTypes[i]; final String arg = args[i]; - if (argType == String.class) - continue; + if (argType.equals(String.class)) + { + if (i == argTypes.length - 1) + { + final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1); + final String reason = String.join(" ", reasonArgs); + objects[i] = reason; + } else + { + continue; + } + } - final Context context = () -> provider.fromString(arg, argType); - objects[i] = context.get(); + if (argType.equals(Location.class)) { + final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3); + final String location = String.join(" ", locationArgs); + objects[i] = location; + } + + final Object obj = provider.fromString(arg, argType); + objects[i] = obj; } try { @@ -183,7 +199,7 @@ public final class BukkitDelegate extends Command implements PluginIdentifiableC "7", "8", "9")); - case "%location%" -> results.add("world,x,y,z"); + case "%location%" -> results.add("world x y z"); default -> results.add(p); } } diff --git a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Subcommand.java b/Patchwork/src/main/java/me/totalfreedom/command/annotation/Subcommand.java index b203761..679fdb1 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Subcommand.java +++ b/Patchwork/src/main/java/me/totalfreedom/command/annotation/Subcommand.java @@ -10,19 +10,26 @@ import java.lang.annotation.Target; /** * This annotation should be used to mark methods as subcommand methods. Subcommand methods can have custom arguments - * (current supported arguments can be found in the {@link ContextProvider}), and can also have a custom permission. - * These subcommands can also be annotated with {@link Completions} to provide tab completions for the subcommand. The - * subcommand method must be public, and must be in a class that is registered with the {@link CommandHandler}. - *
+ * (current supported arguments can be found in the {@link ContextProvider}), and can also have a custom + * permission. These subcommands can also be annotated with {@link Completions} to provide tab completions for the + * subcommand. The subcommand method must be public, and must be in a class that is registered with the + * {@link CommandHandler}. + *

* Tab completions with the {@link Completions} annotation are only supported for subcommands. When registering * completions, you only need to define the completion arguments a single time. If there are other methods which * function as optional additional arguments for the subcommand, the previously registered arguments will still be * present when the user does their tab completion. - *
+ *

* For example, if you have a subcommand method with the arguments {@code (Player, String)}, and another method which * has the arguments {@code (Player, String, String)}, the tab completions for the second method will still have the * {@code Player} and {@code String} arguments registered from the first method. You will only need to provide a * {@link Completion} for the additional 3rd argument. + *

+ * Additionally, if the final argument is a String object, the BukkitDelegate will automatically append any additional + * arguments to the end of the String. For example, if you have a subcommand method with the arguments + * {@code (Player, String)}, and the user executes the command with the arguments {@code /command playerName arg2 arg3}, + * the {@code String} argument will be {@code "arg2 arg3"}. This allows for us to use a String at the end of our + * subcommand arguments to allow for the user to input a reason. */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/Patchwork/src/main/java/me/totalfreedom/provider/ContextProvider.java b/Patchwork/src/main/java/me/totalfreedom/provider/ContextProvider.java index 680219d..0b28a8b 100644 --- a/Patchwork/src/main/java/me/totalfreedom/provider/ContextProvider.java +++ b/Patchwork/src/main/java/me/totalfreedom/provider/ContextProvider.java @@ -1,5 +1,8 @@ package me.totalfreedom.provider; +import me.totalfreedom.api.Context; +import me.totalfreedom.command.BukkitDelegate; +import me.totalfreedom.command.annotation.Subcommand; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -13,6 +16,26 @@ import org.jetbrains.annotations.Nullable; import java.util.Objects; import java.util.stream.Stream; +/** + * This class is used to provide context to subcommand methods. This class is used by the BukkitDelegate to parse + * arguments for subcommands. The following types are supported: + *

    + *
  • Boolean
    • + *
  • Double
    • + *
  • Integer
    • + *
  • Long
    • + *
  • Float
    • + *
  • Material
    • + *
  • Player
    • + *
  • World
    • + *
  • Location
    • + *
  • CommandSender
    • + *
  • Component
    • + *
+ * All of these types can be parsed from a String input. If the String cannot be parsed into any of + * these types, then null will be returned. + * @see #fromString(String, Class) + */ public class ContextProvider { public T fromString(final String string, final Class clazz) @@ -104,25 +127,29 @@ public class ContextProvider } /** - * When using this method, the input string must be formatted as - *
- * worldName,x,y,z - *
+ * When using this method, the next four arguments must be world, x, y, z. + * The world must be a valid world name, and x, y, and z must be valid doubles. + * If any of these are invalid, this will return null. * * @param string The string to parse * @return A location object if xyz is valid + * @see BukkitDelegate#processSubCommands(String[], CommandSender, ContextProvider, Subcommand) */ private @Nullable Location toLocation(final String string) { - final String[] split = string.split(","); + final String[] split = string.split(" "); if (split.length != 4 || toWorld(split[0]) == null) return null; - final double x = Double.parseDouble(split[1]); - final double y = Double.parseDouble(split[2]); - final double z = Double.parseDouble(split[3]); + try { + final double x = Double.parseDouble(split[1]); + final double y = Double.parseDouble(split[2]); + final double z = Double.parseDouble(split[3]); - return new Location(toWorld(split[0]), x, y, z); + return new Location(toWorld(split[0]), x, y, z); + } catch (NumberFormatException ex) { + return null; + } } private @Nullable CommandSender toCommandSender(final String string) From 09699ccabb1e5beccb7b3071444336ac618f55df Mon Sep 17 00:00:00 2001 From: Paul Reilly Date: Tue, 20 Jun 2023 09:24:28 -0500 Subject: [PATCH 02/18] AdminChat --- .../java/me/totalfreedom/corvo/Corvo.java | 18 +-- .../java/me/totalfreedom/datura/Datura.java | 26 ++-- .../datura/cmd/AdminChatCommand.java | 31 +++++ .../datura/perms/FreedomGroup.java | 4 +- .../datura/perms/FreedomUser.java | 22 ++-- .../totalfreedom/datura/punishment/Cager.java | 4 +- .../datura/punishment/Locker.java | 10 +- .../me/totalfreedom/datura/sql/MySQL.java | 50 ++++---- .../datura/user/SimpleUserData.java | 45 +++++-- .../java/me/totalfreedom/fossil/Fossil.java | 6 +- .../fossil/bouncypads/PadHolder.java | 4 +- .../base/{CommonsBase.java => Patchwork.java} | 6 +- .../me/totalfreedom/base/Registration.java | 2 +- .../java/me/totalfreedom/base/Shortcuts.java | 2 +- .../display/adminchat/ACFormatBuilder.java | 119 ++++++++++++++++++ .../display/adminchat/AdminChatDisplay.java | 97 ++++++++++++++ .../display/adminchat/AdminChatFormat.java | 97 ++++++++++++++ .../java/me/totalfreedom/event/EventBus.java | 8 +- .../java/me/totalfreedom/security/Groups.java | 30 +++++ .../totalfreedom/service/FreedomExecutor.java | 6 +- .../me/totalfreedom/shop/ReactionTask.java | 12 +- .../java/me/totalfreedom/user/UserData.java | 7 ++ .../utils/kyori/KyoriConstants.java | 4 +- 23 files changed, 507 insertions(+), 103 deletions(-) create mode 100644 Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java rename Patchwork/src/main/java/me/totalfreedom/base/{CommonsBase.java => Patchwork.java} (94%) create mode 100644 Patchwork/src/main/java/me/totalfreedom/display/adminchat/ACFormatBuilder.java create mode 100644 Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatDisplay.java create mode 100644 Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatFormat.java create mode 100644 Patchwork/src/main/java/me/totalfreedom/security/Groups.java diff --git a/Corvo/src/main/java/me/totalfreedom/corvo/Corvo.java b/Corvo/src/main/java/me/totalfreedom/corvo/Corvo.java index ba1670b..e698dc5 100644 --- a/Corvo/src/main/java/me/totalfreedom/corvo/Corvo.java +++ b/Corvo/src/main/java/me/totalfreedom/corvo/Corvo.java @@ -1,6 +1,6 @@ package me.totalfreedom.corvo; -import me.totalfreedom.base.CommonsBase; +import me.totalfreedom.base.Patchwork; import org.bukkit.plugin.java.JavaPlugin; public class Corvo extends JavaPlugin @@ -8,18 +8,18 @@ public class Corvo extends JavaPlugin @Override public void onDisable() { - CommonsBase.getInstance() - .getRegistrations() - .getModuleRegistry() - .removeModule(this); + Patchwork.getInstance() + .getRegistrations() + .getModuleRegistry() + .removeModule(this); } @Override public void onEnable() { - CommonsBase.getInstance() - .getRegistrations() - .getModuleRegistry() - .addModule(this); + Patchwork.getInstance() + .getRegistrations() + .getModuleRegistry() + .addModule(this); } } diff --git a/Datura/src/main/java/me/totalfreedom/datura/Datura.java b/Datura/src/main/java/me/totalfreedom/datura/Datura.java index da40da4..4680a03 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/Datura.java +++ b/Datura/src/main/java/me/totalfreedom/datura/Datura.java @@ -1,6 +1,6 @@ package me.totalfreedom.datura; -import me.totalfreedom.base.CommonsBase; +import me.totalfreedom.base.Patchwork; import me.totalfreedom.datura.punishment.Cager; import me.totalfreedom.datura.punishment.Halter; import me.totalfreedom.datura.punishment.Locker; @@ -20,19 +20,19 @@ public class Datura extends JavaPlugin @Override public void onEnable() { - CommonsBase.getInstance() - .getRegistrations() - .getModuleRegistry() - .addModule(this); + Patchwork.getInstance() + .getRegistrations() + .getModuleRegistry() + .addModule(this); - CommonsBase.getInstance() - .getRegistrations() - .getServiceTaskRegistry() - .registerService(SubscriptionProvider.syncService(this, locker)); - CommonsBase.getInstance() - .getRegistrations() - .getServiceTaskRegistry() - .registerService(SubscriptionProvider.syncService(this, cager)); + Patchwork.getInstance() + .getRegistrations() + .getServiceTaskRegistry() + .registerService(SubscriptionProvider.syncService(this, locker)); + Patchwork.getInstance() + .getRegistrations() + .getServiceTaskRegistry() + .registerService(SubscriptionProvider.syncService(this, cager)); Bukkit.getPluginManager() .registerEvents(halter, this); diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java new file mode 100644 index 0000000..966d2bd --- /dev/null +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java @@ -0,0 +1,31 @@ +package me.totalfreedom.datura.cmd; + +import me.totalfreedom.command.Commander; +import me.totalfreedom.command.annotation.Base; +import org.bukkit.command.CommandSender; +import org.bukkit.event.HandlerList; +import org.bukkit.plugin.java.JavaPlugin; +import org.jetbrains.annotations.NotNull; + +public class AdminChatCommand extends Commander +{ + + /** + * Initializes this command object. The provided {@link JavaPlugin} should be the plugin which contains the + * command. + *

+ * This constructor will automatically register all subcommands and completions for this command. It will also + * automatically infer all required information from the provided {@link Info} and {@link Permissive} annotations. + * + * @param plugin The plugin which contains this command. + */ + protected AdminChatCommand(@NotNull final JavaPlugin plugin) + { + super(plugin); + } + + @Base + public void onAdminChat(final CommandSender sender) { + + } +} diff --git a/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomGroup.java b/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomGroup.java index a2ccc5d..affa495 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomGroup.java +++ b/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomGroup.java @@ -1,6 +1,6 @@ package me.totalfreedom.datura.perms; -import me.totalfreedom.base.CommonsBase; +import me.totalfreedom.base.Patchwork; import me.totalfreedom.security.Group; import me.totalfreedom.security.Node; import net.kyori.adventure.text.Component; @@ -41,7 +41,7 @@ public class FreedomGroup implements Group this.isDefault = isDefault; this.isHidden = isHidden; this.permissions = new HashSet<>(); - this.attachment = new PermissionAttachment(CommonsBase.getInstance(), this); + this.attachment = new PermissionAttachment(Patchwork.getInstance(), this); } @Override diff --git a/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomUser.java b/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomUser.java index 3f1510f..a055351 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomUser.java +++ b/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomUser.java @@ -1,6 +1,6 @@ package me.totalfreedom.datura.perms; -import me.totalfreedom.base.CommonsBase; +import me.totalfreedom.base.Patchwork; import me.totalfreedom.datura.Datura; import me.totalfreedom.datura.user.SimpleUserData; import me.totalfreedom.security.Node; @@ -42,11 +42,11 @@ public class FreedomUser implements User this.permissions = new HashSet<>(); this.displayName = player.displayName(); - final Datura datura = CommonsBase.getInstance() - .getRegistrations() - .getModuleRegistry() - .getProvider(Datura.class) - .getModule(); + final Datura datura = Patchwork.getInstance() + .getRegistrations() + .getModuleRegistry() + .getProvider(Datura.class) + .getModule(); UserData data = SimpleUserData.fromSQL(datura.getSQL(), uuid.toString()); @@ -57,10 +57,10 @@ public class FreedomUser implements User this.userData = data; - CommonsBase.getInstance() - .getRegistrations() - .getUserRegistry() - .registerUserData(this, userData); + Patchwork.getInstance() + .getRegistrations() + .getUserRegistry() + .registerUserData(this, userData); } @Override @@ -96,7 +96,7 @@ public class FreedomUser implements User @Override public boolean addPermission(final Node node) { - final PermissionAttachment attachment = addAttachment(CommonsBase.getInstance(), node.key(), node.value()); + final PermissionAttachment attachment = addAttachment(Patchwork.getInstance(), node.key(), node.value()); bukkitAttachments.put(node, attachment); return permissions().add(node); } diff --git a/Datura/src/main/java/me/totalfreedom/datura/punishment/Cager.java b/Datura/src/main/java/me/totalfreedom/datura/punishment/Cager.java index 52920aa..5b3ef49 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/punishment/Cager.java +++ b/Datura/src/main/java/me/totalfreedom/datura/punishment/Cager.java @@ -1,6 +1,6 @@ package me.totalfreedom.datura.punishment; -import me.totalfreedom.base.CommonsBase; +import me.totalfreedom.base.Patchwork; import me.totalfreedom.service.Service; import me.totalfreedom.utils.ShapeUtils; import org.bukkit.Bukkit; @@ -32,7 +32,7 @@ public class Cager extends Service this.cagedPlayers = new HashSet<>(); this.cageLocations = new HashMap<>(); Bukkit.getPluginManager() - .registerEvents(new CageListener(), CommonsBase.getInstance()); + .registerEvents(new CageListener(), Patchwork.getInstance()); } /** diff --git a/Datura/src/main/java/me/totalfreedom/datura/punishment/Locker.java b/Datura/src/main/java/me/totalfreedom/datura/punishment/Locker.java index 9e1e027..c459037 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/punishment/Locker.java +++ b/Datura/src/main/java/me/totalfreedom/datura/punishment/Locker.java @@ -1,6 +1,6 @@ package me.totalfreedom.datura.punishment; -import me.totalfreedom.base.CommonsBase; +import me.totalfreedom.base.Patchwork; import me.totalfreedom.service.Service; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -35,10 +35,10 @@ public class Locker extends Service @Override public void tick() { - lockedPlayers.removeIf(uuid -> !CommonsBase.getInstance() - .getServer() - .getOfflinePlayer(uuid) - .isOnline()); + lockedPlayers.removeIf(uuid -> !Patchwork.getInstance() + .getServer() + .getOfflinePlayer(uuid) + .isOnline()); for (final UUID uuid : lockedPlayers) { diff --git a/Datura/src/main/java/me/totalfreedom/datura/sql/MySQL.java b/Datura/src/main/java/me/totalfreedom/datura/sql/MySQL.java index 9446e08..ae2debf 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/sql/MySQL.java +++ b/Datura/src/main/java/me/totalfreedom/datura/sql/MySQL.java @@ -1,6 +1,6 @@ package me.totalfreedom.datura.sql; -import me.totalfreedom.base.CommonsBase; +import me.totalfreedom.base.Patchwork; import me.totalfreedom.sql.SQL; import me.totalfreedom.utils.container.Identity; @@ -75,9 +75,9 @@ public class MySQL implements SQL throw new CompletionException("Failed to prepare statement: " + query + "\n", ex); } - }, CommonsBase.getInstance() - .getExecutor() - .getAsync()); + }, Patchwork.getInstance() + .getExecutor() + .getAsync()); } private CompletableFuture getConnection() @@ -92,9 +92,9 @@ public class MySQL implements SQL throw new CompletionException("Failed to connect to the database: " + url.toString() + "\n", ex); } - }, CommonsBase.getInstance() - .getExecutor() - .getAsync()); + }, Patchwork.getInstance() + .getExecutor() + .getAsync()); } @Override @@ -112,9 +112,9 @@ public class MySQL implements SQL "Failed to retrieve a result set from query: " + query + "\n", ex); } - }, CommonsBase.getInstance() - .getExecutor() - .getAsync()); + }, Patchwork.getInstance() + .getExecutor() + .getAsync()); } @Override @@ -131,9 +131,9 @@ public class MySQL implements SQL throw new CompletionException("Failed to execute update: " + query + "\n", ex); } - }, CommonsBase.getInstance() - .getExecutor() - .getAsync()); + }, Patchwork.getInstance() + .getExecutor() + .getAsync()); } @Override @@ -150,9 +150,9 @@ public class MySQL implements SQL throw new CompletionException("Failed to execute statement: " + query + "\n", ex); } - }, CommonsBase.getInstance() - .getExecutor() - .getAsync()); + }, Patchwork.getInstance() + .getExecutor() + .getAsync()); } @Override @@ -194,26 +194,26 @@ public class MySQL implements SQL ex); } return null; - }, CommonsBase.getInstance() - .getExecutor() - .getAsync()); + }, Patchwork.getInstance() + .getExecutor() + .getAsync()); } public CompletableFuture updateColumn(final String table, final String column, final Object value, final String key, final Identity identity) { return executeUpdate("UPDATE ? SET ? = ? WHERE ? = ?", table, column, value, key, identity.getId()) - .thenApplyAsync(result -> result > 0, CommonsBase.getInstance() - .getExecutor() - .getAsync()); + .thenApplyAsync(result -> result > 0, Patchwork.getInstance() + .getExecutor() + .getAsync()); } public CompletableFuture deleteRow(final String table, final String key, final Identity identity) { return executeUpdate("DELETE FROM ? WHERE ? = ?", table, key, identity.getId()) - .thenApplyAsync(result -> result > 0, CommonsBase.getInstance() - .getExecutor() - .getAsync()); + .thenApplyAsync(result -> result > 0, Patchwork.getInstance() + .getExecutor() + .getAsync()); } public CompletableFuture insertRow(final String table, final Object... values) diff --git a/Datura/src/main/java/me/totalfreedom/datura/user/SimpleUserData.java b/Datura/src/main/java/me/totalfreedom/datura/user/SimpleUserData.java index 014876c..4a391c6 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/user/SimpleUserData.java +++ b/Datura/src/main/java/me/totalfreedom/datura/user/SimpleUserData.java @@ -1,8 +1,9 @@ package me.totalfreedom.datura.user; -import me.totalfreedom.base.CommonsBase; +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; @@ -29,6 +30,8 @@ public class SimpleUserData implements UserData private boolean canInteract; private AtomicLong balance; private boolean transactionsFrozen; + private boolean hasCustomACFormat = false; + private String customACFormat; public SimpleUserData(final Player player) { @@ -36,9 +39,9 @@ public class SimpleUserData implements UserData this.username = player.getName(); this.user = new FreedomUser(player); - CommonsBase.getInstance() - .getEventBus() - .addEvent(event); + Patchwork.getInstance() + .getEventBus() + .addEvent(event); } private SimpleUserData( @@ -59,6 +62,7 @@ public class SimpleUserData implements UserData this.canInteract = canInteract; this.balance = new AtomicLong(balance); this.transactionsFrozen = transactionsFrozen; + this.customACFormat = AdminChatFormat.DEFAULT.serialize(); } public static SimpleUserData fromSQL(final SQL sql, final String uuid) @@ -81,10 +85,10 @@ public class SimpleUserData implements UserData throw new IllegalStateException("Player should be online but they are not!"); final User user = new FreedomUser(player); - final Group group = CommonsBase.getInstance() - .getRegistrations() - .getGroupRegistry() - .getGroup(g); + final Group group = Patchwork.getInstance() + .getRegistrations() + .getGroupRegistry() + .getGroup(g); final long playtime = result.getLong("playtime"); final boolean canInteract = result.getBoolean("canInteract"); @@ -113,9 +117,9 @@ public class SimpleUserData implements UserData if (player == null) throw new IllegalStateException("Player should be online but they are not!"); return new SimpleUserData(player); - }, CommonsBase.getInstance() - .getExecutor() - .getAsync()) + }, Patchwork.getInstance() + .getExecutor() + .getAsync()) .join(); } @@ -219,4 +223,23 @@ public class SimpleUserData implements UserData { return balance.addAndGet(-amount); } + + @Override + public boolean hasCustomACFormat() + { + return hasCustomACFormat; + } + + @Override + public void setCustomACFormat(final String format) + { + this.hasCustomACFormat = format.equals(AdminChatFormat.DEFAULT.serialize()); + this.customACFormat = format; + } + + @Override + public AdminChatFormat getCustomACFormat() + { + return AdminChatFormat.deserialize(customACFormat); + } } diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/Fossil.java b/Fossil/src/main/java/me/totalfreedom/fossil/Fossil.java index 18dc7fb..a4eda38 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/Fossil.java +++ b/Fossil/src/main/java/me/totalfreedom/fossil/Fossil.java @@ -1,6 +1,6 @@ package me.totalfreedom.fossil; -import me.totalfreedom.base.CommonsBase; +import me.totalfreedom.base.Patchwork; import me.totalfreedom.base.Registration; import me.totalfreedom.fossil.trail.Trailer; import me.totalfreedom.service.SubscriptionProvider; @@ -9,8 +9,8 @@ import org.bukkit.plugin.java.JavaPlugin; public class Fossil extends JavaPlugin { private final Trailer trailer = new Trailer(); - private final Registration registration = CommonsBase.getInstance() - .getRegistrations(); + private final Registration registration = Patchwork.getInstance() + .getRegistrations(); @Override public void onEnable() diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/PadHolder.java b/Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/PadHolder.java index cd4842e..7af351b 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/PadHolder.java +++ b/Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/PadHolder.java @@ -1,6 +1,6 @@ package me.totalfreedom.fossil.bouncypads; -import me.totalfreedom.base.CommonsBase; +import me.totalfreedom.base.Patchwork; import me.totalfreedom.fossil.Fossil; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -33,7 +33,7 @@ public class PadHolder implements Listener public PadHolder() { Bukkit.getPluginManager() - .registerEvents(this, CommonsBase + .registerEvents(this, Patchwork .getInstance() .getRegistrations() .getModuleRegistry() diff --git a/Patchwork/src/main/java/me/totalfreedom/base/CommonsBase.java b/Patchwork/src/main/java/me/totalfreedom/base/Patchwork.java similarity index 94% rename from Patchwork/src/main/java/me/totalfreedom/base/CommonsBase.java rename to Patchwork/src/main/java/me/totalfreedom/base/Patchwork.java index 69bade0..2ee663b 100644 --- a/Patchwork/src/main/java/me/totalfreedom/base/CommonsBase.java +++ b/Patchwork/src/main/java/me/totalfreedom/base/Patchwork.java @@ -9,7 +9,7 @@ import org.bukkit.plugin.java.JavaPlugin; /** * The base class for Patchwork. */ -public class CommonsBase extends JavaPlugin +public class Patchwork extends JavaPlugin { /** * The {@link EventBus} for this plugin. @@ -30,9 +30,9 @@ public class CommonsBase extends JavaPlugin * * @return the plugin instance */ - public static CommonsBase getInstance() + public static Patchwork getInstance() { - return JavaPlugin.getPlugin(CommonsBase.class); + return JavaPlugin.getPlugin(Patchwork.class); } @Override diff --git a/Patchwork/src/main/java/me/totalfreedom/base/Registration.java b/Patchwork/src/main/java/me/totalfreedom/base/Registration.java index e697fe9..db58a4f 100644 --- a/Patchwork/src/main/java/me/totalfreedom/base/Registration.java +++ b/Patchwork/src/main/java/me/totalfreedom/base/Registration.java @@ -12,7 +12,7 @@ import me.totalfreedom.data.UserRegistry; *
* Registries such as {@link ModuleRegistry} and {@link ServiceTaskRegistry} can be found as final objects in this * class. These registries should only ever be accessed through the single Registration object in CommonsBase using - * {@link CommonsBase#getRegistrations()} + * {@link Patchwork#getRegistrations()} */ public class Registration { diff --git a/Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java b/Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java index 2194026..d3d7bf7 100644 --- a/Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java +++ b/Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java @@ -10,6 +10,6 @@ public final class Shortcuts } public static ModuleProvider provideModule(final Class pluginClass) { - return CommonsBase.getInstance().getRegistrations().getModuleRegistry().getProvider(pluginClass); + return Patchwork.getInstance().getRegistrations().getModuleRegistry().getProvider(pluginClass); } } diff --git a/Patchwork/src/main/java/me/totalfreedom/display/adminchat/ACFormatBuilder.java b/Patchwork/src/main/java/me/totalfreedom/display/adminchat/ACFormatBuilder.java new file mode 100644 index 0000000..b676936 --- /dev/null +++ b/Patchwork/src/main/java/me/totalfreedom/display/adminchat/ACFormatBuilder.java @@ -0,0 +1,119 @@ +package me.totalfreedom.display.adminchat; + +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextColor; + +public class ACFormatBuilder +{ + private char openTag = '['; + private char closeTag = ']'; + private TextColor prefixColor = NamedTextColor.DARK_RED; + private TextColor bracketColor = NamedTextColor.WHITE; + private TextColor nameColor = NamedTextColor.AQUA; + private TextColor rankColor = NamedTextColor.GOLD; + private String prefix = "Admin"; + private String chatSplitter = ">>"; + + private ACFormatBuilder() + { + + } + + public static ACFormatBuilder format() + { + return new ACFormatBuilder(); + } + + public ACFormatBuilder openBracket(final char openTag) + { + this.openTag = openTag; + return this; + } + + public ACFormatBuilder closeBracket(final char closeTag) + { + this.closeTag = closeTag; + return this; + } + + public ACFormatBuilder prefixColor(final TextColor prefixColor) + { + this.prefixColor = prefixColor; + return this; + } + + public ACFormatBuilder bracketColor(final TextColor bracketColor) + { + this.bracketColor = bracketColor; + return this; + } + + public ACFormatBuilder prefix(final String prefix) + { + this.prefix = prefix; + return this; + } + + public ACFormatBuilder chatSplitter(final String chatSplitter) + { + this.chatSplitter = chatSplitter; + return this; + } + + public ACFormatBuilder nameColor(final TextColor nameColor) + { + this.nameColor = nameColor; + return this; + } + + public ACFormatBuilder rankColor(final TextColor rankColor) + { + this.rankColor = rankColor; + return this; + } + + String openBracket() + { + return String.valueOf(openTag); + } + + String closeBracket() + { + return String.valueOf(closeTag); + } + + TextColor prefixColor() + { + return prefixColor; + } + + TextColor bracketColor() + { + return bracketColor; + } + + TextColor nameColor() + { + return nameColor; + } + + TextColor rankColor() + { + return rankColor; + } + + String prefix() + { + return prefix; + } + + String chatSplitter() + { + return chatSplitter; + } + + public AdminChatFormat build() + { + return new AdminChatFormat(this); + } +} diff --git a/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatDisplay.java b/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatDisplay.java new file mode 100644 index 0000000..06ec6d9 --- /dev/null +++ b/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatDisplay.java @@ -0,0 +1,97 @@ +package me.totalfreedom.display.adminchat; + +import io.papermc.paper.event.player.AsyncChatEvent; +import me.totalfreedom.base.Patchwork; +import me.totalfreedom.base.Shortcuts; +import me.totalfreedom.data.UserRegistry; +import me.totalfreedom.user.UserData; +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; +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 +{ + private final Map adminChatFormat = new HashMap<>(); + private final Set toggledChat = new HashSet<>(); + + public AdminChatDisplay() { + new ACListener(this); + } + + public void addPlayer(final Player player, final AdminChatFormat format) + { + adminChatFormat.put(player.getUniqueId(), format); + } + + public void removePlayer(final Player player) + { + adminChatFormat.remove(player.getUniqueId()); + } + + public boolean hasPlayer(final Player player) + { + return adminChatFormat.containsKey(player.getUniqueId()); + } + + public void updateFormat(final Player player, final AdminChatFormat newFormat) + { + adminChatFormat.put(player.getUniqueId(), newFormat); + } + + public AdminChatFormat getFormat(final Player player) + { + return adminChatFormat.get(player.getUniqueId()); + } + + public Set getPlayers() + { + return adminChatFormat.keySet(); + } + + public Map getAdminChatFormat() + { + return adminChatFormat; + } + + public static final class ACListener implements Listener + { + private final AdminChatDisplay display; + + public ACListener(final AdminChatDisplay display) + { + this.display = display; + Bukkit.getPluginManager() + .registerEvents(this, Shortcuts.provideModule(Patchwork.class) + .getModule()); + } + + @EventHandler + public void playerChat(final AsyncChatEvent event) { + if (display.getPlayers().contains(event.getPlayer().getUniqueId())) { + event.setCancelled(true); + + } + } + + @EventHandler + public void playerJoin(final PlayerJoinEvent event) { + final Player player = event.getPlayer(); + if (player.hasPermission("patchwork.adminchat")) { + final UserData data = Patchwork.getInstance().getRegistrations().getUserRegistry().fromPlayer(player); + if (data.hasCustomACFormat()) { + display.addPlayer(player, data.getCustomACFormat()); + } else { + display.addPlayer(player, AdminChatFormat.DEFAULT); + } + } + } + } +} diff --git a/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatFormat.java b/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatFormat.java new file mode 100644 index 0000000..b8dd757 --- /dev/null +++ b/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatFormat.java @@ -0,0 +1,97 @@ +package me.totalfreedom.display.adminchat; + +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.TextComponent; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; + +public final class AdminChatFormat +{ + public static final AdminChatFormat DEFAULT = ACFormatBuilder.format() + .build(); + private final Component prefix; + private final Component userName; + private final Component rank; + private final Component chatSplitter; + private final Component fullFormat; + + + AdminChatFormat(final ACFormatBuilder builder) + { + this.prefix = Component.text(builder.openBracket(), builder.bracketColor()) + .append(Component.text(builder.prefix(), builder.prefixColor())) + .append(Component.text(builder.closeBracket(), builder.bracketColor())); + this.userName = Component.text("%name%", builder.nameColor()); + this.rank = Component.text(builder.openBracket(), builder.bracketColor()) + .append(Component.text("%rank%", builder.rankColor())) + .append(Component.text(builder.closeBracket(), builder.bracketColor())); + this.chatSplitter = Component.text(builder.chatSplitter(), NamedTextColor.WHITE); + + this.fullFormat = prefix.append(Component.space()) + .append(userName) + .append(Component.space()) + .append(rank) + .append(Component.space()) + .append(chatSplitter) + .append(Component.space()); + } + + public static AdminChatFormat deserialize(final String serialized) + { + final Component dez = LegacyComponentSerializer.legacyAmpersand() + .deserialize(serialized); + final Component prefix = dez.children() + .get(0); + final Component userName = dez.children() + .get(1); + final Component rank = dez.children() + .get(2); + final Component chatSplitter = dez.children() + .get(3); + + return ACFormatBuilder.format() + .prefix(((TextComponent) prefix).content()) + .prefixColor(prefix.color()) + .nameColor(userName.color()) + .rankColor(rank.color()) + .chatSplitter(((TextComponent) chatSplitter).content()) + .build(); + } + + public Component getPrefix() + { + return prefix; + } + + public Component getUserName() + { + return userName; + } + + public Component getRank() + { + return rank; + } + + public Component getFullFormat() + { + return fullFormat; + } + + public Component format(final String name, final String rank) + { + return fullFormat.replaceText(b -> + { + b.matchLiteral("%name%") + .replacement(name); + b.matchLiteral("%rank%") + .replacement(rank); + }); + } + + public String serialize() + { + return LegacyComponentSerializer.legacyAmpersand() + .serialize(fullFormat); + } +} diff --git a/Patchwork/src/main/java/me/totalfreedom/event/EventBus.java b/Patchwork/src/main/java/me/totalfreedom/event/EventBus.java index 67b8514..e012d6f 100644 --- a/Patchwork/src/main/java/me/totalfreedom/event/EventBus.java +++ b/Patchwork/src/main/java/me/totalfreedom/event/EventBus.java @@ -1,7 +1,7 @@ package me.totalfreedom.event; import me.totalfreedom.api.Context; -import me.totalfreedom.base.CommonsBase; +import me.totalfreedom.base.Patchwork; import me.totalfreedom.service.Service; import java.util.HashSet; @@ -9,11 +9,11 @@ import java.util.Set; public class EventBus extends Service { - private final CommonsBase plugin; + private final Patchwork plugin; private final Set eventSet = new HashSet<>(); private final SubscriptionBox runningSubscriptions = new SubscriptionBox<>(); - public EventBus(final CommonsBase plugin) + public EventBus(final Patchwork plugin) { super("event_bus"); this.plugin = plugin; @@ -57,7 +57,7 @@ public class EventBus extends Service runningSubscriptions.removeSubscription(subscription); } - public CommonsBase getCommonsBase() + public Patchwork getCommonsBase() { return plugin; } diff --git a/Patchwork/src/main/java/me/totalfreedom/security/Groups.java b/Patchwork/src/main/java/me/totalfreedom/security/Groups.java new file mode 100644 index 0000000..2f92fa3 --- /dev/null +++ b/Patchwork/src/main/java/me/totalfreedom/security/Groups.java @@ -0,0 +1,30 @@ +package me.totalfreedom.security; + +public enum Groups +{ + NON_OP("patchwork.group.non-op"), + OP("patchwork.group.op"), + SUPER_ADMIN("patchwork.group.super"), + SENIOR_ADMIN("patchwork.group.senior"), + DEVELOPER("patchwork.group.dev"), + EXECUTIVE("patchwork.group.exec"), + OWNER("patchwork.group.owner"); + + private final String permission; + + Groups(final String permission) + { + this.permission = permission; + } + + public String getPermission() + { + return this.permission; + } + + @Override + public String toString() + { + return this.permission; + } +} diff --git a/Patchwork/src/main/java/me/totalfreedom/service/FreedomExecutor.java b/Patchwork/src/main/java/me/totalfreedom/service/FreedomExecutor.java index f090314..2b52f4e 100644 --- a/Patchwork/src/main/java/me/totalfreedom/service/FreedomExecutor.java +++ b/Patchwork/src/main/java/me/totalfreedom/service/FreedomExecutor.java @@ -1,6 +1,6 @@ package me.totalfreedom.service; -import me.totalfreedom.base.CommonsBase; +import me.totalfreedom.base.Patchwork; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; @@ -29,9 +29,9 @@ public class FreedomExecutor public FreedomExecutor() { syncExecutor = r -> Bukkit.getScheduler() - .runTask(CommonsBase.getInstance(), r); + .runTask(Patchwork.getInstance(), r); asyncExecutor = r -> Bukkit.getScheduler() - .runTaskAsynchronously(CommonsBase.getInstance(), r); + .runTaskAsynchronously(Patchwork.getInstance(), r); } /** diff --git a/Patchwork/src/main/java/me/totalfreedom/shop/ReactionTask.java b/Patchwork/src/main/java/me/totalfreedom/shop/ReactionTask.java index cceb27e..f27f5c6 100644 --- a/Patchwork/src/main/java/me/totalfreedom/shop/ReactionTask.java +++ b/Patchwork/src/main/java/me/totalfreedom/shop/ReactionTask.java @@ -1,7 +1,7 @@ package me.totalfreedom.shop; import io.papermc.paper.event.player.AsyncChatEvent; -import me.totalfreedom.base.CommonsBase; +import me.totalfreedom.base.Patchwork; import me.totalfreedom.display.BossBarDisplay; import me.totalfreedom.display.BossBarTimer; import me.totalfreedom.economy.EconomicEntity; @@ -36,7 +36,7 @@ public class ReactionTask extends Task implements Listener } final BossBarTimer timer = new BossBarTimer(bossBarDisplay, reaction.getReactionDuration()); - timer.runTaskTimer(CommonsBase.getInstance(), 0L, timer.getInterval()); + timer.runTaskTimer(Patchwork.getInstance(), 0L, timer.getInterval()); } @EventHandler @@ -45,10 +45,10 @@ public class ReactionTask extends Task implements Listener if (event.message() .equals(reaction.getReactionMessage())) { - final EconomicEntity entity = CommonsBase.getInstance() - .getRegistrations() - .getUserRegistry() - .getUser(event.getPlayer()); + final EconomicEntity entity = Patchwork.getInstance() + .getRegistrations() + .getUserRegistry() + .getUser(event.getPlayer()); reaction.onReact(entity); } diff --git a/Patchwork/src/main/java/me/totalfreedom/user/UserData.java b/Patchwork/src/main/java/me/totalfreedom/user/UserData.java index 2cfb8d1..a2c4b4a 100644 --- a/Patchwork/src/main/java/me/totalfreedom/user/UserData.java +++ b/Patchwork/src/main/java/me/totalfreedom/user/UserData.java @@ -1,5 +1,6 @@ package me.totalfreedom.user; +import me.totalfreedom.display.adminchat.AdminChatFormat; import me.totalfreedom.economy.EconomicEntityData; import me.totalfreedom.security.Group; import org.jetbrains.annotations.NotNull; @@ -30,4 +31,10 @@ public interface UserData extends EconomicEntityData boolean canInteract(); void setInteractionState(boolean canInteract); + + boolean hasCustomACFormat(); + + void setCustomACFormat(final String customACFormat); + + AdminChatFormat getCustomACFormat(); } diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/kyori/KyoriConstants.java b/Patchwork/src/main/java/me/totalfreedom/utils/kyori/KyoriConstants.java index 0ffbe29..aa33c59 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/kyori/KyoriConstants.java +++ b/Patchwork/src/main/java/me/totalfreedom/utils/kyori/KyoriConstants.java @@ -1,6 +1,6 @@ package me.totalfreedom.utils.kyori; -import me.totalfreedom.base.CommonsBase; +import me.totalfreedom.base.Patchwork; import net.kyori.adventure.chat.ChatType; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; @@ -24,7 +24,7 @@ public final class KyoriConstants /** * A singleton {@link ChatType.Bound} for the Patchwork plugin. */ - public static final ChatType.Bound PATCHWORK = fromPlugin(CommonsBase.class); + public static final ChatType.Bound PATCHWORK = fromPlugin(Patchwork.class); private KyoriConstants() { From fb97a8e65b08823106ecfb60b963a5d6139e5fb7 Mon Sep 17 00:00:00 2001 From: Paul Reilly Date: Wed, 21 Jun 2023 15:45:55 -0500 Subject: [PATCH 03/18] updates --- .../datura/cmd/AdminChatCommand.java | 39 ++++++++++- .../totalfreedom/datura/cmd/CageCommand.java | 11 +-- .../totalfreedom/datura/cmd/HaltCommand.java | 14 ++-- .../totalfreedom/datura/cmd/SmiteCommand.java | 51 ++++++++++++++ .../datura/punishment/Halter.java | 3 +- .../datura/user/SimpleUserData.java | 12 ++-- .../java/me/totalfreedom/base/Patchwork.java | 16 +++++ .../java/me/totalfreedom/base/Shortcuts.java | 24 +++++-- .../totalfreedom/command/BukkitDelegate.java | 23 +++++-- .../display/adminchat/AdminChatDisplay.java | 69 +++++++++++++++---- .../display/adminchat/AdminChatFormat.java | 20 ++++-- .../java/me/totalfreedom/security/Groups.java | 41 ++++++++--- 12 files changed, 267 insertions(+), 56 deletions(-) create mode 100644 Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java index 966d2bd..6920d2f 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java @@ -1,12 +1,19 @@ package me.totalfreedom.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 net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; -import org.bukkit.event.HandlerList; +import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; +@Info(name = "") +@Permissive(perm = "") public class AdminChatCommand extends Commander { @@ -25,7 +32,33 @@ public class AdminChatCommand extends Commander } @Base - public void onAdminChat(final CommandSender sender) { - + public void onAdminChat(final CommandSender sender) + { + if (!(sender instanceof Player)) return; + + final Player player = (Player) sender; + + Patchwork.getInstance() + .getAdminChatDisplay() + .toggleChat(player); + + final boolean toggled = Patchwork.getInstance() + .getAdminChatDisplay() + .isToggled(player); + + String message = "Toggled adminchat "; + + message += toggled ? "on" : "off"; + + player.sendPlainMessage(message + "."); + } + + // String here will automatically have all additional args appended to it :) + @Subcommand(permission = "patchwork.adminchat", args = {String.class}) + public void sendMessage(final CommandSender sender, final String message) + { + Patchwork.getInstance() + .getAdminChatDisplay() + .adminChatMessage(sender, Component.text(message)); } } diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java index 91c12fc..375b38a 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java @@ -21,6 +21,7 @@ package me.totalfreedom.datura.cmd; +import me.totalfreedom.base.Shortcuts; import me.totalfreedom.command.Commander; import me.totalfreedom.command.annotation.Completion; import me.totalfreedom.command.annotation.Info; @@ -68,13 +69,15 @@ public class CageCommand extends Commander { if (string.equalsIgnoreCase("on")) { - ((Datura) getPlugin()).getCager() - .cagePlayer(player.getUniqueId(), material); + Shortcuts.provideModule(Datura.class) + .getCager() + .cagePlayer(player.getUniqueId(), material); sender.sendPlainMessage("Caged " + player.getName() + "."); } else if (string.equalsIgnoreCase("off")) { - ((Datura) getPlugin()).getCager() - .uncagePlayer(player.getUniqueId()); + Shortcuts.provideModule(Datura.class) + .getCager() + .uncagePlayer(player.getUniqueId()); sender.sendPlainMessage("Liberated " + player.getName() + "."); } } diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java index 0edca7c..a4bfd32 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java @@ -2,6 +2,7 @@ package me.totalfreedom.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; @@ -18,8 +19,7 @@ import org.jetbrains.annotations.NotNull; @Permissive(perm = "datura.halt") public class HaltCommand extends Commander { - private final Datura plugin = Shortcuts.provideModule(Datura.class) - .getModule(); + private final Datura plugin = Shortcuts.provideModule(Datura.class); /** * Initializes this command object. The provided {@link JavaPlugin} should be the plugin which contains the @@ -36,6 +36,8 @@ public class HaltCommand extends Commander } + @Completion(index = 0, args = {"%player%", "all"}) + @Completion(index = 1, args = {"on", "off"}) @Subcommand(permission = "datura.halt", args = {Player.class, String.class}) public void haltPlayer(final CommandSender sender, final Player target, final String toggle) { @@ -56,6 +58,7 @@ public class HaltCommand extends Commander } } + // No completion needed here since it's already registered. @Subcommand(permission = "datura.halt.all", args = {String.class, String.class}) public void haltAll(final CommandSender sender, final String all, final String toggle) { @@ -65,11 +68,8 @@ public class HaltCommand extends Commander { Bukkit.getServer() .getOnlinePlayers() - .forEach(player -> - { - plugin.getHalter() - .halt(player.getUniqueId()); - }); + .forEach(player -> plugin.getHalter() + .halt(player.getUniqueId())); final Component message = sender.name() .append(Component.text(": Freezing all players")) diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java new file mode 100644 index 0000000..531f59f --- /dev/null +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java @@ -0,0 +1,51 @@ +package me.totalfreedom.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 org.bukkit.Location; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; +import org.jetbrains.annotations.NotNull; + +@Info(name = "smite", description = "Smite a player.", usage = "/smite ", aliases = {"sm"}) +@Permissive(perm = "datura.smite") +public class SmiteCommand extends Commander +{ + /** + * Initializes this command object. The provided {@link JavaPlugin} should be the plugin which contains the + * command. + *

+ * This constructor will automatically register all subcommands and completions for this command. It will also + * automatically infer all required information from the provided {@link Info} and {@link Permissive} annotations. + * + * @param plugin The plugin which contains this command. + */ + protected SmiteCommand(@NotNull final JavaPlugin plugin) + { + super(plugin); + } + + @Subcommand(permission = "datura.smite", args = {Player.class}) + @Completion(index = 0, args = {"%player%"}) + public void smite(final CommandSender sender, final Player player) + { + final double size = 5D; + for (int i = 0; i < size * size * size; i++) + { + final double x = i % size; + final double y = (i / size) % size; + final double z = (i / size / size) % size; + + final Location location = player.getLocation() + .clone() + .add(x - size / 2, y - size / 2, z - size / 2); + + player.getWorld() + .strikeLightning(location); + } + } +} diff --git a/Datura/src/main/java/me/totalfreedom/datura/punishment/Halter.java b/Datura/src/main/java/me/totalfreedom/datura/punishment/Halter.java index af61b9b..5ffff30 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/punishment/Halter.java +++ b/Datura/src/main/java/me/totalfreedom/datura/punishment/Halter.java @@ -27,7 +27,8 @@ public class Halter implements Listener this.haltedPlayers.remove(uuid); } - public void clear() { + public void clear() + { this.haltedPlayers.clear(); } diff --git a/Datura/src/main/java/me/totalfreedom/datura/user/SimpleUserData.java b/Datura/src/main/java/me/totalfreedom/datura/user/SimpleUserData.java index 4a391c6..c8d95e7 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/user/SimpleUserData.java +++ b/Datura/src/main/java/me/totalfreedom/datura/user/SimpleUserData.java @@ -230,16 +230,16 @@ public class SimpleUserData implements UserData return hasCustomACFormat; } + @Override + public AdminChatFormat getCustomACFormat() + { + return AdminChatFormat.deserialize(customACFormat); + } + @Override public void setCustomACFormat(final String format) { this.hasCustomACFormat = format.equals(AdminChatFormat.DEFAULT.serialize()); this.customACFormat = format; } - - @Override - public AdminChatFormat getCustomACFormat() - { - return AdminChatFormat.deserialize(customACFormat); - } } diff --git a/Patchwork/src/main/java/me/totalfreedom/base/Patchwork.java b/Patchwork/src/main/java/me/totalfreedom/base/Patchwork.java index 2ee663b..e12ed34 100644 --- a/Patchwork/src/main/java/me/totalfreedom/base/Patchwork.java +++ b/Patchwork/src/main/java/me/totalfreedom/base/Patchwork.java @@ -1,5 +1,6 @@ package me.totalfreedom.base; +import me.totalfreedom.display.adminchat.AdminChatDisplay; import me.totalfreedom.event.EventBus; import me.totalfreedom.service.FreedomExecutor; import me.totalfreedom.service.SubscriptionProvider; @@ -23,6 +24,10 @@ public class Patchwork extends JavaPlugin * The {@link FreedomExecutor} for this plugin. */ private final FreedomExecutor executor = new FreedomExecutor(); + /** + * The {@link AdminChatDisplay} for this plugin. + */ + private final AdminChatDisplay acdisplay = new AdminChatDisplay(); /** * Provides this plugin instance through a safe static method. This is effectively the same thing as using @@ -89,4 +94,15 @@ public class Patchwork extends JavaPlugin { return eventBus; } + + /** + * Gets the {@link AdminChatDisplay} for this plugin. The AdminChatDisplay is used to display messages sent in + * adminchat. + * + * @return the {@link AdminChatDisplay} + */ + public AdminChatDisplay getAdminChatDisplay() + { + return acdisplay; + } } diff --git a/Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java b/Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java index d3d7bf7..0cb80e0 100644 --- a/Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java +++ b/Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java @@ -1,15 +1,31 @@ package me.totalfreedom.base; -import me.totalfreedom.provider.ModuleProvider; +import me.totalfreedom.api.Context; +import me.totalfreedom.user.User; +import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; public final class Shortcuts { - private Shortcuts() { + private Shortcuts() + { throw new AssertionError(); } - public static ModuleProvider provideModule(final Class pluginClass) { - return Patchwork.getInstance().getRegistrations().getModuleRegistry().getProvider(pluginClass); + public static T provideModule(final Class pluginClass) + { + return Patchwork.getInstance() + .getRegistrations() + .getModuleRegistry() + .getProvider(pluginClass) + .getModule(); + } + + public static User getUser(final Player player) + { + return Patchwork.getInstance() + .getRegistrations() + .getUserRegistry() + .getUser(player); } } diff --git a/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java b/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java index c122527..6da4d29 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java +++ b/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java @@ -69,7 +69,7 @@ public final class BukkitDelegate extends Command implements PluginIdentifiableC @NotNull final String commandLabel, @NotNull final String[] args) { - if (sender instanceof ConsoleCommandSender && noConsole) + if (!(sender instanceof Player) && noConsole) { sender.sendMessage(Component.text("This command can only be run by players.")); return true; @@ -101,8 +101,13 @@ public final class BukkitDelegate extends Command implements PluginIdentifiableC { try { - command.getBaseMethod() - .invoke(command, sender); + if (noConsole) { + command.getBaseMethod() + .invoke(command, (Player)sender); + } else { + command.getBaseMethod() + .invoke(command, sender); + } } catch (Exception ex) { FreedomLogger.getLogger("Patchwork") @@ -154,9 +159,15 @@ public final class BukkitDelegate extends Command implements PluginIdentifiableC } try { - command.getSubcommands() - .get(node) - .invoke(command, sender, objects); + if (noConsole) { + command.getSubcommands() + .get(node) + .invoke(command, (Player)sender, objects); + } else { + command.getSubcommands() + .get(node) + .invoke(command, sender, objects); + } } catch (Exception ex) { FreedomLogger.getLogger("Patchwork") diff --git a/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatDisplay.java b/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatDisplay.java index 06ec6d9..1c27cff 100644 --- a/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatDisplay.java +++ b/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatDisplay.java @@ -3,9 +3,11 @@ package me.totalfreedom.display.adminchat; import io.papermc.paper.event.player.AsyncChatEvent; import me.totalfreedom.base.Patchwork; import me.totalfreedom.base.Shortcuts; -import me.totalfreedom.data.UserRegistry; +import me.totalfreedom.security.Groups; import me.totalfreedom.user.UserData; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -19,10 +21,12 @@ import java.util.UUID; public class AdminChatDisplay { + protected static final String ACPERM = "patchwork.adminchat"; private final Map adminChatFormat = new HashMap<>(); private final Set toggledChat = new HashSet<>(); - public AdminChatDisplay() { + public AdminChatDisplay() + { new ACListener(this); } @@ -61,6 +65,39 @@ public class AdminChatDisplay return adminChatFormat; } + public boolean isToggled(final Player player) + { + return toggledChat.contains(player.getUniqueId()); + } + + public void toggleChat(final Player player) + { + if (toggledChat.contains(player.getUniqueId())) + { + toggledChat.remove(player.getUniqueId()); + } else + { + toggledChat.add(player.getUniqueId()); + } + } + + public void adminChatMessage(final CommandSender sender, final Component message) + { + Bukkit.getOnlinePlayers() + .forEach(player -> + { + if (player.hasPermission(ACPERM)) + { + final Component formatted = Component.empty(); + formatted.append(getFormat(player).format(sender.getName(), Groups.fromSender(sender))) + .append(Component.space()) + .append(message); + + player.sendMessage(formatted); + } + }); + } + public static final class ACListener implements Listener { private final AdminChatDisplay display; @@ -69,26 +106,34 @@ public class AdminChatDisplay { this.display = display; Bukkit.getPluginManager() - .registerEvents(this, Shortcuts.provideModule(Patchwork.class) - .getModule()); + .registerEvents(this, Shortcuts.provideModule(Patchwork.class)); } @EventHandler - public void playerChat(final AsyncChatEvent event) { - if (display.getPlayers().contains(event.getPlayer().getUniqueId())) { + public void playerChat(final AsyncChatEvent event) + { + if (display.isToggled(event.getPlayer())) + { event.setCancelled(true); - + display.adminChatMessage(event.getPlayer(), event.message()); } } @EventHandler - public void playerJoin(final PlayerJoinEvent event) { + public void playerJoin(final PlayerJoinEvent event) + { final Player player = event.getPlayer(); - if (player.hasPermission("patchwork.adminchat")) { - final UserData data = Patchwork.getInstance().getRegistrations().getUserRegistry().fromPlayer(player); - if (data.hasCustomACFormat()) { + if (player.hasPermission(ACPERM)) + { + final UserData data = Patchwork.getInstance() + .getRegistrations() + .getUserRegistry() + .fromPlayer(player); + if (data.hasCustomACFormat()) + { display.addPlayer(player, data.getCustomACFormat()); - } else { + } else + { display.addPlayer(player, AdminChatFormat.DEFAULT); } } diff --git a/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatFormat.java b/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatFormat.java index b8dd757..5580c9e 100644 --- a/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatFormat.java +++ b/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatFormat.java @@ -25,15 +25,25 @@ public final class AdminChatFormat this.rank = Component.text(builder.openBracket(), builder.bracketColor()) .append(Component.text("%rank%", builder.rankColor())) .append(Component.text(builder.closeBracket(), builder.bracketColor())); - this.chatSplitter = Component.text(builder.chatSplitter(), NamedTextColor.WHITE); - this.fullFormat = prefix.append(Component.space()) + // Nice formatting :( + if (builder.chatSplitter() + .equals(":")) + { + this.chatSplitter = Component.text(":", NamedTextColor.WHITE); + } else + { + this.chatSplitter = Component.space() + .append(Component.text(builder.chatSplitter(), NamedTextColor.WHITE)); + } + + // Formatting because []: is cleaner than [] :, but anything else such as [] >> or [] -> looks better with the space between. + this.fullFormat = prefix.appendSpace() .append(userName) - .append(Component.space()) + .appendSpace() .append(rank) - .append(Component.space()) .append(chatSplitter) - .append(Component.space()); + .appendSpace(); } public static AdminChatFormat deserialize(final String serialized) diff --git a/Patchwork/src/main/java/me/totalfreedom/security/Groups.java b/Patchwork/src/main/java/me/totalfreedom/security/Groups.java index 2f92fa3..105a54a 100644 --- a/Patchwork/src/main/java/me/totalfreedom/security/Groups.java +++ b/Patchwork/src/main/java/me/totalfreedom/security/Groups.java @@ -1,20 +1,30 @@ package me.totalfreedom.security; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + public enum Groups { - NON_OP("patchwork.group.non-op"), - OP("patchwork.group.op"), - SUPER_ADMIN("patchwork.group.super"), - SENIOR_ADMIN("patchwork.group.senior"), - DEVELOPER("patchwork.group.dev"), - EXECUTIVE("patchwork.group.exec"), - OWNER("patchwork.group.owner"); + NON_OP("patchwork.group.non-op", "Non-OP"), + OP("patchwork.group.op", "OP"), + SUPER_ADMIN("patchwork.group.super", "Super Admin"), + SENIOR_ADMIN("patchwork.group.senior", "Senior Admin"), + DEVELOPER("patchwork.group.dev", "Developer"), + EXECUTIVE("patchwork.group.exec", "Executive"), + OWNER("patchwork.group.owner", "Owner"); private final String permission; + private final String name; - Groups(final String permission) + Groups(final String permission, final String name) { this.permission = permission; + this.name = name; + } + + public String getName() + { + return this.name; } public String getPermission() @@ -27,4 +37,19 @@ public enum Groups { return this.permission; } + + public static String fromPlayer(final Player player) { + for (final Groups group : values()) { + if (player.hasPermission(group.getPermission())) { + return group.getName(); + } + } + return Groups.NON_OP.getName(); + } + + public static String fromSender(final CommandSender sender) { + if (!(sender instanceof Player)) return "CONSOLE"; + + return fromPlayer((Player) sender); + } } From d0e8d6e3610a4336c0910f366f2abf9ac5d7de80 Mon Sep 17 00:00:00 2001 From: Paul Reilly Date: Sun, 25 Jun 2023 01:10:30 -0500 Subject: [PATCH 04/18] pbs kids --- .../datura/cmd/ClearDropsCommand.java | 94 ++++++++++++++++++ .../datura/cmd/ClearEntitiesCommand.java | 69 +++++++++++++ .../java/me/totalfreedom/utils/Tagged.java | 99 +++++++++++++++++++ .../me/totalfreedom/utils/container/Trio.java | 27 +---- .../utils/container/UnaryPair.java | 5 + .../utils/container/UnaryTrio.java | 27 +---- codestyle.xml | 73 ++++++++++++++ 7 files changed, 342 insertions(+), 52 deletions(-) create mode 100644 Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java create mode 100644 Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java create mode 100644 Patchwork/src/main/java/me/totalfreedom/utils/Tagged.java create mode 100644 Patchwork/src/main/java/me/totalfreedom/utils/container/UnaryPair.java create mode 100644 codestyle.xml diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java new file mode 100644 index 0000000..495d2ed --- /dev/null +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java @@ -0,0 +1,94 @@ +package me.totalfreedom.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 org.bukkit.World; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Item; +import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; +import org.jetbrains.annotations.NotNull; + +@Info(name = "cleardrops", description = "Clears all item drops in the world" + ".", usage = "/", aliases = + {"cd", "clearitems", "ci", "wipeitems", "wi"}) +@Permissive(perm = "datura.cleardrops") +public class ClearDropsCommand extends Commander +{ + /** + * Initializes this command object. The provided {@link JavaPlugin} + * should be the plugin which contains the + * command. + *

+ * This constructor will automatically register all subcommands and + * completions for this command. It will also + * automatically infer all required information from the provided + * {@link Info} and {@link Permissive} annotations. + * + * @param plugin The plugin which contains this command. + */ + protected ClearDropsCommand(final @NotNull JavaPlugin plugin) + { + super(plugin); + } + + @Base + public void clearDrops(final CommandSender sender) + { + if (!(sender instanceof Player)) + { + sender.sendPlainMessage("You must define a world."); + return; + } + + final Player player = (Player) sender; + Patchwork.getInstance() + .getExecutor() + .delayedExecutor(Shortcuts.provideModule(Datura.class), 20 * 10L) + .execute(() -> + { + int i = 0; + for (final Entity entity : player.getWorld().getEntities()) + { + if (entity instanceof Item) + { + entity.remove(); + i++; + } + } + + player.sendPlainMessage("Successfully removed " + i + " items."); + }); + } + + @Subcommand(permission = "datura.cleardrops", args = {World.class}) + @Completion(index = 0, args = {"%world%"}) + public void clearDrops(final CommandSender sender, final World world) + { + Patchwork.getInstance() + .getExecutor() + .delayedExecutor(Shortcuts.provideModule(Datura.class), 20 * 10L) + .execute(() -> + { + int i = 0; + for (final Entity entity : world.getEntities()) + { + if (entity instanceof Item) + { + entity.remove(); + i++; + } + } + + sender.sendPlainMessage("Successfully removed " + i + " items."); + }); + } +} diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java new file mode 100644 index 0000000..9868235 --- /dev/null +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java @@ -0,0 +1,69 @@ +package me.totalfreedom.datura.cmd; + +import me.totalfreedom.command.Commander; +import me.totalfreedom.command.annotation.Base; +import me.totalfreedom.command.annotation.Completion; +import me.totalfreedom.command.annotation.Subcommand; +import me.totalfreedom.utils.Tagged; +import org.bukkit.World; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; +import org.jetbrains.annotations.NotNull; + +public class ClearEntitiesCommand extends Commander +{ + /** + * Initializes this command object. The provided {@link JavaPlugin} should be the plugin which contains the + * command. + *

+ * This constructor will automatically register all subcommands and completions for this command. It will also + * automatically infer all required information from the provided {@link Info} and {@link Permissive} annotations. + * + * @param plugin The plugin which contains this command. + */ + protected ClearEntitiesCommand(final @NotNull JavaPlugin plugin) + { + super(plugin); + } + + @Base + public void clearEntities(final CommandSender sender) + { + if (!(sender instanceof Player)) + { + sender.sendPlainMessage("You must specify a world to clear entities from."); + return; + } + + final Player player = (Player) sender; + + int i = 0; + for (final Entity entity : player.getWorld().getEntities()) + { + if (!Tagged.NON_WIPEABLE.isTagged(entity.getType())) + { + entity.remove(); + i++; + } + } + sender.sendPlainMessage("Cleared " + i + " entities."); + } + + @Subcommand(permission = "datura.clearentities", args = {World.class}) + @Completion(index = 0, args = {"%world%"}) + public void clearEntities(final CommandSender sender, final World world) + { + int i = 0; + for (final Entity entity : world.getEntities()) + { + if (!Tagged.NON_WIPEABLE.isTagged(entity.getType())) + { + entity.remove(); + i++; + } + } + sender.sendPlainMessage("Cleared " + i + " entities."); + } +} diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/Tagged.java b/Patchwork/src/main/java/me/totalfreedom/utils/Tagged.java new file mode 100644 index 0000000..568233e --- /dev/null +++ b/Patchwork/src/main/java/me/totalfreedom/utils/Tagged.java @@ -0,0 +1,99 @@ +package me.totalfreedom.utils; + +import java.util.ArrayList; +import java.util.List; +import org.bukkit.entity.EntityType; +import org.jetbrains.annotations.NotNull; + +public final class Tagged +{ + public static final Tagged NON_WIPEABLE = new Tagged<>(EntityType.ITEM_FRAME, EntityType.BLOCK_DISPLAY, + EntityType.ITEM_DISPLAY, EntityType.LEASH_HITCH, + EntityType.CHEST_BOAT, EntityType.BOAT, + EntityType.TEXT_DISPLAY, + EntityType.GLOW_ITEM_FRAME, + EntityType.ARMOR_STAND, EntityType.PAINTING, + EntityType.PLAYER, EntityType.DROPPED_ITEM, + EntityType.MINECART, EntityType.MINECART_CHEST, + EntityType.MINECART_COMMAND, + EntityType.MINECART_FURNACE, + EntityType.MINECART_HOPPER, + EntityType.FISHING_HOOK, EntityType.DONKEY, + EntityType.HORSE, EntityType.IRON_GOLEM, + EntityType.RABBIT, EntityType.SNOWMAN, + EntityType.VILLAGER, EntityType.WOLF); + + public static final Tagged MINECARTS = new Tagged<>(EntityType.MINECART, EntityType.MINECART_CHEST, + EntityType.MINECART_COMMAND, + EntityType.MINECART_FURNACE, + EntityType.MINECART_HOPPER, + EntityType.MINECART_MOB_SPAWNER, + EntityType.MINECART_TNT); + + public static final Tagged BOATS = new Tagged<>(EntityType.BOAT, EntityType.CHEST_BOAT); + + public static final Tagged HOSTILE = new Tagged<>(EntityType.BLAZE, EntityType.CAVE_SPIDER, + EntityType.CREEPER, EntityType.DROWNED, + EntityType.ELDER_GUARDIAN, EntityType.ENDER_CRYSTAL, + EntityType.ENDER_DRAGON, EntityType.ENDERMAN, + EntityType.ENDERMITE, EntityType.EVOKER, + EntityType.EVOKER_FANGS, EntityType.GHAST, + EntityType.GIANT, EntityType.GUARDIAN, + EntityType.HOGLIN, EntityType.HUSK, + EntityType.ILLUSIONER, EntityType.MAGMA_CUBE, + EntityType.PHANTOM, EntityType.PIGLIN, + EntityType.PIGLIN_BRUTE, EntityType.PILLAGER, + EntityType.RAVAGER, EntityType.SHULKER, + EntityType.SILVERFISH, EntityType.SKELETON, + EntityType.SLIME, EntityType.SPIDER, EntityType.STRAY, + EntityType.VEX, EntityType.VINDICATOR, + EntityType.WARDEN, EntityType.WITCH, + EntityType.WITHER, EntityType.WITHER_SKELETON, + EntityType.ZOGLIN, EntityType.ZOMBIE, + EntityType.ZOMBIE_VILLAGER, + EntityType.ZOMBIFIED_PIGLIN); + + public static final Tagged PASSIVE = new Tagged<>(EntityType.BAT, EntityType.BEE, EntityType.CAT, + EntityType.CHICKEN, EntityType.COD, EntityType.COW, + EntityType.DOLPHIN, EntityType.DONKEY, EntityType.FOX, + EntityType.GOAT, EntityType.HORSE, + EntityType.IRON_GOLEM, EntityType.LLAMA, + EntityType.MULE, EntityType.MUSHROOM_COW, + EntityType.OCELOT, EntityType.PANDA, + EntityType.PARROT, EntityType.PIG, + EntityType.POLAR_BEAR, EntityType.PUFFERFISH, + EntityType.RABBIT, EntityType.SALMON, + EntityType.SHEEP, EntityType.SKELETON_HORSE, + EntityType.SNOWMAN, EntityType.SQUID, + EntityType.STRIDER, EntityType.TRADER_LLAMA, + EntityType.TROPICAL_FISH, EntityType.TURTLE, + EntityType.VILLAGER, EntityType.WANDERING_TRADER, + EntityType.WOLF); + + public static final Tagged PLAYER_RELATED = new Tagged<>(EntityType.PLAYER, EntityType.ARMOR_STAND, + EntityType.DROPPED_ITEM, EntityType.PAINTING, + EntityType.ITEM_FRAME, + EntityType.GLOW_ITEM_FRAME, + EntityType.LEASH_HITCH, + EntityType.FISHING_HOOK, + EntityType.TEXT_DISPLAY, + EntityType.BLOCK_DISPLAY, + EntityType.ITEM_DISPLAY); + + private final List tagged; + + private Tagged(final T... tagged) + { + this.tagged = new ArrayList<>(); + } + + public boolean isTagged(final @NotNull T object) + { + for (final T t : this.tagged) + { + if (object.equals(t)) + return true; + } + return false; + } +} diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/container/Trio.java b/Patchwork/src/main/java/me/totalfreedom/utils/container/Trio.java index 90bf673..e3d61c2 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/container/Trio.java +++ b/Patchwork/src/main/java/me/totalfreedom/utils/container/Trio.java @@ -1,30 +1,5 @@ package me.totalfreedom.utils.container; -public final class Trio +public record Trio(A primary, B secondary, C tertiary) { - private final A a; - private final B b; - private final C c; - - public Trio(final A a, final B b, final C c) - { - this.a = a; - this.b = b; - this.c = c; - } - - public A getPrimary() - { - return a; - } - - public B getSecondary() - { - return b; - } - - public C getTertiary() - { - return c; - } } diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/container/UnaryPair.java b/Patchwork/src/main/java/me/totalfreedom/utils/container/UnaryPair.java new file mode 100644 index 0000000..908cccf --- /dev/null +++ b/Patchwork/src/main/java/me/totalfreedom/utils/container/UnaryPair.java @@ -0,0 +1,5 @@ +package me.totalfreedom.utils.container; + +public record UnaryPair(T first, T second) +{ +} diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/container/UnaryTrio.java b/Patchwork/src/main/java/me/totalfreedom/utils/container/UnaryTrio.java index cf2e27f..ac455cd 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/container/UnaryTrio.java +++ b/Patchwork/src/main/java/me/totalfreedom/utils/container/UnaryTrio.java @@ -1,30 +1,5 @@ package me.totalfreedom.utils.container; -public class UnaryTrio +public record UnaryTrio(T primary, T secondary, T tertiary) { - private final T primary; - private final T secondary; - private final T tertiary; - - public UnaryTrio(final T primary, final T secondary, final T tertiary) - { - this.primary = primary; - this.secondary = secondary; - this.tertiary = tertiary; - } - - public T getPrimary() - { - return primary; - } - - public T getSecondary() - { - return secondary; - } - - public T getTertiary() - { - return tertiary; - } } diff --git a/codestyle.xml b/codestyle.xml new file mode 100644 index 0000000..a18269e --- /dev/null +++ b/codestyle.xml @@ -0,0 +1,73 @@ + + \ No newline at end of file From 2b12f4eebb5680bbe5bb6046c64f5c6815127040 Mon Sep 17 00:00:00 2001 From: Paul Reilly Date: Sun, 25 Jun 2023 21:46:01 -0500 Subject: [PATCH 05/18] hotfixes --- .../datura/cmd/ClearDropsCommand.java | 2 +- .../datura/cmd/ClearEntitiesCommand.java | 5 + .../datura/cmd/ManageUserCommand.java | 93 +++++++++++++++++++ .../datura/perms/FreedomGroup.java | 13 ++- .../datura/perms/PermissionNode.java | 16 +--- .../datura/perms/PermissionNodeBuilder.java | 18 +--- .../totalfreedom/command/BukkitDelegate.java | 4 + .../provider/ContextProvider.java | 68 ++++++++------ .../java/me/totalfreedom/security/Node.java | 2 - .../me/totalfreedom/security/NodeBuilder.java | 4 - 10 files changed, 151 insertions(+), 74 deletions(-) create mode 100644 Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java index 495d2ed..d616def 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java @@ -19,7 +19,7 @@ import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; @Info(name = "cleardrops", description = "Clears all item drops in the world" + ".", usage = "/", aliases = - {"cd", "clearitems", "ci", "wipeitems", "wi"}) + {"cd", "clearitems", "ci", "wipeitems", "wi", "removedrops", "rd"}) @Permissive(perm = "datura.cleardrops") public class ClearDropsCommand extends Commander { diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java index 9868235..6460a33 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java @@ -3,6 +3,8 @@ package me.totalfreedom.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 org.bukkit.World; @@ -12,6 +14,9 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; +@Info(name = "clearentities", description = "Clears all entities in the world.", usage = "/ [world]", + aliases = {"ew", "ce", "entitywipe", "entityclear", "ec"}) +@Permissive(perm = "datura.clearentities") public class ClearEntitiesCommand extends Commander { /** diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java new file mode 100644 index 0000000..9c0b86b --- /dev/null +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java @@ -0,0 +1,93 @@ +package me.totalfreedom.datura.cmd; + +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; +import org.jetbrains.annotations.NotNull; + +@Info(name = "manageuser", description = "Manage a user's permissions", usage = "/manageuser )>", aliases = {"mu", "userdata", "ud", "usermanager", "um"}) +@Permissive(perm = "datura.manageuser") +public class ManageUserCommand extends Commander +{ + + /** + * Initializes this command object. The provided {@link JavaPlugin} should be the plugin which contains the + * command. + *

+ * This constructor will automatically register all subcommands and completions for this command. It will also + * automatically infer all required information from the provided {@link Info} and {@link Permissive} annotations. + * + * @param plugin The plugin which contains this command. + */ + protected ManageUserCommand(final @NotNull JavaPlugin plugin) + { + super(plugin); + } + + @Subcommand(permission = "datura.manageuser", args = {Player.class, String.class, String.class, Long.class}) + @Completion(index = 0, args = {"%player%"}) + @Completion(index = 1, args = {"info", "add", "remove"}) + @Completion(index = 2, args = {""}) + public void manageUser(final CommandSender sender, final Player player, final String addOrRemove, + final String permission, final long duration) + { + final PermissionHolder user = Shortcuts.getUser(player); + final Node node = new PermissionNodeBuilder().key(permission) + .type(NodeType.PERMISSION) + .expiry(Duration.ofMinutes(duration) + .getSeconds() + System.currentTimeMillis()) + .build(); + ifElse(addOrRemove, user, node); + } + + @Subcommand(permission = "datura.manageuser", args = {Player.class, String.class, String.class}) + public void manageUser(final CommandSender sender, final Player player, final String addOrRemove, + final String permission) + { + final PermissionHolder user = Shortcuts.getUser(player); + final Node node = new PermissionNodeBuilder().key(permission).type(NodeType.PERMISSION).build(); + ifElse(addOrRemove, user, node); + } + + @Subcommand(permission = "datura.manageuser", args = {Player.class, String.class}) + public void userInfo(final CommandSender sender, final Player player, final String info) + { + final User user = Shortcuts.getUser(player); + if (info.equalsIgnoreCase("info")) + { + final StringBuilder permissions = new StringBuilder(); + user.getEffectivePermissions().forEach(node -> permissions.append(node.getPermission())); + final String text = """ + User: %s + Group: %s + Permissions: %s""".formatted(user.getName(), user.getUserData().getGroup(), + permissions.toString()); + sender.sendPlainMessage(text); + } + } + + private void ifElse(final String addOrRemove, final PermissionHolder user, final Node node) + { + if (addOrRemove.equalsIgnoreCase("add")) + { + user.addPermission(node); + } + else if (addOrRemove.equalsIgnoreCase("remove")) + { + user.removePermission(node); + } + } +} diff --git a/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomGroup.java b/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomGroup.java index affa495..7627933 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomGroup.java +++ b/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomGroup.java @@ -114,7 +114,7 @@ public class FreedomGroup implements Group .findFirst() .orElse(null); - return node != null && node.value(); + return node != null; } @Override @@ -127,7 +127,7 @@ public class FreedomGroup implements Group .findFirst() .orElse(null); - return node != null && node.value(); + return node != null; } @Override @@ -139,7 +139,7 @@ public class FreedomGroup implements Group .findFirst() .orElse(null); - return node != null && node.value(); + return node != null; } @Override @@ -152,7 +152,7 @@ public class FreedomGroup implements Group .findFirst() .orElse(null); - return node != null && node.value(); + return node != null; } /** @@ -214,8 +214,7 @@ public class FreedomGroup implements Group .map(n -> new PermissionAttachmentInfo( this, n.key(), - attachment, - n.value())) + attachment, true)) .collect(Collectors.toSet()); } @@ -228,7 +227,7 @@ public class FreedomGroup implements Group .findFirst() .orElse(null); - return node != null && node.value(); + return node != null; } @Override diff --git a/Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNode.java b/Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNode.java index 48870b9..a83c115 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNode.java +++ b/Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNode.java @@ -5,29 +5,19 @@ import me.totalfreedom.security.NodeType; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; -record PermissionNode(String key, - boolean value, - long expiry, - NodeType type, - boolean wildcard) implements Node +record PermissionNode(String key, long expiry, NodeType type, boolean wildcard) implements Node { @Override public Permission bukkit() { - return new Permission(key(), - value() - ? PermissionDefault.TRUE - : PermissionDefault.FALSE); + return new Permission(key(), PermissionDefault.FALSE); } @Override public boolean compare(final Node node) { - return node.key() - .equalsIgnoreCase(key()) - && node.value() == value() - && node.type() == type(); + return node.key().equalsIgnoreCase(key()) && node.type().equals(type()) && !node.isExpired(); } @Override diff --git a/Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNodeBuilder.java b/Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNodeBuilder.java index a89e69b..87b8fa0 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNodeBuilder.java +++ b/Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNodeBuilder.java @@ -7,11 +7,9 @@ import me.totalfreedom.security.NodeType; public class PermissionNodeBuilder implements NodeBuilder { private String key = "freedom.default"; - private boolean value = true; private long expiry = -1; private NodeType type = NodeType.PERMISSION; private boolean wildcard = false; - private boolean negated = false; @Override public NodeBuilder key(final String key) @@ -20,13 +18,6 @@ public class PermissionNodeBuilder implements NodeBuilder return this; } - @Override - public NodeBuilder value(final boolean value) - { - this.value = value; - return this; - } - @Override public NodeBuilder expiry(final long expiry) { @@ -48,16 +39,9 @@ public class PermissionNodeBuilder implements NodeBuilder return this; } - @Override - public NodeBuilder negated(final boolean negated) - { - this.negated = negated; - return this; - } - @Override public Node build() { - return new PermissionNode(key, value, expiry, type, wildcard, negated); + return new PermissionNode(key, expiry, type, wildcard); } } diff --git a/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java b/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java index 6da4d29..e5ee289 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java +++ b/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java @@ -155,6 +155,10 @@ public final class BukkitDelegate extends Command implements PluginIdentifiableC } final Object obj = provider.fromString(arg, argType); + if (obj == null) { + FreedomLogger.getLogger("Datura").error("Failed to parse argument " + arg + " for type " + argType.getName()); + return; + } objects[i] = obj; } try diff --git a/Patchwork/src/main/java/me/totalfreedom/provider/ContextProvider.java b/Patchwork/src/main/java/me/totalfreedom/provider/ContextProvider.java index 0b28a8b..aaf5d2d 100644 --- a/Patchwork/src/main/java/me/totalfreedom/provider/ContextProvider.java +++ b/Patchwork/src/main/java/me/totalfreedom/provider/ContextProvider.java @@ -40,25 +40,26 @@ public class ContextProvider { public T fromString(final String string, final Class clazz) { - return Stream.of(toBoolean(string), - toDouble(string), - toInt(string), - toLong(string), - toFloat(string), - toMaterial(string), - toPlayer(string), - toWorld(string), - toLocation(string), - toCommandSender(string), - toComponent(string)) + return Stream.of(toBoolean(string, clazz), + toDouble(string, clazz), + toInt(string, clazz), + toLong(string, clazz), + toFloat(string, clazz), + toMaterial(string, clazz), + toPlayer(string, clazz), + toWorld(string, clazz), + toLocation(string, clazz), + toComponent(string, clazz)) .filter(Objects::nonNull) .findFirst() .map(clazz::cast) .orElse(null); } - private @Nullable Boolean toBoolean(final String string) + private @Nullable Boolean toBoolean(final String string, final Class clazz) { + if (clazz != Boolean.class) return null; + // Previously we used Boolean#parseBoolean, but that will always return a value and does not throw // an exception. This means that if the string is not "true" or "false", it will return false. if (string.equalsIgnoreCase("true")) return true; @@ -67,8 +68,10 @@ public class ContextProvider return null; } - private @Nullable Double toDouble(final String string) + private @Nullable Double toDouble(final String string, final Class clazz) { + if (clazz != Double.class) return null; + try { return Double.parseDouble(string); @@ -78,8 +81,10 @@ public class ContextProvider } } - private @Nullable Integer toInt(final String string) + private @Nullable Integer toInt(final String string, final Class clazz) { + if (clazz != Integer.class) return null; + try { return Integer.parseInt(string); @@ -89,8 +94,10 @@ public class ContextProvider } } - private @Nullable Long toLong(final String string) + private @Nullable Long toLong(final String string, final Class clazz) { + if (clazz != Long.class) return null; + try { return Long.parseLong(string); @@ -100,8 +107,10 @@ public class ContextProvider } } - private @Nullable Float toFloat(final String string) + private @Nullable Float toFloat(final String string, final Class clazz) { + if (clazz != Float.class) return null; + try { return Float.parseFloat(string); @@ -111,18 +120,21 @@ public class ContextProvider } } - private @Nullable Material toMaterial(final String string) + private @Nullable Material toMaterial(final String string, final Class clazz) { + if (clazz != Material.class) return null; return Material.matchMaterial(string); } - private @Nullable Player toPlayer(final String string) + private @Nullable Player toPlayer(final String string, final Class clazz) { + if (clazz != Player.class) return null; return Bukkit.getPlayer(string); } - private @Nullable World toWorld(final String string) + private @Nullable World toWorld(final String string, final Class clazz) { + if (clazz != World.class) return null; return Bukkit.getWorld(string); } @@ -135,32 +147,28 @@ public class ContextProvider * @return A location object if xyz is valid * @see BukkitDelegate#processSubCommands(String[], CommandSender, ContextProvider, Subcommand) */ - private @Nullable Location toLocation(final String string) + private @Nullable Location toLocation(final String string, final Class clazz) { + if (clazz != Location.class) return null; + final String[] split = string.split(" "); - if (split.length != 4 || toWorld(split[0]) == null) return null; + if (split.length != 4 || toWorld(split[0], World.class) == null) return null; try { final double x = Double.parseDouble(split[1]); final double y = Double.parseDouble(split[2]); final double z = Double.parseDouble(split[3]); - return new Location(toWorld(split[0]), x, y, z); + return new Location(toWorld(split[0], World.class), x, y, z); } catch (NumberFormatException ex) { return null; } } - private @Nullable CommandSender toCommandSender(final String string) - { - if (toPlayer(string) == null) return null; - - return toPlayer(string); - } - - private @NotNull Component toComponent(final String string) + private @Nullable Component toComponent(final String string, final Class clazz) { + if (clazz != Component.class) return null; return Component.text(string); } } diff --git a/Patchwork/src/main/java/me/totalfreedom/security/Node.java b/Patchwork/src/main/java/me/totalfreedom/security/Node.java index 8af9348..38fe451 100644 --- a/Patchwork/src/main/java/me/totalfreedom/security/Node.java +++ b/Patchwork/src/main/java/me/totalfreedom/security/Node.java @@ -9,8 +9,6 @@ public interface Node { String key(); - boolean value(); - Permission bukkit(); NodeType type(); diff --git a/Patchwork/src/main/java/me/totalfreedom/security/NodeBuilder.java b/Patchwork/src/main/java/me/totalfreedom/security/NodeBuilder.java index c0503ff..05c3ee9 100644 --- a/Patchwork/src/main/java/me/totalfreedom/security/NodeBuilder.java +++ b/Patchwork/src/main/java/me/totalfreedom/security/NodeBuilder.java @@ -4,15 +4,11 @@ public interface NodeBuilder { NodeBuilder key(String key); - NodeBuilder value(boolean value); - NodeBuilder expiry(long expiry); NodeBuilder type(NodeType type); NodeBuilder wildcard(boolean wildcard); - NodeBuilder negated(boolean negated); - Node build(); } From 6842cb2792666b4f2bb1141953586d7a41553a5a Mon Sep 17 00:00:00 2001 From: Paul Reilly Date: Sun, 23 Jul 2023 02:15:12 -0500 Subject: [PATCH 06/18] Adjusted Command Processing Completion annotations have been moved to top level, from per method, for a much clearer understanding of how the annotation should be used. --- .../totalfreedom/datura/cmd/CageCommand.java | 6 +- .../datura/cmd/ClearDropsCommand.java | 2 +- .../datura/cmd/ClearEntitiesCommand.java | 2 +- .../totalfreedom/datura/cmd/HaltCommand.java | 6 +- .../datura/cmd/LockerCommand.java | 4 +- .../datura/cmd/ManageUserCommand.java | 6 +- .../totalfreedom/datura/cmd/SmiteCommand.java | 2 +- .../audience/MutableAudienceForwarder.java | 11 ++- .../totalfreedom/command/BukkitDelegate.java | 69 +++++++++++-------- .../command/annotation/Completion.java | 2 +- .../command/annotation/Completions.java | 6 +- .../data/ServiceTaskRegistry.java | 2 +- .../totalfreedom/display/DisplayableView.java | 1 + .../java/me/totalfreedom/particle/Trail.java | 2 +- .../java/me/totalfreedom/shop/Reaction.java | 10 +-- build.gradle | 6 ++ 16 files changed, 71 insertions(+), 66 deletions(-) diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java index 375b38a..c3d6fa6 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java @@ -37,6 +37,9 @@ import org.jetbrains.annotations.NotNull; @Info(name = "cage", description = "Cage a player.", usage = "/cage [material]") @Permissive(perm = "datura.cage") +@Completion(args = {"%player%"}, index = 0) +@Completion(args = {"on", "off"}, index = 1) +@Completion(args = {"[material]"}, index = 2) public class CageCommand extends Commander { protected CageCommand(final @NotNull JavaPlugin plugin) @@ -44,8 +47,6 @@ public class CageCommand extends Commander super(plugin); } - @Completion(args = {"%player%"}, index = 0) - @Completion(args = {"on", "off"}, index = 1) @Subcommand(permission = "datura.cage", args = {Player.class, String.class}) public void cagePlayer(final CommandSender sender, final Player player, final String string) { @@ -62,7 +63,6 @@ public class CageCommand extends Commander } } - @Completion(args = {"[material]"}, index = 2) @Subcommand(permission = "datura.cage.custom", args = {Player.class, String.class, Material.class}) public void cagePlayer(final CommandSender sender, final Player player, final String string, final Material material) diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java index d616def..5168a5a 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java @@ -21,6 +21,7 @@ import org.jetbrains.annotations.NotNull; @Info(name = "cleardrops", description = "Clears all item drops in the world" + ".", usage = "/", aliases = {"cd", "clearitems", "ci", "wipeitems", "wi", "removedrops", "rd"}) @Permissive(perm = "datura.cleardrops") +@Completion(index = 0, args = {"%world%"}) public class ClearDropsCommand extends Commander { /** @@ -70,7 +71,6 @@ public class ClearDropsCommand extends Commander } @Subcommand(permission = "datura.cleardrops", args = {World.class}) - @Completion(index = 0, args = {"%world%"}) public void clearDrops(final CommandSender sender, final World world) { Patchwork.getInstance() diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java index 6460a33..f77cf16 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java @@ -17,6 +17,7 @@ import org.jetbrains.annotations.NotNull; @Info(name = "clearentities", description = "Clears all entities in the world.", usage = "/ [world]", aliases = {"ew", "ce", "entitywipe", "entityclear", "ec"}) @Permissive(perm = "datura.clearentities") +@Completion(index = 0, args = {"%world%"}) public class ClearEntitiesCommand extends Commander { /** @@ -57,7 +58,6 @@ public class ClearEntitiesCommand extends Commander } @Subcommand(permission = "datura.clearentities", args = {World.class}) - @Completion(index = 0, args = {"%world%"}) public void clearEntities(final CommandSender sender, final World world) { int i = 0; diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java index a4bfd32..903da90 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java @@ -17,6 +17,8 @@ import org.jetbrains.annotations.NotNull; @Info(name = "halt", description = "Halt a single player, or every player.", usage = "/ ") @Permissive(perm = "datura.halt") +@Completion(index = 0, args = {"%player%", "all"}) +@Completion(index = 1, args = {"on", "off"}) public class HaltCommand extends Commander { private final Datura plugin = Shortcuts.provideModule(Datura.class); @@ -35,9 +37,6 @@ public class HaltCommand extends Commander super(plugin); } - - @Completion(index = 0, args = {"%player%", "all"}) - @Completion(index = 1, args = {"on", "off"}) @Subcommand(permission = "datura.halt", args = {Player.class, String.class}) public void haltPlayer(final CommandSender sender, final Player target, final String toggle) { @@ -58,7 +57,6 @@ public class HaltCommand extends Commander } } - // No completion needed here since it's already registered. @Subcommand(permission = "datura.halt.all", args = {String.class, String.class}) public void haltAll(final CommandSender sender, final String all, final String toggle) { diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/LockerCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/LockerCommand.java index 38f9f2c..0623c84 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/LockerCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/LockerCommand.java @@ -13,6 +13,8 @@ import org.jetbrains.annotations.NotNull; @Info(name = "locker", description = "Lock a player, preventing them from interacting with their game client.", usage = "/locker ", aliases = {"lock", "lockup"}) @Permissive(perm = "datura.locker") +@Completion(args = {"%player%"}, index = 0) +@Completion(args = {"on", "off"}, index = 1) public final class LockerCommand extends Commander { public LockerCommand(final @NotNull Datura plugin) @@ -20,8 +22,6 @@ public final class LockerCommand extends Commander super(plugin); } - @Completion(args = {"%player%"}, index = 0) - @Completion(args = {"on", "off"}, index = 1) @Subcommand(permission = "datura.locker", args = {Player.class, String.class}) public void lockPlayer(final CommandSender sender, final Player player, final String string) { diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java index 9c0b86b..026cb17 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java @@ -20,6 +20,9 @@ import org.jetbrains.annotations.NotNull; @Info(name = "manageuser", description = "Manage a user's permissions", usage = "/manageuser )>", aliases = {"mu", "userdata", "ud", "usermanager", "um"}) @Permissive(perm = "datura.manageuser") +@Completion(index = 0, args = {"%player%"}) +@Completion(index = 1, args = {"info", "add", "remove"}) +@Completion(index = 2, args = {""}) public class ManageUserCommand extends Commander { @@ -38,9 +41,6 @@ public class ManageUserCommand extends Commander } @Subcommand(permission = "datura.manageuser", args = {Player.class, String.class, String.class, Long.class}) - @Completion(index = 0, args = {"%player%"}) - @Completion(index = 1, args = {"info", "add", "remove"}) - @Completion(index = 2, args = {""}) public void manageUser(final CommandSender sender, final Player player, final String addOrRemove, final String permission, final long duration) { diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java index 531f59f..c434d7e 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java @@ -13,6 +13,7 @@ import org.jetbrains.annotations.NotNull; @Info(name = "smite", description = "Smite a player.", usage = "/smite ", aliases = {"sm"}) @Permissive(perm = "datura.smite") +@Completion(index = 0, args = {"%player%"}) public class SmiteCommand extends Commander { /** @@ -30,7 +31,6 @@ public class SmiteCommand extends Commander } @Subcommand(permission = "datura.smite", args = {Player.class}) - @Completion(index = 0, args = {"%player%"}) public void smite(final CommandSender sender, final Player player) { final double size = 5D; diff --git a/Patchwork/src/main/java/me/totalfreedom/audience/MutableAudienceForwarder.java b/Patchwork/src/main/java/me/totalfreedom/audience/MutableAudienceForwarder.java index f725d73..38eaf1a 100644 --- a/Patchwork/src/main/java/me/totalfreedom/audience/MutableAudienceForwarder.java +++ b/Patchwork/src/main/java/me/totalfreedom/audience/MutableAudienceForwarder.java @@ -1,5 +1,9 @@ package me.totalfreedom.audience; +import java.util.HashSet; +import java.util.Set; +import java.util.function.Consumer; +import java.util.function.Predicate; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.bossbar.BossBar; import net.kyori.adventure.chat.ChatType; @@ -13,13 +17,8 @@ import net.kyori.adventure.title.Title; import net.kyori.adventure.title.TitlePart; import org.jetbrains.annotations.NotNull; -import java.util.HashSet; -import java.util.Set; -import java.util.function.Consumer; -import java.util.function.Predicate; - /** - * A replacement for {@link net.kyori.adventure.audience.ForwardingAudience} that allows for audiences to be removed & + * A replacement for {@link net.kyori.adventure.audience.ForwardingAudience} that allows for audiences to be removed and * added at will. Not thread safe. *

* This is intended for use in toggleable logging systems, for example, potion spy. diff --git a/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java b/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java index e5ee289..6ac04ff 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java +++ b/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java @@ -1,5 +1,9 @@ package me.totalfreedom.command; +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; @@ -10,24 +14,18 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.PluginIdentifiableCommand; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Set; - /** * This class is acts as a delegate between our custom command implementation and the Bukkit API. *
* This class is not meant to be used directly, and is only public to allow for the Bukkit API to access it. As a * result, this file will remain undocumented. - * + *
*
* This class is not thread-safe. *
@@ -36,7 +34,6 @@ import java.util.Set; * This class is not meant to be instantiated. *
* This class is not meant to be used outside Patchwork. - * */ public final class BukkitDelegate extends Command implements PluginIdentifiableCommand { @@ -101,14 +98,18 @@ public final class BukkitDelegate extends Command implements PluginIdentifiableC { try { - if (noConsole) { + if (noConsole) + { command.getBaseMethod() - .invoke(command, (Player)sender); - } else { + .invoke(command, (Player) sender); + } + else + { command.getBaseMethod() .invoke(command, sender); } - } catch (Exception ex) + } + catch (Exception ex) { FreedomLogger.getLogger("Patchwork") .error(ex); @@ -142,37 +143,45 @@ public final class BukkitDelegate extends Command implements PluginIdentifiableC final String[] reasonArgs = Arrays.copyOfRange(args, i, args.length - 1); final String reason = String.join(" ", reasonArgs); objects[i] = reason; - } else + } + else { continue; } } - if (argType.equals(Location.class)) { + if (argType.equals(Location.class)) + { final String[] locationArgs = Arrays.copyOfRange(args, i, i + 3); final String location = String.join(" ", locationArgs); objects[i] = location; } final Object obj = provider.fromString(arg, argType); - if (obj == null) { - FreedomLogger.getLogger("Datura").error("Failed to parse argument " + arg + " for type " + argType.getName()); + if (obj == null) + { + FreedomLogger.getLogger("Datura") + .error("Failed to parse argument " + arg + " for type " + argType.getName()); return; } objects[i] = obj; } try { - if (noConsole) { + if (noConsole) + { command.getSubcommands() .get(node) - .invoke(command, (Player)sender, objects); - } else { + .invoke(command, (Player) sender, objects); + } + else + { command.getSubcommands() .get(node) .invoke(command, sender, objects); } - } catch (Exception ex) + } + catch (Exception ex) { FreedomLogger.getLogger("Patchwork") .error(ex); @@ -204,16 +213,16 @@ public final class BukkitDelegate extends Command implements PluginIdentifiableC .map(World::getName) .toList()); case "%number%" -> results.addAll(List.of( - "0", - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9")); + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9")); case "%location%" -> results.add("world x y z"); default -> results.add(p); } diff --git a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Completion.java b/Patchwork/src/main/java/me/totalfreedom/command/annotation/Completion.java index d32efa4..1613184 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Completion.java +++ b/Patchwork/src/main/java/me/totalfreedom/command/annotation/Completion.java @@ -12,7 +12,7 @@ import java.lang.annotation.Target; * This will register at class level, and does not retain method information. As a result, you only need to register the * arguments a single time, and it will always be used in tab completions. */ -@Target(ElementType.METHOD) +@Target(ElementType.TYPE) @Repeatable(Completions.class) @Retention(RetentionPolicy.RUNTIME) public @interface Completion diff --git a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Completions.java b/Patchwork/src/main/java/me/totalfreedom/command/annotation/Completions.java index 694804e..cdcfb15 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Completions.java +++ b/Patchwork/src/main/java/me/totalfreedom/command/annotation/Completions.java @@ -8,10 +8,10 @@ import java.lang.annotation.Target; /** * A marker interface which represents a holder for multiple {@link Completion} annotations. *
- * This interface is NOT intended for implementation and should - * NOT be used. + * This interface is NOT intended for implementation and should + * NOT be used. */ -@Target(ElementType.METHOD) +@Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface Completions { diff --git a/Patchwork/src/main/java/me/totalfreedom/data/ServiceTaskRegistry.java b/Patchwork/src/main/java/me/totalfreedom/data/ServiceTaskRegistry.java index 2cf3e8d..e734b8e 100644 --- a/Patchwork/src/main/java/me/totalfreedom/data/ServiceTaskRegistry.java +++ b/Patchwork/src/main/java/me/totalfreedom/data/ServiceTaskRegistry.java @@ -284,7 +284,7 @@ public class ServiceTaskRegistry *
* The service should have been registered previously as a ServiceSubscription. * - * @param service The service you are trying to unregister. + * @param clazz The service you are trying to unregister. * @see #registerService(ServiceSubscription) * @see ServiceSubscription */ diff --git a/Patchwork/src/main/java/me/totalfreedom/display/DisplayableView.java b/Patchwork/src/main/java/me/totalfreedom/display/DisplayableView.java index 26c5138..7c4e2ec 100644 --- a/Patchwork/src/main/java/me/totalfreedom/display/DisplayableView.java +++ b/Patchwork/src/main/java/me/totalfreedom/display/DisplayableView.java @@ -78,6 +78,7 @@ public class DisplayableView extends InventoryView } @Override + @Deprecated(forRemoval = true, since = "1.16") public @NotNull String getTitle() { return title; diff --git a/Patchwork/src/main/java/me/totalfreedom/particle/Trail.java b/Patchwork/src/main/java/me/totalfreedom/particle/Trail.java index b6ef17f..f9f934a 100644 --- a/Patchwork/src/main/java/me/totalfreedom/particle/Trail.java +++ b/Patchwork/src/main/java/me/totalfreedom/particle/Trail.java @@ -56,7 +56,7 @@ public interface Trail * * @return The color of the trail, or null if the trail is a gradient or non-colorable. * @see Particle - * @see #getColors(); + * @see #getColors() */ @Nullable Color getColor(); diff --git a/Patchwork/src/main/java/me/totalfreedom/shop/Reaction.java b/Patchwork/src/main/java/me/totalfreedom/shop/Reaction.java index 0b96cc7..ad1c761 100644 --- a/Patchwork/src/main/java/me/totalfreedom/shop/Reaction.java +++ b/Patchwork/src/main/java/me/totalfreedom/shop/Reaction.java @@ -1,9 +1,7 @@ package me.totalfreedom.shop; -import me.totalfreedom.display.BossBarDisplay; -import net.kyori.adventure.text.Component; - import java.time.Duration; +import net.kyori.adventure.text.Component; /** * Represents a chat reaction that can be performed by a player. @@ -59,10 +57,4 @@ public abstract class Reaction implements Reactable { return reactionType; } - - @Override - public BossBarDisplay getBossBarDisplay() - { - - } } diff --git a/build.gradle b/build.gradle index f6090f2..5c91798 100644 --- a/build.gradle +++ b/build.gradle @@ -59,6 +59,12 @@ subprojects { weight = 0 } } + + javadoc { + options { + encoding = 'UTF-8' + } + } } tasks.register('buildChain') { From 722b1b72a4e34f727ad49191631826889e31e882 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Mon, 31 Jul 2023 12:53:20 +0200 Subject: [PATCH 07/18] Implemented basic command spy --- .../java/me/totalfreedom/datura/Datura.java | 11 ++++ .../datura/cmd/CommandSpyCommand.java | 58 +++++++++++++++++++ .../datura/features/CommandSpy.java | 55 ++++++++++++++++++ 3 files changed, 124 insertions(+) create mode 100644 Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java create mode 100644 Datura/src/main/java/me/totalfreedom/datura/features/CommandSpy.java diff --git a/Datura/src/main/java/me/totalfreedom/datura/Datura.java b/Datura/src/main/java/me/totalfreedom/datura/Datura.java index 4680a03..60e39a1 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/Datura.java +++ b/Datura/src/main/java/me/totalfreedom/datura/Datura.java @@ -1,6 +1,7 @@ package me.totalfreedom.datura; import me.totalfreedom.base.Patchwork; +import me.totalfreedom.datura.features.CommandSpy; import me.totalfreedom.datura.punishment.Cager; import me.totalfreedom.datura.punishment.Halter; import me.totalfreedom.datura.punishment.Locker; @@ -12,10 +13,14 @@ import org.bukkit.plugin.java.JavaPlugin; public class Datura extends JavaPlugin { private final MySQL sql = new MySQL("localhost", 3011, "master"); + + // Punishment private final Halter halter = new Halter(); private final Locker locker = new Locker(); private final Cager cager = new Cager(); + // Features + private final CommandSpy commandSpy = new CommandSpy(); @Override public void onEnable() @@ -36,6 +41,8 @@ public class Datura extends JavaPlugin Bukkit.getPluginManager() .registerEvents(halter, this); + Bukkit.getPluginManager() + .registerEvents(commandSpy, this); } public MySQL getSQL() @@ -57,4 +64,8 @@ public class Datura extends JavaPlugin { return cager; } + + public CommandSpy getCommandSpy() { + return commandSpy; + } } diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java new file mode 100644 index 0000000..32f1472 --- /dev/null +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java @@ -0,0 +1,58 @@ +package me.totalfreedom.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 org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; +import org.jetbrains.annotations.NotNull; + +@Info(name = "commandspy", description = "Spy on commands executed by players.", usage = "/commandspy") +@Permissive(perm = "datura.commandspy") +public class CommandSpyCommand extends Commander +{ + + /** + * Initializes this command object. The provided {@link JavaPlugin} should be the plugin which contains the + * command. + *

+ * This constructor will automatically register all subcommands and completions for this command. It will also + * automatically infer all required information from the provided {@link Info} and {@link Permissive} annotations. + * + * @param plugin The plugin which contains this command. + */ + protected CommandSpyCommand(@NotNull JavaPlugin plugin) + { + super(plugin); + } + + @Base + public void commandSpy(final CommandSender sender) + { + if (!(sender instanceof Player)) + { + sender.sendPlainMessage("You have to be a player to perform this command."); + return; + } + + final var commandSpy = ((Datura) getPlugin()). + getCommandSpy(); + + final var uuid = ((Player) sender). + getUniqueId(); + + if (commandSpy.isSpying(uuid)) + { + commandSpy.stop(uuid); + sender.sendPlainMessage("CommandSpy disabled."); + } + else + { + commandSpy.spy(uuid); + sender.sendPlainMessage("CommandSpy enabled."); + } + } +} diff --git a/Datura/src/main/java/me/totalfreedom/datura/features/CommandSpy.java b/Datura/src/main/java/me/totalfreedom/datura/features/CommandSpy.java new file mode 100644 index 0000000..00ba408 --- /dev/null +++ b/Datura/src/main/java/me/totalfreedom/datura/features/CommandSpy.java @@ -0,0 +1,55 @@ +package me.totalfreedom.datura.features; + +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import org.bukkit.Bukkit; +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 +{ + + private final Set commandWatchers; + + public CommandSpy() + { + this.commandWatchers = new HashSet<>(); + } + + public void spy(final UUID uuid) + { + this.commandWatchers.add(uuid); + } + + public void stop(final UUID uuid) + { + this.commandWatchers.remove(uuid); + } + + public void clear() + { + this.commandWatchers.clear(); + } + + public boolean isSpying(final UUID uuid) + { + return this.commandWatchers.contains(uuid); + } + + @EventHandler + public void commandProcess(final PlayerCommandPreprocessEvent event) + { + Bukkit.getOnlinePlayers().stream() + .filter(player -> isSpying(player.getUniqueId())) + .forEach(player -> player.sendMessage(Component.text(event.getPlayer().getName(), NamedTextColor.GRAY) + .append(Component.text(": ", NamedTextColor.GRAY)) + .append(Component.text(event.getMessage(), NamedTextColor.GRAY)) + ) + ); + } +} From 1ca7b9edc7c9a3ea3f668d27d8a258b24170fecb Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Mon, 31 Jul 2023 12:58:44 +0200 Subject: [PATCH 08/18] Make CommandSpyCommand constructor public --- .../main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java index 32f1472..1773d46 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java @@ -24,7 +24,7 @@ public class CommandSpyCommand extends Commander * * @param plugin The plugin which contains this command. */ - protected CommandSpyCommand(@NotNull JavaPlugin plugin) + public CommandSpyCommand(@NotNull JavaPlugin plugin) { super(plugin); } From c5fbafe015bf60bbca1dc6ed3acb83e5d2532e45 Mon Sep 17 00:00:00 2001 From: EnZaXD <60033407+FlorianMichael@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:02:37 +0200 Subject: [PATCH 09/18] Make all command constructors public (#14) --- .../main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java | 2 +- .../src/main/java/me/totalfreedom/datura/cmd/CageCommand.java | 2 +- .../main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java | 2 +- .../java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java | 2 +- .../src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java | 2 +- .../main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java | 2 +- .../src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java index 6920d2f..38151d4 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java @@ -26,7 +26,7 @@ public class AdminChatCommand extends Commander * * @param plugin The plugin which contains this command. */ - protected AdminChatCommand(@NotNull final JavaPlugin plugin) + public AdminChatCommand(@NotNull final JavaPlugin plugin) { super(plugin); } diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java index c3d6fa6..1fbdb7e 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java @@ -42,7 +42,7 @@ import org.jetbrains.annotations.NotNull; @Completion(args = {"[material]"}, index = 2) public class CageCommand extends Commander { - protected CageCommand(final @NotNull JavaPlugin plugin) + public CageCommand(final @NotNull JavaPlugin plugin) { super(plugin); } diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java index 5168a5a..71be5ba 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java @@ -36,7 +36,7 @@ public class ClearDropsCommand extends Commander * * @param plugin The plugin which contains this command. */ - protected ClearDropsCommand(final @NotNull JavaPlugin plugin) + public ClearDropsCommand(final @NotNull JavaPlugin plugin) { super(plugin); } diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java index f77cf16..60ab898 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java @@ -29,7 +29,7 @@ public class ClearEntitiesCommand extends Commander * * @param plugin The plugin which contains this command. */ - protected ClearEntitiesCommand(final @NotNull JavaPlugin plugin) + public ClearEntitiesCommand(final @NotNull JavaPlugin plugin) { super(plugin); } diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java index 903da90..5471cd7 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java @@ -32,7 +32,7 @@ public class HaltCommand extends Commander * * @param plugin The plugin which contains this command. */ - protected HaltCommand(@NotNull final JavaPlugin plugin) + public HaltCommand(@NotNull final JavaPlugin plugin) { super(plugin); } diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java index 026cb17..32d223a 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java @@ -35,7 +35,7 @@ public class ManageUserCommand extends Commander * * @param plugin The plugin which contains this command. */ - protected ManageUserCommand(final @NotNull JavaPlugin plugin) + public ManageUserCommand(final @NotNull JavaPlugin plugin) { super(plugin); } diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java index c434d7e..f47e267 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java @@ -25,7 +25,7 @@ public class SmiteCommand extends Commander * * @param plugin The plugin which contains this command. */ - protected SmiteCommand(@NotNull final JavaPlugin plugin) + public SmiteCommand(@NotNull final JavaPlugin plugin) { super(plugin); } From bbc6e7690832da95b3a74e1f5c9f07f5b52686b6 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:17:34 +0200 Subject: [PATCH 10/18] Add description to all modules of the project --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index af20c7d..1fd5129 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ This proof-of-concept also uses the following libraries: # To Do List -Patchwork: +Patchwork (API): - [x] Logging System - [x] SQL API @@ -88,7 +88,7 @@ Patchwork: - [ ] Configuration API *(In Progress...)* - [ ] Event API *(In Progress...)* -Datura: +Datura (Data Manager): - [ ] Permission Handling *(In Progress...)* - [ ] Permission Registration & Assignment *(In Progress...)* @@ -97,7 +97,7 @@ Datura: - [ ] User Data Implementations *(In Progress...)* - [x] Punishment Systems (e.x. Locker, Halter, Cager) -Fossil: +Fossil (Entertainment): - [x] Economy Implementation - [ ] Particle Implementation / Trails *(In Progress...)* @@ -106,7 +106,7 @@ Fossil: - [ ] Chat reaction / game system - [ ] Jumppads -Corvo: +Corvo (Scheduling and Listening Service): - [ ] Service Implementation - [ ] Service Handling From 58bcc1c2d604cbc1e8ac3688defc02a31a7f0e96 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Tue, 1 Aug 2023 13:12:43 +0200 Subject: [PATCH 11/18] Use command API properly --- .../totalfreedom/datura/cmd/CommandSpyCommand.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java index 1773d46..d099696 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java @@ -11,7 +11,7 @@ import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; @Info(name = "commandspy", description = "Spy on commands executed by players.", usage = "/commandspy") -@Permissive(perm = "datura.commandspy") +@Permissive(perm = "datura.commandspy", onlyPlayers = true) public class CommandSpyCommand extends Commander { @@ -30,18 +30,12 @@ public class CommandSpyCommand extends Commander } @Base - public void commandSpy(final CommandSender sender) + public void commandSpy(final Player sender) { - if (!(sender instanceof Player)) - { - sender.sendPlainMessage("You have to be a player to perform this command."); - return; - } - final var commandSpy = ((Datura) getPlugin()). getCommandSpy(); - final var uuid = ((Player) sender). + final var uuid = sender. getUniqueId(); if (commandSpy.isSpying(uuid)) From e1a6b5e58776e2f700feced4aa9cf115f098ff94 Mon Sep 17 00:00:00 2001 From: EnZaXD <60033407+FlorianMichael@users.noreply.github.com> Date: Tue, 1 Aug 2023 16:15:46 +0200 Subject: [PATCH 12/18] Implemented Fuckoff command from TFM back (#16) * Implemented Fuckoff command back from TFM * Actual use the radius field * Change default radius to 15 * Renamed Fuckoff#pushPlayers * Use command API properly --- .../java/me/totalfreedom/datura/Datura.java | 14 ++++- .../datura/cmd/FuckoffCommand.java | 62 +++++++++++++++++++ .../totalfreedom/datura/features/Fuckoff.java | 59 ++++++++++++++++++ 3 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 Datura/src/main/java/me/totalfreedom/datura/cmd/FuckoffCommand.java create mode 100644 Datura/src/main/java/me/totalfreedom/datura/features/Fuckoff.java diff --git a/Datura/src/main/java/me/totalfreedom/datura/Datura.java b/Datura/src/main/java/me/totalfreedom/datura/Datura.java index 60e39a1..57097cb 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/Datura.java +++ b/Datura/src/main/java/me/totalfreedom/datura/Datura.java @@ -1,6 +1,7 @@ package me.totalfreedom.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; @@ -21,6 +22,7 @@ public class Datura extends JavaPlugin // Features private final CommandSpy commandSpy = new CommandSpy(); + private final Fuckoff fuckoff = new Fuckoff(); @Override public void onEnable() @@ -38,6 +40,10 @@ public class Datura extends JavaPlugin .getRegistrations() .getServiceTaskRegistry() .registerService(SubscriptionProvider.syncService(this, cager)); + Patchwork.getInstance() + .getRegistrations() + .getServiceTaskRegistry() + .registerService(SubscriptionProvider.syncService(this, fuckoff)); Bukkit.getPluginManager() .registerEvents(halter, this); @@ -65,7 +71,13 @@ public class Datura extends JavaPlugin return cager; } - public CommandSpy getCommandSpy() { + public CommandSpy getCommandSpy() + { return commandSpy; } + + public Fuckoff getFuckoff() + { + return fuckoff; + } } diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/FuckoffCommand.java b/Datura/src/main/java/me/totalfreedom/datura/cmd/FuckoffCommand.java new file mode 100644 index 0000000..5b41ef4 --- /dev/null +++ b/Datura/src/main/java/me/totalfreedom/datura/cmd/FuckoffCommand.java @@ -0,0 +1,62 @@ +package me.totalfreedom.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 org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; +import org.jetbrains.annotations.NotNull; + +@Info(name = "fuckoff", description = "You'll never even see it coming - repeatedly push players away from you until command is untoggled.", usage = "/fuckoff [radius]") +@Permissive(perm = "datura.fuckoff", onlyPlayers = true) +@Completion(args = {"on", "off"}, index = 0) +@Completion(args = {"[radius]"}, index = 1) +public class FuckoffCommand extends Commander +{ + private final Datura plugin = Shortcuts.provideModule(Datura.class); + + /** + * Initializes this command object. The provided {@link JavaPlugin} should be the plugin which contains the + * command. + *

+ * This constructor will automatically register all subcommands and completions for this command. It will also + * automatically infer all required information from the provided {@link Info} and {@link Permissive} annotations. + * + * @param plugin The plugin which contains this command. + */ + public FuckoffCommand(@NotNull JavaPlugin plugin) + { + super(plugin); + } + + @Subcommand(permission = "datura.fuckoff", args = {String.class}) + public void fuckOff(final Player sender, final String toggle) + { + execute(sender, toggle, 15); + } + + @Subcommand(permission = "datura.fuckoff", args = {String.class, Integer.class}) + public void fuckOff(final Player sender, final String toggle, final Integer radius) + { + execute(sender, toggle, radius); + } + + private void execute(final Player sender, final String toggle, final int radius) + { + if (toggle.equalsIgnoreCase("on")) + { + plugin.getFuckoff(). + add(sender, radius); + + sender.sendPlainMessage("FuckOff enabled."); + } else if (toggle.equalsIgnoreCase("off")) + { + plugin.getFuckoff(). + remove(sender); + + sender.sendPlainMessage("FuckOff disabled."); + } + } +} diff --git a/Datura/src/main/java/me/totalfreedom/datura/features/Fuckoff.java b/Datura/src/main/java/me/totalfreedom/datura/features/Fuckoff.java new file mode 100644 index 0000000..dd20579 --- /dev/null +++ b/Datura/src/main/java/me/totalfreedom/datura/features/Fuckoff.java @@ -0,0 +1,59 @@ +package me.totalfreedom.datura.features; + +import me.totalfreedom.service.Service; +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 players = new ConcurrentHashMap<>(); + + public Fuckoff() + { + super("fuckoff-service"); + } + + public void add(final Player player, final int radius) + { + players.put(player.getUniqueId(), radius); + } + + public void remove(final Player player) + { + players.remove(player.getUniqueId()); + } + + @Override + public void tick() + { + for (Map.Entry entry : players.entrySet()) + { + final var player = Bukkit.getPlayer(entry.getKey()); + + if (player == null) + { + players.remove(entry.getKey()); + continue; + } + + pushPlayers(player, entry.getValue()); + } + } + + 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) + ); + }); + } +} From 21463c50fef976d6b6843d7d9a462ca4a825adcb Mon Sep 17 00:00:00 2001 From: Paldiu Date: Tue, 1 Aug 2023 22:34:18 -0500 Subject: [PATCH 13/18] Migrates the entire package nomenclature to be more direct and straightforward. (#17) Signed-off-by: Paul Reilly --- .../{me/totalfreedom => fns}/corvo/Corvo.java | 4 +- .../listener/PlayerInteractionListener.java | 2 +- .../totalfreedom => fns}/datura/Datura.java | 18 +-- .../datura/cmd/AdminChatCommand.java | 14 +-- .../datura/cmd/CageCommand.java | 16 +-- .../datura/cmd/ClearDropsCommand.java | 20 ++-- .../datura/cmd/ClearEntitiesCommand.java | 16 +-- .../datura/cmd/CommandSpyCommand.java | 19 ++-- .../datura/cmd/FuckoffCommand.java | 16 +-- .../datura/cmd/HaltCommand.java | 16 +-- .../datura/cmd/LockerCommand.java | 14 +-- .../datura/cmd/ManageUserCommand.java | 24 ++-- .../datura/cmd/SmiteCommand.java | 12 +- .../datura/event/UserDataUpdateEvent.java | 6 +- .../datura/features/CommandSpy.java | 9 +- .../datura/features/Fuckoff.java | 30 ++--- .../datura/perms/DefaultNodes.java | 6 +- .../datura/perms/FreedomGroup.java | 17 ++- .../datura/perms/FreedomUser.java | 30 ++--- .../datura/perms/PermissionNode.java | 6 +- .../datura/perms/PermissionNodeBuilder.java | 8 +- .../datura/punishment/Cager.java | 25 ++--- .../datura/punishment/Halter.java | 9 +- .../datura/punishment/Locker.java | 15 ++- .../datura/sql/MySQL.java | 9 +- .../datura/sql/Result.java | 2 +- .../datura/user/ServerEconomyHolder.java | 6 +- .../datura/user/SimpleUserData.java | 27 +++-- .../totalfreedom => fns}/fossil/Fossil.java | 10 +- .../fossil/bouncypads/BouncyPad.java | 5 +- .../fossil/bouncypads/PadHolder.java | 15 ++- .../fossil/bouncypads/PadType.java | 2 +- .../fossil/cmd/CakeCommand.java | 20 ++-- .../economy/SimpleCompletedTransaction.java | 10 +- .../economy/SimpleLoggedTransactor.java | 10 +- .../economy/SimpleMutableTransaction.java | 6 +- .../fossil/economy/SimpleTransaction.java | 7 +- .../economy/SimpleTransactionLogger.java | 14 +-- .../economy/SimpleTransactionResult.java | 20 ++-- .../fossil/economy/SimpleTransactor.java | 12 +- .../fossil/items/ClownfishItem.java | 2 +- .../fossil/items/ShopItem.java | 2 +- .../fossil/items/TrailItem.java | 2 +- .../fossil/reactions/CopyCatReaction.java | 26 ++--- .../src/main/java/fns/fossil/shop/Shoppe.java | 5 + .../fossil/shop/menus/MainMenu.java | 4 +- .../fossil/trail/Trailer.java | 7 +- .../fossil/trail/types/BasicTrail.java | 4 +- .../fossil/trail/types/FlameTrail.java | 4 +- .../fossil/trail/types/HeartTrail.java | 4 +- .../fossil/trail/types/RainbowTrail.java | 9 +- .../fossil/trail/types/SimpleTrail.java | 11 +- .../fossil/trail/types/StrobeTrail.java | 4 +- .../fossil/trail/types/TrailProvider.java | 2 +- .../me/totalfreedom/fossil/shop/Shoppe.java | 5 - .../patchwork}/api/Context.java | 7 +- .../patchwork}/api/Interpolator.java | 2 +- .../patchwork}/api/Serializable.java | 2 +- .../audience/MutableAudienceForwarder.java | 2 +- .../patchwork}/base/Patchwork.java | 10 +- .../patchwork}/base/Registration.java | 14 +-- .../patchwork}/base/Shortcuts.java | 5 +- .../patchwork}/command/BukkitDelegate.java | 10 +- .../patchwork}/command/CommandHandler.java | 2 +- .../patchwork}/command/Commander.java | 19 ++-- .../patchwork}/command/annotation/Base.java | 2 +- .../command/annotation/Completion.java | 2 +- .../command/annotation/Completions.java | 2 +- .../patchwork}/command/annotation/Info.java | 2 +- .../command/annotation/Permissive.java | 2 +- .../command/annotation/Subcommand.java | 7 +- .../patchwork}/config/Configuration.java | 7 +- .../patchwork}/config/YamlWrapper.java | 2 +- .../patchwork}/data/ConfigRegistry.java | 5 +- .../patchwork}/data/EventRegistry.java | 7 +- .../patchwork}/data/GroupRegistry.java | 7 +- .../patchwork}/data/ModuleRegistry.java | 7 +- .../patchwork}/data/ServiceTaskRegistry.java | 15 ++- .../patchwork}/data/UserRegistry.java | 9 +- .../patchwork}/display/AbstractMenu.java | 13 +-- .../patchwork}/display/BossBarDisplay.java | 9 +- .../patchwork}/display/BossBarTimer.java | 7 +- .../patchwork}/display/ClickAction.java | 2 +- .../patchwork}/display/Displayable.java | 11 +- .../patchwork}/display/DisplayableView.java | 4 +- .../patchwork}/display/TitleDisplay.java | 5 +- .../display/adminchat/ACFormatBuilder.java | 2 +- .../display/adminchat/AdminChatDisplay.java | 21 ++-- .../display/adminchat/AdminChatFormat.java | 2 +- .../economy/CompletedTransaction.java | 2 +- .../patchwork}/economy/EconomicEntity.java | 2 +- .../economy/EconomicEntityData.java | 2 +- .../economy/MutableTransaction.java | 2 +- .../patchwork}/economy/Transaction.java | 2 +- .../patchwork}/economy/TransactionLogger.java | 2 +- .../patchwork}/economy/TransactionResult.java | 2 +- .../patchwork}/economy/Transactor.java | 2 +- .../patchwork}/event/Callback.java | 2 +- .../patchwork}/event/EventBus.java | 9 +- .../patchwork}/event/EventSubscription.java | 2 +- .../patchwork}/event/FEvent.java | 2 +- .../patchwork}/event/SubscriptionBox.java | 2 +- .../patchwork}/logging/BlockInteraction.java | 7 +- .../logging/ContainerInteraction.java | 13 +-- .../patchwork}/logging/Interaction.java | 7 +- .../logging/InteractionFormatter.java | 5 +- .../patchwork}/particle/NoteColorUtil.java | 2 +- .../patchwork}/particle/Trail.java | 11 +- .../patchwork}/particle/TrailType.java | 2 +- .../patchwork}/provider/ContextProvider.java | 103 ++++++++++++------ .../patchwork}/provider/EventProvider.java | 4 +- .../patchwork}/provider/ModuleProvider.java | 2 +- .../patchwork}/provider/ServiceProvider.java | 4 +- .../patchwork}/security/Group.java | 2 +- .../patchwork}/security/Groups.java | 2 +- .../patchwork}/security/Node.java | 5 +- .../patchwork}/security/NodeBuilder.java | 2 +- .../patchwork}/security/NodeType.java | 2 +- .../patchwork}/security/PermissionHolder.java | 5 +- .../patchwork}/service/FreedomExecutor.java | 9 +- .../patchwork}/service/Service.java | 2 +- .../service/ServiceSubscription.java | 5 +- .../service/SubscriptionProvider.java | 2 +- .../patchwork}/service/Task.java | 7 +- .../patchwork}/service/TaskSubscription.java | 7 +- .../patchwork}/shop/Reactable.java | 7 +- .../patchwork}/shop/Reaction.java | 2 +- .../patchwork}/shop/ReactionTask.java | 12 +- .../patchwork}/shop/ReactionType.java | 2 +- .../patchwork}/sql/SQL.java | 2 +- .../patchwork}/sql/SQLProperties.java | 2 +- .../patchwork}/user/User.java | 8 +- .../patchwork}/user/UserData.java | 11 +- .../patchwork}/utils/DurationTools.java | 2 +- .../patchwork}/utils/InterpolationUtils.java | 9 +- .../patchwork}/utils/ShapeUtils.java | 7 +- .../patchwork}/utils/Tagged.java | 11 +- .../patchwork}/utils/container/Identity.java | 2 +- .../patchwork}/utils/container/Pair.java | 2 +- .../patchwork}/utils/container/Trio.java | 2 +- .../patchwork}/utils/container/UnaryPair.java | 2 +- .../patchwork}/utils/container/UnaryTrio.java | 2 +- .../utils/kyori/FreedomAdventure.java | 7 +- .../utils/kyori/FreedomMiniMessage.java | 14 +-- .../utils/kyori/KyoriConstants.java | 4 +- .../utils/logging/FreedomLogger.java | 7 +- 146 files changed, 595 insertions(+), 608 deletions(-) rename Corvo/src/main/java/{me/totalfreedom => fns}/corvo/Corvo.java (87%) rename Corvo/src/main/java/{me/totalfreedom => fns}/corvo/listener/PlayerInteractionListener.java (95%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/Datura.java (81%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/cmd/AdminChatCommand.java (85%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/cmd/CageCommand.java (89%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/cmd/ClearDropsCommand.java (87%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/cmd/ClearEntitiesCommand.java (85%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/cmd/CommandSpyCommand.java (74%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/cmd/FuckoffCommand.java (83%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/cmd/HaltCommand.java (89%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/cmd/LockerCommand.java (79%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/cmd/ManageUserCommand.java (86%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/cmd/SmiteCommand.java (85%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/event/UserDataUpdateEvent.java (76%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/features/CommandSpy.java (97%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/features/Fuckoff.java (53%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/perms/DefaultNodes.java (90%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/perms/FreedomGroup.java (97%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/perms/FreedomUser.java (93%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/perms/PermissionNode.java (86%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/perms/PermissionNodeBuilder.java (83%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/punishment/Cager.java (97%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/punishment/Halter.java (95%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/punishment/Locker.java (95%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/sql/MySQL.java (98%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/sql/Result.java (83%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/user/ServerEconomyHolder.java (96%) rename Datura/src/main/java/{me/totalfreedom => fns}/datura/user/SimpleUserData.java (93%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/Fossil.java (73%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/bouncypads/BouncyPad.java (99%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/bouncypads/PadHolder.java (97%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/bouncypads/PadType.java (94%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/cmd/CakeCommand.java (73%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/economy/SimpleCompletedTransaction.java (80%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/economy/SimpleLoggedTransactor.java (79%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/economy/SimpleMutableTransaction.java (81%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/economy/SimpleTransaction.java (85%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/economy/SimpleTransactionLogger.java (84%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/economy/SimpleTransactionResult.java (75%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/economy/SimpleTransactor.java (84%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/items/ClownfishItem.java (95%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/items/ShopItem.java (95%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/items/TrailItem.java (91%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/reactions/CopyCatReaction.java (78%) create mode 100644 Fossil/src/main/java/fns/fossil/shop/Shoppe.java rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/shop/menus/MainMenu.java (59%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/trail/Trailer.java (85%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/trail/types/BasicTrail.java (92%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/trail/types/FlameTrail.java (90%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/trail/types/HeartTrail.java (88%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/trail/types/RainbowTrail.java (90%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/trail/types/SimpleTrail.java (93%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/trail/types/StrobeTrail.java (91%) rename Fossil/src/main/java/{me/totalfreedom => fns}/fossil/trail/types/TrailProvider.java (80%) delete mode 100644 Fossil/src/main/java/me/totalfreedom/fossil/shop/Shoppe.java rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/api/Context.java (98%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/api/Interpolator.java (95%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/api/Serializable.java (96%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/audience/MutableAudienceForwarder.java (99%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/base/Patchwork.java (92%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/base/Registration.java (88%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/base/Shortcuts.java (88%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/command/BukkitDelegate.java (97%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/command/CommandHandler.java (97%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/command/Commander.java (95%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/command/annotation/Base.java (88%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/command/annotation/Completion.java (95%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/command/annotation/Completions.java (92%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/command/annotation/Info.java (96%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/command/annotation/Permissive.java (95%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/command/annotation/Subcommand.java (94%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/config/Configuration.java (96%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/config/YamlWrapper.java (53%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/data/ConfigRegistry.java (93%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/data/EventRegistry.java (91%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/data/GroupRegistry.java (95%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/data/ModuleRegistry.java (94%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/data/ServiceTaskRegistry.java (97%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/data/UserRegistry.java (96%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/display/AbstractMenu.java (99%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/display/BossBarDisplay.java (99%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/display/BossBarTimer.java (93%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/display/ClickAction.java (92%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/display/Displayable.java (99%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/display/DisplayableView.java (96%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/display/TitleDisplay.java (99%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/display/adminchat/ACFormatBuilder.java (98%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/display/adminchat/AdminChatDisplay.java (95%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/display/adminchat/AdminChatFormat.java (98%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/economy/CompletedTransaction.java (90%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/economy/EconomicEntity.java (94%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/economy/EconomicEntityData.java (96%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/economy/MutableTransaction.java (96%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/economy/Transaction.java (92%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/economy/TransactionLogger.java (91%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/economy/TransactionResult.java (87%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/economy/Transactor.java (90%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/event/Callback.java (75%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/event/EventBus.java (93%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/event/EventSubscription.java (88%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/event/FEvent.java (95%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/event/SubscriptionBox.java (96%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/logging/BlockInteraction.java (97%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/logging/ContainerInteraction.java (98%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/logging/Interaction.java (94%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/logging/InteractionFormatter.java (99%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/particle/NoteColorUtil.java (98%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/particle/Trail.java (97%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/particle/TrailType.java (97%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/provider/ContextProvider.java (65%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/provider/EventProvider.java (56%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/provider/ModuleProvider.java (80%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/provider/ServiceProvider.java (51%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/security/Group.java (96%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/security/Groups.java (97%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/security/Node.java (90%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/security/NodeBuilder.java (85%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/security/NodeType.java (73%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/security/PermissionHolder.java (88%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/service/FreedomExecutor.java (98%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/service/Service.java (97%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/service/ServiceSubscription.java (99%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/service/SubscriptionProvider.java (99%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/service/Task.java (98%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/service/TaskSubscription.java (98%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/shop/Reactable.java (82%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/shop/Reaction.java (97%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/shop/ReactionTask.java (87%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/shop/ReactionType.java (67%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/sql/SQL.java (95%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/sql/SQLProperties.java (97%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/user/User.java (72%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/user/UserData.java (78%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/utils/DurationTools.java (95%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/utils/InterpolationUtils.java (98%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/utils/ShapeUtils.java (97%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/utils/Tagged.java (96%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/utils/container/Identity.java (89%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/utils/container/Pair.java (52%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/utils/container/Trio.java (62%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/utils/container/UnaryPair.java (55%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/utils/container/UnaryTrio.java (62%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/utils/kyori/FreedomAdventure.java (97%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/utils/kyori/FreedomMiniMessage.java (90%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/utils/kyori/KyoriConstants.java (97%) rename Patchwork/src/main/java/{me/totalfreedom => fns/patchwork}/utils/logging/FreedomLogger.java (98%) diff --git a/Corvo/src/main/java/me/totalfreedom/corvo/Corvo.java b/Corvo/src/main/java/fns/corvo/Corvo.java similarity index 87% rename from Corvo/src/main/java/me/totalfreedom/corvo/Corvo.java rename to Corvo/src/main/java/fns/corvo/Corvo.java index e698dc5..8b021ec 100644 --- a/Corvo/src/main/java/me/totalfreedom/corvo/Corvo.java +++ b/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 diff --git a/Corvo/src/main/java/me/totalfreedom/corvo/listener/PlayerInteractionListener.java b/Corvo/src/main/java/fns/corvo/listener/PlayerInteractionListener.java similarity index 95% rename from Corvo/src/main/java/me/totalfreedom/corvo/listener/PlayerInteractionListener.java rename to Corvo/src/main/java/fns/corvo/listener/PlayerInteractionListener.java index 0704003..86a5036 100644 --- a/Corvo/src/main/java/me/totalfreedom/corvo/listener/PlayerInteractionListener.java +++ b/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; diff --git a/Datura/src/main/java/me/totalfreedom/datura/Datura.java b/Datura/src/main/java/fns/datura/Datura.java similarity index 81% rename from Datura/src/main/java/me/totalfreedom/datura/Datura.java rename to Datura/src/main/java/fns/datura/Datura.java index 57097cb..f28a9c1 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/Datura.java +++ b/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 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; diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java b/Datura/src/main/java/fns/datura/cmd/AdminChatCommand.java similarity index 85% rename from Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java rename to Datura/src/main/java/fns/datura/cmd/AdminChatCommand.java index 38151d4..ab38001 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/AdminChatCommand.java +++ b/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 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; diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java b/Datura/src/main/java/fns/datura/cmd/CageCommand.java similarity index 89% rename from Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java rename to Datura/src/main/java/fns/datura/cmd/CageCommand.java index 1fbdb7e..ecec841 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/CageCommand.java +++ b/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 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; diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java b/Datura/src/main/java/fns/datura/cmd/ClearDropsCommand.java similarity index 87% rename from Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java rename to Datura/src/main/java/fns/datura/cmd/ClearDropsCommand.java index 71be5ba..99828f8 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearDropsCommand.java +++ b/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 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; diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java b/Datura/src/main/java/fns/datura/cmd/ClearEntitiesCommand.java similarity index 85% rename from Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java rename to Datura/src/main/java/fns/datura/cmd/ClearEntitiesCommand.java index 60ab898..fd14a1c 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/ClearEntitiesCommand.java +++ b/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 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; diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java b/Datura/src/main/java/fns/datura/cmd/CommandSpyCommand.java similarity index 74% rename from Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java rename to Datura/src/main/java/fns/datura/cmd/CommandSpyCommand.java index d099696..bd9a13d 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/CommandSpyCommand.java +++ b/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 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)) { diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/FuckoffCommand.java b/Datura/src/main/java/fns/datura/cmd/FuckoffCommand.java similarity index 83% rename from Datura/src/main/java/me/totalfreedom/datura/cmd/FuckoffCommand.java rename to Datura/src/main/java/fns/datura/cmd/FuckoffCommand.java index 5b41ef4..a24822d 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/FuckoffCommand.java +++ b/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 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); } diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java b/Datura/src/main/java/fns/datura/cmd/HaltCommand.java similarity index 89% rename from Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java rename to Datura/src/main/java/fns/datura/cmd/HaltCommand.java index 5471cd7..82b7559 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/HaltCommand.java +++ b/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 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; diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/LockerCommand.java b/Datura/src/main/java/fns/datura/cmd/LockerCommand.java similarity index 79% rename from Datura/src/main/java/me/totalfreedom/datura/cmd/LockerCommand.java rename to Datura/src/main/java/fns/datura/cmd/LockerCommand.java index 0623c84..8ddffcf 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/LockerCommand.java +++ b/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 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; diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java b/Datura/src/main/java/fns/datura/cmd/ManageUserCommand.java similarity index 86% rename from Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java rename to Datura/src/main/java/fns/datura/cmd/ManageUserCommand.java index 32d223a..1bd446e 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/ManageUserCommand.java +++ b/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; diff --git a/Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java b/Datura/src/main/java/fns/datura/cmd/SmiteCommand.java similarity index 85% rename from Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java rename to Datura/src/main/java/fns/datura/cmd/SmiteCommand.java index f47e267..1e83ff9 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/cmd/SmiteCommand.java +++ b/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 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; diff --git a/Datura/src/main/java/me/totalfreedom/datura/event/UserDataUpdateEvent.java b/Datura/src/main/java/fns/datura/event/UserDataUpdateEvent.java similarity index 76% rename from Datura/src/main/java/me/totalfreedom/datura/event/UserDataUpdateEvent.java rename to Datura/src/main/java/fns/datura/event/UserDataUpdateEvent.java index b3ef7b4..8bbd675 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/event/UserDataUpdateEvent.java +++ b/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 me.totalfreedom.user.UserData; +import fns.patchwork.event.FEvent; +import fns.patchwork.user.UserData; public class UserDataUpdateEvent extends FEvent { diff --git a/Datura/src/main/java/me/totalfreedom/datura/features/CommandSpy.java b/Datura/src/main/java/fns/datura/features/CommandSpy.java similarity index 97% rename from Datura/src/main/java/me/totalfreedom/datura/features/CommandSpy.java rename to Datura/src/main/java/fns/datura/features/CommandSpy.java index 00ba408..8f761fa 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/features/CommandSpy.java +++ b/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 { diff --git a/Datura/src/main/java/me/totalfreedom/datura/features/Fuckoff.java b/Datura/src/main/java/fns/datura/features/Fuckoff.java similarity index 53% rename from Datura/src/main/java/me/totalfreedom/datura/features/Fuckoff.java rename to Datura/src/main/java/fns/datura/features/Fuckoff.java index dd20579..2bf25cf 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/features/Fuckoff.java +++ b/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 players = new ConcurrentHashMap<>(); @@ -30,7 +30,7 @@ public class Fuckoff extends Service @Override public void tick() { - for (Map.Entry entry : players.entrySet()) + for (final Map.Entry 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))); } } diff --git a/Datura/src/main/java/me/totalfreedom/datura/perms/DefaultNodes.java b/Datura/src/main/java/fns/datura/perms/DefaultNodes.java similarity index 90% rename from Datura/src/main/java/me/totalfreedom/datura/perms/DefaultNodes.java rename to Datura/src/main/java/fns/datura/perms/DefaultNodes.java index 6357cdc..71a9af4 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/perms/DefaultNodes.java +++ b/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 me.totalfreedom.security.NodeType; +import fns.patchwork.security.Node; +import fns.patchwork.security.NodeType; public class DefaultNodes { diff --git a/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomGroup.java b/Datura/src/main/java/fns/datura/perms/FreedomGroup.java similarity index 97% rename from Datura/src/main/java/me/totalfreedom/datura/perms/FreedomGroup.java rename to Datura/src/main/java/fns/datura/perms/FreedomGroup.java index 7627933..0077a5f 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomGroup.java +++ b/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 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; diff --git a/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomUser.java b/Datura/src/main/java/fns/datura/perms/FreedomUser.java similarity index 93% rename from Datura/src/main/java/me/totalfreedom/datura/perms/FreedomUser.java rename to Datura/src/main/java/fns/datura/perms/FreedomUser.java index a055351..367ccd6 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/perms/FreedomUser.java +++ b/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 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 permissions; private final Map 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); } diff --git a/Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNode.java b/Datura/src/main/java/fns/datura/perms/PermissionNode.java similarity index 86% rename from Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNode.java rename to Datura/src/main/java/fns/datura/perms/PermissionNode.java index a83c115..bb70275 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNode.java +++ b/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 me.totalfreedom.security.NodeType; +import fns.patchwork.security.Node; +import fns.patchwork.security.NodeType; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; diff --git a/Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNodeBuilder.java b/Datura/src/main/java/fns/datura/perms/PermissionNodeBuilder.java similarity index 83% rename from Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNodeBuilder.java rename to Datura/src/main/java/fns/datura/perms/PermissionNodeBuilder.java index 87b8fa0..b1c3a0b 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/perms/PermissionNodeBuilder.java +++ b/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 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 { diff --git a/Datura/src/main/java/me/totalfreedom/datura/punishment/Cager.java b/Datura/src/main/java/fns/datura/punishment/Cager.java similarity index 97% rename from Datura/src/main/java/me/totalfreedom/datura/punishment/Cager.java rename to Datura/src/main/java/fns/datura/punishment/Cager.java index 5b3ef49..b411052 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/punishment/Cager.java +++ b/Datura/src/main/java/fns/datura/punishment/Cager.java @@ -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 { diff --git a/Datura/src/main/java/me/totalfreedom/datura/punishment/Halter.java b/Datura/src/main/java/fns/datura/punishment/Halter.java similarity index 95% rename from Datura/src/main/java/me/totalfreedom/datura/punishment/Halter.java rename to Datura/src/main/java/fns/datura/punishment/Halter.java index 5ffff30..d417bbf 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/punishment/Halter.java +++ b/Datura/src/main/java/fns/datura/punishment/Halter.java @@ -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 { diff --git a/Datura/src/main/java/me/totalfreedom/datura/punishment/Locker.java b/Datura/src/main/java/fns/datura/punishment/Locker.java similarity index 95% rename from Datura/src/main/java/me/totalfreedom/datura/punishment/Locker.java rename to Datura/src/main/java/fns/datura/punishment/Locker.java index c459037..71a0abd 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/punishment/Locker.java +++ b/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 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 lockedPlayers = new HashSet<>(); diff --git a/Datura/src/main/java/me/totalfreedom/datura/sql/MySQL.java b/Datura/src/main/java/fns/datura/sql/MySQL.java similarity index 98% rename from Datura/src/main/java/me/totalfreedom/datura/sql/MySQL.java rename to Datura/src/main/java/fns/datura/sql/MySQL.java index ae2debf..e3485e7 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/sql/MySQL.java +++ b/Datura/src/main/java/fns/datura/sql/MySQL.java @@ -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; diff --git a/Datura/src/main/java/me/totalfreedom/datura/sql/Result.java b/Datura/src/main/java/fns/datura/sql/Result.java similarity index 83% rename from Datura/src/main/java/me/totalfreedom/datura/sql/Result.java rename to Datura/src/main/java/fns/datura/sql/Result.java index 9fd214b..7f51cee 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/sql/Result.java +++ b/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; diff --git a/Datura/src/main/java/me/totalfreedom/datura/user/ServerEconomyHolder.java b/Datura/src/main/java/fns/datura/user/ServerEconomyHolder.java similarity index 96% rename from Datura/src/main/java/me/totalfreedom/datura/user/ServerEconomyHolder.java rename to Datura/src/main/java/fns/datura/user/ServerEconomyHolder.java index 768ac91..5ac8649 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/user/ServerEconomyHolder.java +++ b/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 me.totalfreedom.economy.EconomicEntityData; +import fns.patchwork.economy.EconomicEntity; +import fns.patchwork.economy.EconomicEntityData; /** * Represents the server's economy holder. diff --git a/Datura/src/main/java/me/totalfreedom/datura/user/SimpleUserData.java b/Datura/src/main/java/fns/datura/user/SimpleUserData.java similarity index 93% rename from Datura/src/main/java/me/totalfreedom/datura/user/SimpleUserData.java rename to Datura/src/main/java/fns/datura/user/SimpleUserData.java index c8d95e7..234306d 100644 --- a/Datura/src/main/java/me/totalfreedom/datura/user/SimpleUserData.java +++ b/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 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; diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/Fossil.java b/Fossil/src/main/java/fns/fossil/Fossil.java similarity index 73% rename from Fossil/src/main/java/me/totalfreedom/fossil/Fossil.java rename to Fossil/src/main/java/fns/fossil/Fossil.java index a4eda38..e32ce9b 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/Fossil.java +++ b/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 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 diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/BouncyPad.java b/Fossil/src/main/java/fns/fossil/bouncypads/BouncyPad.java similarity index 99% rename from Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/BouncyPad.java rename to Fossil/src/main/java/fns/fossil/bouncypads/BouncyPad.java index cacd37a..176af05 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/BouncyPad.java +++ b/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. */ diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/PadHolder.java b/Fossil/src/main/java/fns/fossil/bouncypads/PadHolder.java similarity index 97% rename from Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/PadHolder.java rename to Fossil/src/main/java/fns/fossil/bouncypads/PadHolder.java index 7af351b..93b5f91 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/PadHolder.java +++ b/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 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. */ diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/PadType.java b/Fossil/src/main/java/fns/fossil/bouncypads/PadType.java similarity index 94% rename from Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/PadType.java rename to Fossil/src/main/java/fns/fossil/bouncypads/PadType.java index 2c58591..a6f4c33 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/bouncypads/PadType.java +++ b/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; diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/cmd/CakeCommand.java b/Fossil/src/main/java/fns/fossil/cmd/CakeCommand.java similarity index 73% rename from Fossil/src/main/java/me/totalfreedom/fossil/cmd/CakeCommand.java rename to Fossil/src/main/java/fns/fossil/cmd/CakeCommand.java index 7a5c7b0..3328a66 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/cmd/CakeCommand.java +++ b/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 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, - "But there's no sense crying over every mistake. You just keep on trying till you run out of " + - "cake.")); + Bukkit.getServer().sendMessage(FreedomMiniMessage.deserialize(true, + "But there's no sense crying over " + + "every mistake. You just keep on trying " + + "till you run out of " + + "cake.")); final ItemStack stack = new ItemStack(Material.CAKE, 1); final ItemMeta meta = stack.getItemMeta(); diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleCompletedTransaction.java b/Fossil/src/main/java/fns/fossil/economy/SimpleCompletedTransaction.java similarity index 80% rename from Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleCompletedTransaction.java rename to Fossil/src/main/java/fns/fossil/economy/SimpleCompletedTransaction.java index d9c666a..fe0af1f 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleCompletedTransaction.java +++ b/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 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 { diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleLoggedTransactor.java b/Fossil/src/main/java/fns/fossil/economy/SimpleLoggedTransactor.java similarity index 79% rename from Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleLoggedTransactor.java rename to Fossil/src/main/java/fns/fossil/economy/SimpleLoggedTransactor.java index 440c0b3..3a18dcc 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleLoggedTransactor.java +++ b/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 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 { diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleMutableTransaction.java b/Fossil/src/main/java/fns/fossil/economy/SimpleMutableTransaction.java similarity index 81% rename from Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleMutableTransaction.java rename to Fossil/src/main/java/fns/fossil/economy/SimpleMutableTransaction.java index 9aadb26..9c46559 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleMutableTransaction.java +++ b/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 me.totalfreedom.economy.MutableTransaction; +import fns.patchwork.economy.EconomicEntity; +import fns.patchwork.economy.MutableTransaction; public class SimpleMutableTransaction extends SimpleTransaction implements MutableTransaction { diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransaction.java b/Fossil/src/main/java/fns/fossil/economy/SimpleTransaction.java similarity index 85% rename from Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransaction.java rename to Fossil/src/main/java/fns/fossil/economy/SimpleTransaction.java index 93bf7b7..1d1fcc9 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransaction.java +++ b/Fossil/src/main/java/fns/fossil/economy/SimpleTransaction.java @@ -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 diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransactionLogger.java b/Fossil/src/main/java/fns/fossil/economy/SimpleTransactionLogger.java similarity index 84% rename from Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransactionLogger.java rename to Fossil/src/main/java/fns/fossil/economy/SimpleTransactionLogger.java index 80ba2d2..3f5730f 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransactionLogger.java +++ b/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 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 diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransactionResult.java b/Fossil/src/main/java/fns/fossil/economy/SimpleTransactionResult.java similarity index 75% rename from Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransactionResult.java rename to Fossil/src/main/java/fns/fossil/economy/SimpleTransactionResult.java index e0ee389..1f15eb4 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransactionResult.java +++ b/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 - ? 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 diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransactor.java b/Fossil/src/main/java/fns/fossil/economy/SimpleTransactor.java similarity index 84% rename from Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransactor.java rename to Fossil/src/main/java/fns/fossil/economy/SimpleTransactor.java index 7524174..926468c 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/economy/SimpleTransactor.java +++ b/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 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 { diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/items/ClownfishItem.java b/Fossil/src/main/java/fns/fossil/items/ClownfishItem.java similarity index 95% rename from Fossil/src/main/java/me/totalfreedom/fossil/items/ClownfishItem.java rename to Fossil/src/main/java/fns/fossil/items/ClownfishItem.java index 0bf1131..972094a 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/items/ClownfishItem.java +++ b/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; diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/items/ShopItem.java b/Fossil/src/main/java/fns/fossil/items/ShopItem.java similarity index 95% rename from Fossil/src/main/java/me/totalfreedom/fossil/items/ShopItem.java rename to Fossil/src/main/java/fns/fossil/items/ShopItem.java index 04f6bb9..5ec1c9d 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/items/ShopItem.java +++ b/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; diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/items/TrailItem.java b/Fossil/src/main/java/fns/fossil/items/TrailItem.java similarity index 91% rename from Fossil/src/main/java/me/totalfreedom/fossil/items/TrailItem.java rename to Fossil/src/main/java/fns/fossil/items/TrailItem.java index ea95de6..9ecae33 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/items/TrailItem.java +++ b/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; diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/reactions/CopyCatReaction.java b/Fossil/src/main/java/fns/fossil/reactions/CopyCatReaction.java similarity index 78% rename from Fossil/src/main/java/me/totalfreedom/fossil/reactions/CopyCatReaction.java rename to Fossil/src/main/java/fns/fossil/reactions/CopyCatReaction.java index 52460e8..6ec3932 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/reactions/CopyCatReaction.java +++ b/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 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 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(); diff --git a/Fossil/src/main/java/fns/fossil/shop/Shoppe.java b/Fossil/src/main/java/fns/fossil/shop/Shoppe.java new file mode 100644 index 0000000..8836bae --- /dev/null +++ b/Fossil/src/main/java/fns/fossil/shop/Shoppe.java @@ -0,0 +1,5 @@ +package fns.fossil.shop; + +public class Shoppe +{ +} diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/shop/menus/MainMenu.java b/Fossil/src/main/java/fns/fossil/shop/menus/MainMenu.java similarity index 59% rename from Fossil/src/main/java/me/totalfreedom/fossil/shop/menus/MainMenu.java rename to Fossil/src/main/java/fns/fossil/shop/menus/MainMenu.java index c637c56..2ea0394 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/shop/menus/MainMenu.java +++ b/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 { diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/trail/Trailer.java b/Fossil/src/main/java/fns/fossil/trail/Trailer.java similarity index 85% rename from Fossil/src/main/java/me/totalfreedom/fossil/trail/Trailer.java rename to Fossil/src/main/java/fns/fossil/trail/Trailer.java index b530595..ef9e05b 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/trail/Trailer.java +++ b/Fossil/src/main/java/fns/fossil/trail/Trailer.java @@ -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; diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/trail/types/BasicTrail.java b/Fossil/src/main/java/fns/fossil/trail/types/BasicTrail.java similarity index 92% rename from Fossil/src/main/java/me/totalfreedom/fossil/trail/types/BasicTrail.java rename to Fossil/src/main/java/fns/fossil/trail/types/BasicTrail.java index 6d6ee9b..f9746f8 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/trail/types/BasicTrail.java +++ b/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; diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/trail/types/FlameTrail.java b/Fossil/src/main/java/fns/fossil/trail/types/FlameTrail.java similarity index 90% rename from Fossil/src/main/java/me/totalfreedom/fossil/trail/types/FlameTrail.java rename to Fossil/src/main/java/fns/fossil/trail/types/FlameTrail.java index 2fe823e..e141cb7 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/trail/types/FlameTrail.java +++ b/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; diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/trail/types/HeartTrail.java b/Fossil/src/main/java/fns/fossil/trail/types/HeartTrail.java similarity index 88% rename from Fossil/src/main/java/me/totalfreedom/fossil/trail/types/HeartTrail.java rename to Fossil/src/main/java/fns/fossil/trail/types/HeartTrail.java index 968a6ef..8bc2784 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/trail/types/HeartTrail.java +++ b/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; diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/trail/types/RainbowTrail.java b/Fossil/src/main/java/fns/fossil/trail/types/RainbowTrail.java similarity index 90% rename from Fossil/src/main/java/me/totalfreedom/fossil/trail/types/RainbowTrail.java rename to Fossil/src/main/java/fns/fossil/trail/types/RainbowTrail.java index b020349..5f80dd9 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/trail/types/RainbowTrail.java +++ b/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 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 currentColor; diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/trail/types/SimpleTrail.java b/Fossil/src/main/java/fns/fossil/trail/types/SimpleTrail.java similarity index 93% rename from Fossil/src/main/java/me/totalfreedom/fossil/trail/types/SimpleTrail.java rename to Fossil/src/main/java/fns/fossil/trail/types/SimpleTrail.java index 6988ba5..bf2c249 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/trail/types/SimpleTrail.java +++ b/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 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; diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/trail/types/StrobeTrail.java b/Fossil/src/main/java/fns/fossil/trail/types/StrobeTrail.java similarity index 91% rename from Fossil/src/main/java/me/totalfreedom/fossil/trail/types/StrobeTrail.java rename to Fossil/src/main/java/fns/fossil/trail/types/StrobeTrail.java index 1e444c5..541aa93 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/trail/types/StrobeTrail.java +++ b/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; diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/trail/types/TrailProvider.java b/Fossil/src/main/java/fns/fossil/trail/types/TrailProvider.java similarity index 80% rename from Fossil/src/main/java/me/totalfreedom/fossil/trail/types/TrailProvider.java rename to Fossil/src/main/java/fns/fossil/trail/types/TrailProvider.java index 1110266..55ec075 100644 --- a/Fossil/src/main/java/me/totalfreedom/fossil/trail/types/TrailProvider.java +++ b/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; diff --git a/Fossil/src/main/java/me/totalfreedom/fossil/shop/Shoppe.java b/Fossil/src/main/java/me/totalfreedom/fossil/shop/Shoppe.java deleted file mode 100644 index d586412..0000000 --- a/Fossil/src/main/java/me/totalfreedom/fossil/shop/Shoppe.java +++ /dev/null @@ -1,5 +0,0 @@ -package me.totalfreedom.fossil.shop; - -public class Shoppe -{ -} diff --git a/Patchwork/src/main/java/me/totalfreedom/api/Context.java b/Patchwork/src/main/java/fns/patchwork/api/Context.java similarity index 98% rename from Patchwork/src/main/java/me/totalfreedom/api/Context.java rename to Patchwork/src/main/java/fns/patchwork/api/Context.java index 321cca6..063a48b 100644 --- a/Patchwork/src/main/java/me/totalfreedom/api/Context.java +++ b/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. diff --git a/Patchwork/src/main/java/me/totalfreedom/api/Interpolator.java b/Patchwork/src/main/java/fns/patchwork/api/Interpolator.java similarity index 95% rename from Patchwork/src/main/java/me/totalfreedom/api/Interpolator.java rename to Patchwork/src/main/java/fns/patchwork/api/Interpolator.java index 0a6c598..1acd20c 100644 --- a/Patchwork/src/main/java/me/totalfreedom/api/Interpolator.java +++ b/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. diff --git a/Patchwork/src/main/java/me/totalfreedom/api/Serializable.java b/Patchwork/src/main/java/fns/patchwork/api/Serializable.java similarity index 96% rename from Patchwork/src/main/java/me/totalfreedom/api/Serializable.java rename to Patchwork/src/main/java/fns/patchwork/api/Serializable.java index 3dc62a6..37b38ff 100644 --- a/Patchwork/src/main/java/me/totalfreedom/api/Serializable.java +++ b/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 diff --git a/Patchwork/src/main/java/me/totalfreedom/audience/MutableAudienceForwarder.java b/Patchwork/src/main/java/fns/patchwork/audience/MutableAudienceForwarder.java similarity index 99% rename from Patchwork/src/main/java/me/totalfreedom/audience/MutableAudienceForwarder.java rename to Patchwork/src/main/java/fns/patchwork/audience/MutableAudienceForwarder.java index 38eaf1a..802154f 100644 --- a/Patchwork/src/main/java/me/totalfreedom/audience/MutableAudienceForwarder.java +++ b/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; diff --git a/Patchwork/src/main/java/me/totalfreedom/base/Patchwork.java b/Patchwork/src/main/java/fns/patchwork/base/Patchwork.java similarity index 92% rename from Patchwork/src/main/java/me/totalfreedom/base/Patchwork.java rename to Patchwork/src/main/java/fns/patchwork/base/Patchwork.java index e12ed34..964180f 100644 --- a/Patchwork/src/main/java/me/totalfreedom/base/Patchwork.java +++ b/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 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; diff --git a/Patchwork/src/main/java/me/totalfreedom/base/Registration.java b/Patchwork/src/main/java/fns/patchwork/base/Registration.java similarity index 88% rename from Patchwork/src/main/java/me/totalfreedom/base/Registration.java rename to Patchwork/src/main/java/fns/patchwork/base/Registration.java index db58a4f..c5aeee8 100644 --- a/Patchwork/src/main/java/me/totalfreedom/base/Registration.java +++ b/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 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. diff --git a/Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java b/Patchwork/src/main/java/fns/patchwork/base/Shortcuts.java similarity index 88% rename from Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java rename to Patchwork/src/main/java/fns/patchwork/base/Shortcuts.java index 0cb80e0..2e57e68 100644 --- a/Patchwork/src/main/java/me/totalfreedom/base/Shortcuts.java +++ b/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 me.totalfreedom.user.User; +import fns.patchwork.user.User; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; diff --git a/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java b/Patchwork/src/main/java/fns/patchwork/command/BukkitDelegate.java similarity index 97% rename from Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java rename to Patchwork/src/main/java/fns/patchwork/command/BukkitDelegate.java index 6ac04ff..45b4965 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/BukkitDelegate.java +++ b/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; diff --git a/Patchwork/src/main/java/me/totalfreedom/command/CommandHandler.java b/Patchwork/src/main/java/fns/patchwork/command/CommandHandler.java similarity index 97% rename from Patchwork/src/main/java/me/totalfreedom/command/CommandHandler.java rename to Patchwork/src/main/java/fns/patchwork/command/CommandHandler.java index cfcdd90..0851811 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/CommandHandler.java +++ b/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; diff --git a/Patchwork/src/main/java/me/totalfreedom/command/Commander.java b/Patchwork/src/main/java/fns/patchwork/command/Commander.java similarity index 95% rename from Patchwork/src/main/java/me/totalfreedom/command/Commander.java rename to Patchwork/src/main/java/fns/patchwork/command/Commander.java index 2830a84..07b893c 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/Commander.java +++ b/Patchwork/src/main/java/fns/patchwork/command/Commander.java @@ -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 diff --git a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Base.java b/Patchwork/src/main/java/fns/patchwork/command/annotation/Base.java similarity index 88% rename from Patchwork/src/main/java/me/totalfreedom/command/annotation/Base.java rename to Patchwork/src/main/java/fns/patchwork/command/annotation/Base.java index c230186..765a04a 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Base.java +++ b/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; diff --git a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Completion.java b/Patchwork/src/main/java/fns/patchwork/command/annotation/Completion.java similarity index 95% rename from Patchwork/src/main/java/me/totalfreedom/command/annotation/Completion.java rename to Patchwork/src/main/java/fns/patchwork/command/annotation/Completion.java index 1613184..b52a08a 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Completion.java +++ b/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; diff --git a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Completions.java b/Patchwork/src/main/java/fns/patchwork/command/annotation/Completions.java similarity index 92% rename from Patchwork/src/main/java/me/totalfreedom/command/annotation/Completions.java rename to Patchwork/src/main/java/fns/patchwork/command/annotation/Completions.java index cdcfb15..aa06d6f 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Completions.java +++ b/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; diff --git a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Info.java b/Patchwork/src/main/java/fns/patchwork/command/annotation/Info.java similarity index 96% rename from Patchwork/src/main/java/me/totalfreedom/command/annotation/Info.java rename to Patchwork/src/main/java/fns/patchwork/command/annotation/Info.java index 5ab0bbc..a6ba2a9 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Info.java +++ b/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; diff --git a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Permissive.java b/Patchwork/src/main/java/fns/patchwork/command/annotation/Permissive.java similarity index 95% rename from Patchwork/src/main/java/me/totalfreedom/command/annotation/Permissive.java rename to Patchwork/src/main/java/fns/patchwork/command/annotation/Permissive.java index 90c5739..60f1218 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Permissive.java +++ b/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; diff --git a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Subcommand.java b/Patchwork/src/main/java/fns/patchwork/command/annotation/Subcommand.java similarity index 94% rename from Patchwork/src/main/java/me/totalfreedom/command/annotation/Subcommand.java rename to Patchwork/src/main/java/fns/patchwork/command/annotation/Subcommand.java index 679fdb1..9315599 100644 --- a/Patchwork/src/main/java/me/totalfreedom/command/annotation/Subcommand.java +++ b/Patchwork/src/main/java/fns/patchwork/command/annotation/Subcommand.java @@ -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; diff --git a/Patchwork/src/main/java/me/totalfreedom/config/Configuration.java b/Patchwork/src/main/java/fns/patchwork/config/Configuration.java similarity index 96% rename from Patchwork/src/main/java/me/totalfreedom/config/Configuration.java rename to Patchwork/src/main/java/fns/patchwork/config/Configuration.java index 728ead2..10a630a 100644 --- a/Patchwork/src/main/java/me/totalfreedom/config/Configuration.java +++ b/Patchwork/src/main/java/fns/patchwork/config/Configuration.java @@ -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; diff --git a/Patchwork/src/main/java/me/totalfreedom/config/YamlWrapper.java b/Patchwork/src/main/java/fns/patchwork/config/YamlWrapper.java similarity index 53% rename from Patchwork/src/main/java/me/totalfreedom/config/YamlWrapper.java rename to Patchwork/src/main/java/fns/patchwork/config/YamlWrapper.java index eefd27c..d38933a 100644 --- a/Patchwork/src/main/java/me/totalfreedom/config/YamlWrapper.java +++ b/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 { diff --git a/Patchwork/src/main/java/me/totalfreedom/data/ConfigRegistry.java b/Patchwork/src/main/java/fns/patchwork/data/ConfigRegistry.java similarity index 93% rename from Patchwork/src/main/java/me/totalfreedom/data/ConfigRegistry.java rename to Patchwork/src/main/java/fns/patchwork/data/ConfigRegistry.java index 7db90f2..f45e4f0 100644 --- a/Patchwork/src/main/java/me/totalfreedom/data/ConfigRegistry.java +++ b/Patchwork/src/main/java/fns/patchwork/data/ConfigRegistry.java @@ -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; diff --git a/Patchwork/src/main/java/me/totalfreedom/data/EventRegistry.java b/Patchwork/src/main/java/fns/patchwork/data/EventRegistry.java similarity index 91% rename from Patchwork/src/main/java/me/totalfreedom/data/EventRegistry.java rename to Patchwork/src/main/java/fns/patchwork/data/EventRegistry.java index c5fb292..2130b46 100644 --- a/Patchwork/src/main/java/me/totalfreedom/data/EventRegistry.java +++ b/Patchwork/src/main/java/fns/patchwork/data/EventRegistry.java @@ -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; diff --git a/Patchwork/src/main/java/me/totalfreedom/data/GroupRegistry.java b/Patchwork/src/main/java/fns/patchwork/data/GroupRegistry.java similarity index 95% rename from Patchwork/src/main/java/me/totalfreedom/data/GroupRegistry.java rename to Patchwork/src/main/java/fns/patchwork/data/GroupRegistry.java index aec9b76..66c6456 100644 --- a/Patchwork/src/main/java/me/totalfreedom/data/GroupRegistry.java +++ b/Patchwork/src/main/java/fns/patchwork/data/GroupRegistry.java @@ -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. diff --git a/Patchwork/src/main/java/me/totalfreedom/data/ModuleRegistry.java b/Patchwork/src/main/java/fns/patchwork/data/ModuleRegistry.java similarity index 94% rename from Patchwork/src/main/java/me/totalfreedom/data/ModuleRegistry.java rename to Patchwork/src/main/java/fns/patchwork/data/ModuleRegistry.java index cdc26c0..ecd4c43 100644 --- a/Patchwork/src/main/java/me/totalfreedom/data/ModuleRegistry.java +++ b/Patchwork/src/main/java/fns/patchwork/data/ModuleRegistry.java @@ -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. diff --git a/Patchwork/src/main/java/me/totalfreedom/data/ServiceTaskRegistry.java b/Patchwork/src/main/java/fns/patchwork/data/ServiceTaskRegistry.java similarity index 97% rename from Patchwork/src/main/java/me/totalfreedom/data/ServiceTaskRegistry.java rename to Patchwork/src/main/java/fns/patchwork/data/ServiceTaskRegistry.java index e734b8e..fa7eaaf 100644 --- a/Patchwork/src/main/java/me/totalfreedom/data/ServiceTaskRegistry.java +++ b/Patchwork/src/main/java/fns/patchwork/data/ServiceTaskRegistry.java @@ -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. diff --git a/Patchwork/src/main/java/me/totalfreedom/data/UserRegistry.java b/Patchwork/src/main/java/fns/patchwork/data/UserRegistry.java similarity index 96% rename from Patchwork/src/main/java/me/totalfreedom/data/UserRegistry.java rename to Patchwork/src/main/java/fns/patchwork/data/UserRegistry.java index 64bf824..19b5ec3 100644 --- a/Patchwork/src/main/java/me/totalfreedom/data/UserRegistry.java +++ b/Patchwork/src/main/java/fns/patchwork/data/UserRegistry.java @@ -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. diff --git a/Patchwork/src/main/java/me/totalfreedom/display/AbstractMenu.java b/Patchwork/src/main/java/fns/patchwork/display/AbstractMenu.java similarity index 99% rename from Patchwork/src/main/java/me/totalfreedom/display/AbstractMenu.java rename to Patchwork/src/main/java/fns/patchwork/display/AbstractMenu.java index 9baa4df..7377e38 100644 --- a/Patchwork/src/main/java/me/totalfreedom/display/AbstractMenu.java +++ b/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. */ diff --git a/Patchwork/src/main/java/me/totalfreedom/display/BossBarDisplay.java b/Patchwork/src/main/java/fns/patchwork/display/BossBarDisplay.java similarity index 99% rename from Patchwork/src/main/java/me/totalfreedom/display/BossBarDisplay.java rename to Patchwork/src/main/java/fns/patchwork/display/BossBarDisplay.java index 2239b4b..2720f12 100644 --- a/Patchwork/src/main/java/me/totalfreedom/display/BossBarDisplay.java +++ b/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. diff --git a/Patchwork/src/main/java/me/totalfreedom/display/BossBarTimer.java b/Patchwork/src/main/java/fns/patchwork/display/BossBarTimer.java similarity index 93% rename from Patchwork/src/main/java/me/totalfreedom/display/BossBarTimer.java rename to Patchwork/src/main/java/fns/patchwork/display/BossBarTimer.java index dfa3eb1..dd66c5d 100644 --- a/Patchwork/src/main/java/me/totalfreedom/display/BossBarTimer.java +++ b/Patchwork/src/main/java/fns/patchwork/display/BossBarTimer.java @@ -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 { diff --git a/Patchwork/src/main/java/me/totalfreedom/display/ClickAction.java b/Patchwork/src/main/java/fns/patchwork/display/ClickAction.java similarity index 92% rename from Patchwork/src/main/java/me/totalfreedom/display/ClickAction.java rename to Patchwork/src/main/java/fns/patchwork/display/ClickAction.java index 70aa1ad..afdd8a7 100644 --- a/Patchwork/src/main/java/me/totalfreedom/display/ClickAction.java +++ b/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; diff --git a/Patchwork/src/main/java/me/totalfreedom/display/Displayable.java b/Patchwork/src/main/java/fns/patchwork/display/Displayable.java similarity index 99% rename from Patchwork/src/main/java/me/totalfreedom/display/Displayable.java rename to Patchwork/src/main/java/fns/patchwork/display/Displayable.java index 56a5fff..f790422 100644 --- a/Patchwork/src/main/java/me/totalfreedom/display/Displayable.java +++ b/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. diff --git a/Patchwork/src/main/java/me/totalfreedom/display/DisplayableView.java b/Patchwork/src/main/java/fns/patchwork/display/DisplayableView.java similarity index 96% rename from Patchwork/src/main/java/me/totalfreedom/display/DisplayableView.java rename to Patchwork/src/main/java/fns/patchwork/display/DisplayableView.java index 7c4e2ec..7f27bd4 100644 --- a/Patchwork/src/main/java/me/totalfreedom/display/DisplayableView.java +++ b/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; diff --git a/Patchwork/src/main/java/me/totalfreedom/display/TitleDisplay.java b/Patchwork/src/main/java/fns/patchwork/display/TitleDisplay.java similarity index 99% rename from Patchwork/src/main/java/me/totalfreedom/display/TitleDisplay.java rename to Patchwork/src/main/java/fns/patchwork/display/TitleDisplay.java index b6bf7cc..a225c66 100644 --- a/Patchwork/src/main/java/me/totalfreedom/display/TitleDisplay.java +++ b/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}. */ diff --git a/Patchwork/src/main/java/me/totalfreedom/display/adminchat/ACFormatBuilder.java b/Patchwork/src/main/java/fns/patchwork/display/adminchat/ACFormatBuilder.java similarity index 98% rename from Patchwork/src/main/java/me/totalfreedom/display/adminchat/ACFormatBuilder.java rename to Patchwork/src/main/java/fns/patchwork/display/adminchat/ACFormatBuilder.java index b676936..44730ad 100644 --- a/Patchwork/src/main/java/me/totalfreedom/display/adminchat/ACFormatBuilder.java +++ b/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; diff --git a/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatDisplay.java b/Patchwork/src/main/java/fns/patchwork/display/adminchat/AdminChatDisplay.java similarity index 95% rename from Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatDisplay.java rename to Patchwork/src/main/java/fns/patchwork/display/adminchat/AdminChatDisplay.java index 1c27cff..8e70100 100644 --- a/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatDisplay.java +++ b/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 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"; diff --git a/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatFormat.java b/Patchwork/src/main/java/fns/patchwork/display/adminchat/AdminChatFormat.java similarity index 98% rename from Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatFormat.java rename to Patchwork/src/main/java/fns/patchwork/display/adminchat/AdminChatFormat.java index 5580c9e..03cf434 100644 --- a/Patchwork/src/main/java/me/totalfreedom/display/adminchat/AdminChatFormat.java +++ b/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; diff --git a/Patchwork/src/main/java/me/totalfreedom/economy/CompletedTransaction.java b/Patchwork/src/main/java/fns/patchwork/economy/CompletedTransaction.java similarity index 90% rename from Patchwork/src/main/java/me/totalfreedom/economy/CompletedTransaction.java rename to Patchwork/src/main/java/fns/patchwork/economy/CompletedTransaction.java index 50af8c9..63d72b2 100644 --- a/Patchwork/src/main/java/me/totalfreedom/economy/CompletedTransaction.java +++ b/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 diff --git a/Patchwork/src/main/java/me/totalfreedom/economy/EconomicEntity.java b/Patchwork/src/main/java/fns/patchwork/economy/EconomicEntity.java similarity index 94% rename from Patchwork/src/main/java/me/totalfreedom/economy/EconomicEntity.java rename to Patchwork/src/main/java/fns/patchwork/economy/EconomicEntity.java index f2b2c69..887e5a3 100644 --- a/Patchwork/src/main/java/me/totalfreedom/economy/EconomicEntity.java +++ b/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} diff --git a/Patchwork/src/main/java/me/totalfreedom/economy/EconomicEntityData.java b/Patchwork/src/main/java/fns/patchwork/economy/EconomicEntityData.java similarity index 96% rename from Patchwork/src/main/java/me/totalfreedom/economy/EconomicEntityData.java rename to Patchwork/src/main/java/fns/patchwork/economy/EconomicEntityData.java index ac3d372..80065f0 100644 --- a/Patchwork/src/main/java/me/totalfreedom/economy/EconomicEntityData.java +++ b/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} diff --git a/Patchwork/src/main/java/me/totalfreedom/economy/MutableTransaction.java b/Patchwork/src/main/java/fns/patchwork/economy/MutableTransaction.java similarity index 96% rename from Patchwork/src/main/java/me/totalfreedom/economy/MutableTransaction.java rename to Patchwork/src/main/java/fns/patchwork/economy/MutableTransaction.java index 89a14a4..8ea0540 100644 --- a/Patchwork/src/main/java/me/totalfreedom/economy/MutableTransaction.java +++ b/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. diff --git a/Patchwork/src/main/java/me/totalfreedom/economy/Transaction.java b/Patchwork/src/main/java/fns/patchwork/economy/Transaction.java similarity index 92% rename from Patchwork/src/main/java/me/totalfreedom/economy/Transaction.java rename to Patchwork/src/main/java/fns/patchwork/economy/Transaction.java index 5968265..7780f07 100644 --- a/Patchwork/src/main/java/me/totalfreedom/economy/Transaction.java +++ b/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. diff --git a/Patchwork/src/main/java/me/totalfreedom/economy/TransactionLogger.java b/Patchwork/src/main/java/fns/patchwork/economy/TransactionLogger.java similarity index 91% rename from Patchwork/src/main/java/me/totalfreedom/economy/TransactionLogger.java rename to Patchwork/src/main/java/fns/patchwork/economy/TransactionLogger.java index 1d57fdd..000ca77 100644 --- a/Patchwork/src/main/java/me/totalfreedom/economy/TransactionLogger.java +++ b/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 diff --git a/Patchwork/src/main/java/me/totalfreedom/economy/TransactionResult.java b/Patchwork/src/main/java/fns/patchwork/economy/TransactionResult.java similarity index 87% rename from Patchwork/src/main/java/me/totalfreedom/economy/TransactionResult.java rename to Patchwork/src/main/java/fns/patchwork/economy/TransactionResult.java index 9859a99..74cb16b 100644 --- a/Patchwork/src/main/java/me/totalfreedom/economy/TransactionResult.java +++ b/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; diff --git a/Patchwork/src/main/java/me/totalfreedom/economy/Transactor.java b/Patchwork/src/main/java/fns/patchwork/economy/Transactor.java similarity index 90% rename from Patchwork/src/main/java/me/totalfreedom/economy/Transactor.java rename to Patchwork/src/main/java/fns/patchwork/economy/Transactor.java index 60e1b3c..5bbf78a 100644 --- a/Patchwork/src/main/java/me/totalfreedom/economy/Transactor.java +++ b/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. diff --git a/Patchwork/src/main/java/me/totalfreedom/event/Callback.java b/Patchwork/src/main/java/fns/patchwork/event/Callback.java similarity index 75% rename from Patchwork/src/main/java/me/totalfreedom/event/Callback.java rename to Patchwork/src/main/java/fns/patchwork/event/Callback.java index 585d144..bc8b280 100644 --- a/Patchwork/src/main/java/me/totalfreedom/event/Callback.java +++ b/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 diff --git a/Patchwork/src/main/java/me/totalfreedom/event/EventBus.java b/Patchwork/src/main/java/fns/patchwork/event/EventBus.java similarity index 93% rename from Patchwork/src/main/java/me/totalfreedom/event/EventBus.java rename to Patchwork/src/main/java/fns/patchwork/event/EventBus.java index e012d6f..1a08182 100644 --- a/Patchwork/src/main/java/me/totalfreedom/event/EventBus.java +++ b/Patchwork/src/main/java/fns/patchwork/event/EventBus.java @@ -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; diff --git a/Patchwork/src/main/java/me/totalfreedom/event/EventSubscription.java b/Patchwork/src/main/java/fns/patchwork/event/EventSubscription.java similarity index 88% rename from Patchwork/src/main/java/me/totalfreedom/event/EventSubscription.java rename to Patchwork/src/main/java/fns/patchwork/event/EventSubscription.java index ac7bad1..902c250 100644 --- a/Patchwork/src/main/java/me/totalfreedom/event/EventSubscription.java +++ b/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 event, Callback callback) { diff --git a/Patchwork/src/main/java/me/totalfreedom/event/FEvent.java b/Patchwork/src/main/java/fns/patchwork/event/FEvent.java similarity index 95% rename from Patchwork/src/main/java/me/totalfreedom/event/FEvent.java rename to Patchwork/src/main/java/fns/patchwork/event/FEvent.java index 9aa68d7..5f74134 100644 --- a/Patchwork/src/main/java/me/totalfreedom/event/FEvent.java +++ b/Patchwork/src/main/java/fns/patchwork/event/FEvent.java @@ -1,4 +1,4 @@ -package me.totalfreedom.event; +package fns.patchwork.event; public abstract class FEvent { diff --git a/Patchwork/src/main/java/me/totalfreedom/event/SubscriptionBox.java b/Patchwork/src/main/java/fns/patchwork/event/SubscriptionBox.java similarity index 96% rename from Patchwork/src/main/java/me/totalfreedom/event/SubscriptionBox.java rename to Patchwork/src/main/java/fns/patchwork/event/SubscriptionBox.java index c93a230..d990273 100644 --- a/Patchwork/src/main/java/me/totalfreedom/event/SubscriptionBox.java +++ b/Patchwork/src/main/java/fns/patchwork/event/SubscriptionBox.java @@ -1,4 +1,4 @@ -package me.totalfreedom.event; +package fns.patchwork.event; import java.util.ArrayList; import java.util.List; diff --git a/Patchwork/src/main/java/me/totalfreedom/logging/BlockInteraction.java b/Patchwork/src/main/java/fns/patchwork/logging/BlockInteraction.java similarity index 97% rename from Patchwork/src/main/java/me/totalfreedom/logging/BlockInteraction.java rename to Patchwork/src/main/java/fns/patchwork/logging/BlockInteraction.java index ae64341..ef617ca 100644 --- a/Patchwork/src/main/java/me/totalfreedom/logging/BlockInteraction.java +++ b/Patchwork/src/main/java/fns/patchwork/logging/BlockInteraction.java @@ -1,13 +1,12 @@ -package me.totalfreedom.logging; +package fns.patchwork.logging; +import java.time.Instant; +import java.util.UUID; import org.bukkit.Location; import org.bukkit.block.data.BlockData; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import java.time.Instant; -import java.util.UUID; - public final class BlockInteraction implements Interaction { private final Location location; diff --git a/Patchwork/src/main/java/me/totalfreedom/logging/ContainerInteraction.java b/Patchwork/src/main/java/fns/patchwork/logging/ContainerInteraction.java similarity index 98% rename from Patchwork/src/main/java/me/totalfreedom/logging/ContainerInteraction.java rename to Patchwork/src/main/java/fns/patchwork/logging/ContainerInteraction.java index c09efee..a134f1b 100644 --- a/Patchwork/src/main/java/me/totalfreedom/logging/ContainerInteraction.java +++ b/Patchwork/src/main/java/fns/patchwork/logging/ContainerInteraction.java @@ -1,16 +1,15 @@ -package me.totalfreedom.logging; - -import org.bukkit.Location; -import org.bukkit.block.Container; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; +package fns.patchwork.logging; import java.time.Instant; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.UUID; +import org.bukkit.Location; +import org.bukkit.block.Container; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; +import org.jetbrains.annotations.NotNull; public final class ContainerInteraction implements Interaction> { diff --git a/Patchwork/src/main/java/me/totalfreedom/logging/Interaction.java b/Patchwork/src/main/java/fns/patchwork/logging/Interaction.java similarity index 94% rename from Patchwork/src/main/java/me/totalfreedom/logging/Interaction.java rename to Patchwork/src/main/java/fns/patchwork/logging/Interaction.java index 75aeb63..bb0bed5 100644 --- a/Patchwork/src/main/java/me/totalfreedom/logging/Interaction.java +++ b/Patchwork/src/main/java/fns/patchwork/logging/Interaction.java @@ -1,11 +1,10 @@ -package me.totalfreedom.logging; +package fns.patchwork.logging; import com.google.errorprone.annotations.Immutable; -import org.bukkit.Location; -import org.jetbrains.annotations.NotNull; - import java.time.Instant; import java.util.UUID; +import org.bukkit.Location; +import org.jetbrains.annotations.NotNull; @Immutable public interface Interaction diff --git a/Patchwork/src/main/java/me/totalfreedom/logging/InteractionFormatter.java b/Patchwork/src/main/java/fns/patchwork/logging/InteractionFormatter.java similarity index 99% rename from Patchwork/src/main/java/me/totalfreedom/logging/InteractionFormatter.java rename to Patchwork/src/main/java/fns/patchwork/logging/InteractionFormatter.java index 19a5f01..ec660b3 100644 --- a/Patchwork/src/main/java/me/totalfreedom/logging/InteractionFormatter.java +++ b/Patchwork/src/main/java/fns/patchwork/logging/InteractionFormatter.java @@ -1,12 +1,11 @@ -package me.totalfreedom.logging; +package fns.patchwork.logging; +import java.time.Instant; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; -import java.time.Instant; - public final class InteractionFormatter { public String formatInteraction(final Interaction interaction) diff --git a/Patchwork/src/main/java/me/totalfreedom/particle/NoteColorUtil.java b/Patchwork/src/main/java/fns/patchwork/particle/NoteColorUtil.java similarity index 98% rename from Patchwork/src/main/java/me/totalfreedom/particle/NoteColorUtil.java rename to Patchwork/src/main/java/fns/patchwork/particle/NoteColorUtil.java index a415118..691eccb 100644 --- a/Patchwork/src/main/java/me/totalfreedom/particle/NoteColorUtil.java +++ b/Patchwork/src/main/java/fns/patchwork/particle/NoteColorUtil.java @@ -1,4 +1,4 @@ -package me.totalfreedom.particle; +package fns.patchwork.particle; import org.bukkit.Particle; import org.bukkit.World; diff --git a/Patchwork/src/main/java/me/totalfreedom/particle/Trail.java b/Patchwork/src/main/java/fns/patchwork/particle/Trail.java similarity index 97% rename from Patchwork/src/main/java/me/totalfreedom/particle/Trail.java rename to Patchwork/src/main/java/fns/patchwork/particle/Trail.java index f9f934a..9ffb2c5 100644 --- a/Patchwork/src/main/java/me/totalfreedom/particle/Trail.java +++ b/Patchwork/src/main/java/fns/patchwork/particle/Trail.java @@ -1,16 +1,15 @@ -package me.totalfreedom.particle; +package fns.patchwork.particle; -import me.totalfreedom.api.Interpolator; -import me.totalfreedom.utils.InterpolationUtils; +import fns.patchwork.api.Interpolator; +import fns.patchwork.utils.InterpolationUtils; +import java.util.Set; +import java.util.UUID; import org.bukkit.Color; import org.bukkit.OfflinePlayer; import org.bukkit.Particle; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Set; -import java.util.UUID; - /** * Represents a Trail instance for a specific player. */ diff --git a/Patchwork/src/main/java/me/totalfreedom/particle/TrailType.java b/Patchwork/src/main/java/fns/patchwork/particle/TrailType.java similarity index 97% rename from Patchwork/src/main/java/me/totalfreedom/particle/TrailType.java rename to Patchwork/src/main/java/fns/patchwork/particle/TrailType.java index e7afbe2..f87269c 100644 --- a/Patchwork/src/main/java/me/totalfreedom/particle/TrailType.java +++ b/Patchwork/src/main/java/fns/patchwork/particle/TrailType.java @@ -1,4 +1,4 @@ -package me.totalfreedom.particle; +package fns.patchwork.particle; import org.bukkit.Particle; diff --git a/Patchwork/src/main/java/me/totalfreedom/provider/ContextProvider.java b/Patchwork/src/main/java/fns/patchwork/provider/ContextProvider.java similarity index 65% rename from Patchwork/src/main/java/me/totalfreedom/provider/ContextProvider.java rename to Patchwork/src/main/java/fns/patchwork/provider/ContextProvider.java index aaf5d2d..a33a7d9 100644 --- a/Patchwork/src/main/java/me/totalfreedom/provider/ContextProvider.java +++ b/Patchwork/src/main/java/fns/patchwork/provider/ContextProvider.java @@ -1,8 +1,11 @@ -package me.totalfreedom.provider; +package fns.patchwork.provider; -import me.totalfreedom.api.Context; -import me.totalfreedom.command.BukkitDelegate; -import me.totalfreedom.command.annotation.Subcommand; +import fns.patchwork.command.BukkitDelegate; +import fns.patchwork.command.annotation.Subcommand; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.stream.Stream; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -13,9 +16,6 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Objects; -import java.util.stream.Stream; - /** * This class is used to provide context to subcommand methods. This class is used by the BukkitDelegate to parse * arguments for subcommands. The following types are supported: @@ -34,6 +34,7 @@ import java.util.stream.Stream; * * All of these types can be parsed from a String input. If the String cannot be parsed into any of * these types, then null will be returned. + * * @see #fromString(String, Class) */ public class ContextProvider @@ -41,15 +42,15 @@ public class ContextProvider public T fromString(final String string, final Class clazz) { return Stream.of(toBoolean(string, clazz), - toDouble(string, clazz), - toInt(string, clazz), - toLong(string, clazz), - toFloat(string, clazz), - toMaterial(string, clazz), - toPlayer(string, clazz), - toWorld(string, clazz), - toLocation(string, clazz), - toComponent(string, clazz)) + toDouble(string, clazz), + toInt(string, clazz), + toLong(string, clazz), + toFloat(string, clazz), + toMaterial(string, clazz), + toPlayer(string, clazz), + toWorld(string, clazz), + toLocation(string, clazz), + toComponent(string, clazz)) .filter(Objects::nonNull) .findFirst() .map(clazz::cast) @@ -58,24 +59,29 @@ public class ContextProvider private @Nullable Boolean toBoolean(final String string, final Class clazz) { - if (clazz != Boolean.class) return null; + if (clazz != Boolean.class) + return null; // Previously we used Boolean#parseBoolean, but that will always return a value and does not throw // an exception. This means that if the string is not "true" or "false", it will return false. - if (string.equalsIgnoreCase("true")) return true; - if (string.equalsIgnoreCase("false")) return false; + if (string.equalsIgnoreCase("true")) + return true; + if (string.equalsIgnoreCase("false")) + return false; return null; } private @Nullable Double toDouble(final String string, final Class clazz) { - if (clazz != Double.class) return null; + if (clazz != Double.class) + return null; try { return Double.parseDouble(string); - } catch (NumberFormatException ignored) + } + catch (NumberFormatException ignored) { return null; } @@ -83,12 +89,14 @@ public class ContextProvider private @Nullable Integer toInt(final String string, final Class clazz) { - if (clazz != Integer.class) return null; + if (clazz != Integer.class) + return null; try { return Integer.parseInt(string); - } catch (NumberFormatException ignored) + } + catch (NumberFormatException ignored) { return null; } @@ -96,12 +104,14 @@ public class ContextProvider private @Nullable Long toLong(final String string, final Class clazz) { - if (clazz != Long.class) return null; + if (clazz != Long.class) + return null; try { return Long.parseLong(string); - } catch (NumberFormatException ignored) + } + catch (NumberFormatException ignored) { return null; } @@ -109,12 +119,14 @@ public class ContextProvider private @Nullable Float toFloat(final String string, final Class clazz) { - if (clazz != Float.class) return null; + if (clazz != Float.class) + return null; try { return Float.parseFloat(string); - } catch (NumberFormatException ignored) + } + catch (NumberFormatException ignored) { return null; } @@ -122,19 +134,22 @@ public class ContextProvider private @Nullable Material toMaterial(final String string, final Class clazz) { - if (clazz != Material.class) return null; + if (clazz != Material.class) + return null; return Material.matchMaterial(string); } private @Nullable Player toPlayer(final String string, final Class clazz) { - if (clazz != Player.class) return null; + if (clazz != Player.class) + return null; return Bukkit.getPlayer(string); } private @Nullable World toWorld(final String string, final Class clazz) { - if (clazz != World.class) return null; + if (clazz != World.class) + return null; return Bukkit.getWorld(string); } @@ -145,30 +160,46 @@ public class ContextProvider * * @param string The string to parse * @return A location object if xyz is valid - * @see BukkitDelegate#processSubCommands(String[], CommandSender, ContextProvider, Subcommand) + * @see BukkitDelegate#processSubCommands(String[], CommandSender, ContextProvider, Subcommand) */ private @Nullable Location toLocation(final String string, final Class clazz) { - if (clazz != Location.class) return null; + if (clazz != Location.class) + return null; final String[] split = string.split(" "); - if (split.length != 4 || toWorld(split[0], World.class) == null) return null; + if (split.length != 4 || toWorld(split[0], World.class) == null) + return null; - try { + try + { final double x = Double.parseDouble(split[1]); final double y = Double.parseDouble(split[2]); final double z = Double.parseDouble(split[3]); return new Location(toWorld(split[0], World.class), x, y, z); - } catch (NumberFormatException ex) { + } + catch (NumberFormatException ex) + { return null; } } private @Nullable Component toComponent(final String string, final Class clazz) { - if (clazz != Component.class) return null; + if (clazz != Component.class) + return null; return Component.text(string); } + + public @NotNull List<@Nullable T> getList(final List resolvable, final Class clazz) + { + final List resolved = new ArrayList<>(); + for (final String entry : resolvable) + { + resolved.add(this.fromString(entry, clazz)); + } + return resolved; + } } diff --git a/Patchwork/src/main/java/me/totalfreedom/provider/EventProvider.java b/Patchwork/src/main/java/fns/patchwork/provider/EventProvider.java similarity index 56% rename from Patchwork/src/main/java/me/totalfreedom/provider/EventProvider.java rename to Patchwork/src/main/java/fns/patchwork/provider/EventProvider.java index 242fc10..a48e0f7 100644 --- a/Patchwork/src/main/java/me/totalfreedom/provider/EventProvider.java +++ b/Patchwork/src/main/java/fns/patchwork/provider/EventProvider.java @@ -1,6 +1,6 @@ -package me.totalfreedom.provider; +package fns.patchwork.provider; -import me.totalfreedom.event.FEvent; +import fns.patchwork.event.FEvent; @FunctionalInterface public interface EventProvider diff --git a/Patchwork/src/main/java/me/totalfreedom/provider/ModuleProvider.java b/Patchwork/src/main/java/fns/patchwork/provider/ModuleProvider.java similarity index 80% rename from Patchwork/src/main/java/me/totalfreedom/provider/ModuleProvider.java rename to Patchwork/src/main/java/fns/patchwork/provider/ModuleProvider.java index 65c9bd1..2b46744 100644 --- a/Patchwork/src/main/java/me/totalfreedom/provider/ModuleProvider.java +++ b/Patchwork/src/main/java/fns/patchwork/provider/ModuleProvider.java @@ -1,4 +1,4 @@ -package me.totalfreedom.provider; +package fns.patchwork.provider; import org.bukkit.plugin.java.JavaPlugin; diff --git a/Patchwork/src/main/java/me/totalfreedom/provider/ServiceProvider.java b/Patchwork/src/main/java/fns/patchwork/provider/ServiceProvider.java similarity index 51% rename from Patchwork/src/main/java/me/totalfreedom/provider/ServiceProvider.java rename to Patchwork/src/main/java/fns/patchwork/provider/ServiceProvider.java index e9a3387..f58c4c9 100644 --- a/Patchwork/src/main/java/me/totalfreedom/provider/ServiceProvider.java +++ b/Patchwork/src/main/java/fns/patchwork/provider/ServiceProvider.java @@ -1,6 +1,6 @@ -package me.totalfreedom.provider; +package fns.patchwork.provider; -import me.totalfreedom.service.Service; +import fns.patchwork.service.Service; public interface ServiceProvider { diff --git a/Patchwork/src/main/java/me/totalfreedom/security/Group.java b/Patchwork/src/main/java/fns/patchwork/security/Group.java similarity index 96% rename from Patchwork/src/main/java/me/totalfreedom/security/Group.java rename to Patchwork/src/main/java/fns/patchwork/security/Group.java index 41b2825..284eb2e 100644 --- a/Patchwork/src/main/java/me/totalfreedom/security/Group.java +++ b/Patchwork/src/main/java/fns/patchwork/security/Group.java @@ -1,4 +1,4 @@ -package me.totalfreedom.security; +package fns.patchwork.security; import net.kyori.adventure.text.Component; diff --git a/Patchwork/src/main/java/me/totalfreedom/security/Groups.java b/Patchwork/src/main/java/fns/patchwork/security/Groups.java similarity index 97% rename from Patchwork/src/main/java/me/totalfreedom/security/Groups.java rename to Patchwork/src/main/java/fns/patchwork/security/Groups.java index 105a54a..e4ee003 100644 --- a/Patchwork/src/main/java/me/totalfreedom/security/Groups.java +++ b/Patchwork/src/main/java/fns/patchwork/security/Groups.java @@ -1,4 +1,4 @@ -package me.totalfreedom.security; +package fns.patchwork.security; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Patchwork/src/main/java/me/totalfreedom/security/Node.java b/Patchwork/src/main/java/fns/patchwork/security/Node.java similarity index 90% rename from Patchwork/src/main/java/me/totalfreedom/security/Node.java rename to Patchwork/src/main/java/fns/patchwork/security/Node.java index 38fe451..cc1b5b2 100644 --- a/Patchwork/src/main/java/me/totalfreedom/security/Node.java +++ b/Patchwork/src/main/java/fns/patchwork/security/Node.java @@ -1,8 +1,7 @@ -package me.totalfreedom.security; - -import org.bukkit.permissions.Permission; +package fns.patchwork.security; import javax.annotation.concurrent.Immutable; +import org.bukkit.permissions.Permission; @Immutable public interface Node diff --git a/Patchwork/src/main/java/me/totalfreedom/security/NodeBuilder.java b/Patchwork/src/main/java/fns/patchwork/security/NodeBuilder.java similarity index 85% rename from Patchwork/src/main/java/me/totalfreedom/security/NodeBuilder.java rename to Patchwork/src/main/java/fns/patchwork/security/NodeBuilder.java index 05c3ee9..34ded3d 100644 --- a/Patchwork/src/main/java/me/totalfreedom/security/NodeBuilder.java +++ b/Patchwork/src/main/java/fns/patchwork/security/NodeBuilder.java @@ -1,4 +1,4 @@ -package me.totalfreedom.security; +package fns.patchwork.security; public interface NodeBuilder { diff --git a/Patchwork/src/main/java/me/totalfreedom/security/NodeType.java b/Patchwork/src/main/java/fns/patchwork/security/NodeType.java similarity index 73% rename from Patchwork/src/main/java/me/totalfreedom/security/NodeType.java rename to Patchwork/src/main/java/fns/patchwork/security/NodeType.java index 11293a9..e9d5f41 100644 --- a/Patchwork/src/main/java/me/totalfreedom/security/NodeType.java +++ b/Patchwork/src/main/java/fns/patchwork/security/NodeType.java @@ -1,4 +1,4 @@ -package me.totalfreedom.security; +package fns.patchwork.security; public enum NodeType { diff --git a/Patchwork/src/main/java/me/totalfreedom/security/PermissionHolder.java b/Patchwork/src/main/java/fns/patchwork/security/PermissionHolder.java similarity index 88% rename from Patchwork/src/main/java/me/totalfreedom/security/PermissionHolder.java rename to Patchwork/src/main/java/fns/patchwork/security/PermissionHolder.java index 05f7e7c..9e6a96b 100644 --- a/Patchwork/src/main/java/me/totalfreedom/security/PermissionHolder.java +++ b/Patchwork/src/main/java/fns/patchwork/security/PermissionHolder.java @@ -1,9 +1,8 @@ -package me.totalfreedom.security; - -import org.bukkit.permissions.Permissible; +package fns.patchwork.security; import java.util.Set; import java.util.UUID; +import org.bukkit.permissions.Permissible; public interface PermissionHolder extends Permissible { diff --git a/Patchwork/src/main/java/me/totalfreedom/service/FreedomExecutor.java b/Patchwork/src/main/java/fns/patchwork/service/FreedomExecutor.java similarity index 98% rename from Patchwork/src/main/java/me/totalfreedom/service/FreedomExecutor.java rename to Patchwork/src/main/java/fns/patchwork/service/FreedomExecutor.java index 2b52f4e..a67d031 100644 --- a/Patchwork/src/main/java/me/totalfreedom/service/FreedomExecutor.java +++ b/Patchwork/src/main/java/fns/patchwork/service/FreedomExecutor.java @@ -1,11 +1,10 @@ -package me.totalfreedom.service; - -import me.totalfreedom.base.Patchwork; -import org.bukkit.Bukkit; -import org.bukkit.plugin.java.JavaPlugin; +package fns.patchwork.service; +import fns.patchwork.base.Patchwork; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; +import org.bukkit.Bukkit; +import org.bukkit.plugin.java.JavaPlugin; /** * This is a holder class for {@link Executor} objects that are used to delegate runnable tasks to the Bukkit Scheduler. diff --git a/Patchwork/src/main/java/me/totalfreedom/service/Service.java b/Patchwork/src/main/java/fns/patchwork/service/Service.java similarity index 97% rename from Patchwork/src/main/java/me/totalfreedom/service/Service.java rename to Patchwork/src/main/java/fns/patchwork/service/Service.java index 927fb36..5da461a 100644 --- a/Patchwork/src/main/java/me/totalfreedom/service/Service.java +++ b/Patchwork/src/main/java/fns/patchwork/service/Service.java @@ -1,4 +1,4 @@ -package me.totalfreedom.service; +package fns.patchwork.service; /** * Represents a ticking service. Services may be asynchronous or synchronous, however there are some restrictions: diff --git a/Patchwork/src/main/java/me/totalfreedom/service/ServiceSubscription.java b/Patchwork/src/main/java/fns/patchwork/service/ServiceSubscription.java similarity index 99% rename from Patchwork/src/main/java/me/totalfreedom/service/ServiceSubscription.java rename to Patchwork/src/main/java/fns/patchwork/service/ServiceSubscription.java index dd8b543..af5faaf 100644 --- a/Patchwork/src/main/java/me/totalfreedom/service/ServiceSubscription.java +++ b/Patchwork/src/main/java/fns/patchwork/service/ServiceSubscription.java @@ -1,12 +1,11 @@ -package me.totalfreedom.service; +package fns.patchwork.service; +import java.util.concurrent.Executor; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitTask; import org.jetbrains.annotations.NotNull; -import java.util.concurrent.Executor; - /** * Represents a subscription to a {@link Service}. *

diff --git a/Patchwork/src/main/java/me/totalfreedom/service/SubscriptionProvider.java b/Patchwork/src/main/java/fns/patchwork/service/SubscriptionProvider.java similarity index 99% rename from Patchwork/src/main/java/me/totalfreedom/service/SubscriptionProvider.java rename to Patchwork/src/main/java/fns/patchwork/service/SubscriptionProvider.java index 3a3c8ab..989a3cd 100644 --- a/Patchwork/src/main/java/me/totalfreedom/service/SubscriptionProvider.java +++ b/Patchwork/src/main/java/fns/patchwork/service/SubscriptionProvider.java @@ -1,4 +1,4 @@ -package me.totalfreedom.service; +package fns.patchwork.service; import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.Contract; diff --git a/Patchwork/src/main/java/me/totalfreedom/service/Task.java b/Patchwork/src/main/java/fns/patchwork/service/Task.java similarity index 98% rename from Patchwork/src/main/java/me/totalfreedom/service/Task.java rename to Patchwork/src/main/java/fns/patchwork/service/Task.java index 3275705..a03773c 100644 --- a/Patchwork/src/main/java/me/totalfreedom/service/Task.java +++ b/Patchwork/src/main/java/fns/patchwork/service/Task.java @@ -1,9 +1,8 @@ -package me.totalfreedom.service; - -import me.totalfreedom.utils.DurationTools; -import org.bukkit.scheduler.BukkitRunnable; +package fns.patchwork.service; +import fns.patchwork.utils.DurationTools; import java.time.Duration; +import org.bukkit.scheduler.BukkitRunnable; /** * Represents a task that can be run asynchronously or synchronously. diff --git a/Patchwork/src/main/java/me/totalfreedom/service/TaskSubscription.java b/Patchwork/src/main/java/fns/patchwork/service/TaskSubscription.java similarity index 98% rename from Patchwork/src/main/java/me/totalfreedom/service/TaskSubscription.java rename to Patchwork/src/main/java/fns/patchwork/service/TaskSubscription.java index 9e5c3e1..f79c17b 100644 --- a/Patchwork/src/main/java/me/totalfreedom/service/TaskSubscription.java +++ b/Patchwork/src/main/java/fns/patchwork/service/TaskSubscription.java @@ -1,13 +1,12 @@ -package me.totalfreedom.service; +package fns.patchwork.service; -import me.totalfreedom.utils.container.Pair; +import fns.patchwork.utils.container.Pair; +import java.util.concurrent.Executor; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scheduler.BukkitTask; -import java.util.concurrent.Executor; - /** * Represents a subscription to a task. Task subscriptions offer a nice wrapper for managing tasks, which are inevitably * just bukkit runnables with a bit more lenience in terms of instantiation modification and execution. It also offers a diff --git a/Patchwork/src/main/java/me/totalfreedom/shop/Reactable.java b/Patchwork/src/main/java/fns/patchwork/shop/Reactable.java similarity index 82% rename from Patchwork/src/main/java/me/totalfreedom/shop/Reactable.java rename to Patchwork/src/main/java/fns/patchwork/shop/Reactable.java index 86ddec4..36b0d55 100644 --- a/Patchwork/src/main/java/me/totalfreedom/shop/Reactable.java +++ b/Patchwork/src/main/java/fns/patchwork/shop/Reactable.java @@ -1,11 +1,10 @@ -package me.totalfreedom.shop; +package fns.patchwork.shop; -import me.totalfreedom.economy.EconomicEntity; +import fns.patchwork.economy.EconomicEntity; +import java.time.Duration; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.text.Component; -import java.time.Duration; - public interface Reactable { Component getReactionMessage(); diff --git a/Patchwork/src/main/java/me/totalfreedom/shop/Reaction.java b/Patchwork/src/main/java/fns/patchwork/shop/Reaction.java similarity index 97% rename from Patchwork/src/main/java/me/totalfreedom/shop/Reaction.java rename to Patchwork/src/main/java/fns/patchwork/shop/Reaction.java index ad1c761..28f4a27 100644 --- a/Patchwork/src/main/java/me/totalfreedom/shop/Reaction.java +++ b/Patchwork/src/main/java/fns/patchwork/shop/Reaction.java @@ -1,4 +1,4 @@ -package me.totalfreedom.shop; +package fns.patchwork.shop; import java.time.Duration; import net.kyori.adventure.text.Component; diff --git a/Patchwork/src/main/java/me/totalfreedom/shop/ReactionTask.java b/Patchwork/src/main/java/fns/patchwork/shop/ReactionTask.java similarity index 87% rename from Patchwork/src/main/java/me/totalfreedom/shop/ReactionTask.java rename to Patchwork/src/main/java/fns/patchwork/shop/ReactionTask.java index f27f5c6..3af5916 100644 --- a/Patchwork/src/main/java/me/totalfreedom/shop/ReactionTask.java +++ b/Patchwork/src/main/java/fns/patchwork/shop/ReactionTask.java @@ -1,11 +1,11 @@ -package me.totalfreedom.shop; +package fns.patchwork.shop; +import fns.patchwork.base.Patchwork; +import fns.patchwork.display.BossBarDisplay; +import fns.patchwork.display.BossBarTimer; +import fns.patchwork.economy.EconomicEntity; +import fns.patchwork.service.Task; import io.papermc.paper.event.player.AsyncChatEvent; -import me.totalfreedom.base.Patchwork; -import me.totalfreedom.display.BossBarDisplay; -import me.totalfreedom.display.BossBarTimer; -import me.totalfreedom.economy.EconomicEntity; -import me.totalfreedom.service.Task; import net.kyori.adventure.bossbar.BossBar; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/Patchwork/src/main/java/me/totalfreedom/shop/ReactionType.java b/Patchwork/src/main/java/fns/patchwork/shop/ReactionType.java similarity index 67% rename from Patchwork/src/main/java/me/totalfreedom/shop/ReactionType.java rename to Patchwork/src/main/java/fns/patchwork/shop/ReactionType.java index e36a3da..905b1c9 100644 --- a/Patchwork/src/main/java/me/totalfreedom/shop/ReactionType.java +++ b/Patchwork/src/main/java/fns/patchwork/shop/ReactionType.java @@ -1,4 +1,4 @@ -package me.totalfreedom.shop; +package fns.patchwork.shop; public enum ReactionType { diff --git a/Patchwork/src/main/java/me/totalfreedom/sql/SQL.java b/Patchwork/src/main/java/fns/patchwork/sql/SQL.java similarity index 95% rename from Patchwork/src/main/java/me/totalfreedom/sql/SQL.java rename to Patchwork/src/main/java/fns/patchwork/sql/SQL.java index 4e9adc1..fb51021 100644 --- a/Patchwork/src/main/java/me/totalfreedom/sql/SQL.java +++ b/Patchwork/src/main/java/fns/patchwork/sql/SQL.java @@ -1,4 +1,4 @@ -package me.totalfreedom.sql; +package fns.patchwork.sql; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Patchwork/src/main/java/me/totalfreedom/sql/SQLProperties.java b/Patchwork/src/main/java/fns/patchwork/sql/SQLProperties.java similarity index 97% rename from Patchwork/src/main/java/me/totalfreedom/sql/SQLProperties.java rename to Patchwork/src/main/java/fns/patchwork/sql/SQLProperties.java index 5a0566b..c1bc098 100644 --- a/Patchwork/src/main/java/me/totalfreedom/sql/SQLProperties.java +++ b/Patchwork/src/main/java/fns/patchwork/sql/SQLProperties.java @@ -1,4 +1,4 @@ -package me.totalfreedom.sql; +package fns.patchwork.sql; import java.io.File; import java.util.Properties; diff --git a/Patchwork/src/main/java/me/totalfreedom/user/User.java b/Patchwork/src/main/java/fns/patchwork/user/User.java similarity index 72% rename from Patchwork/src/main/java/me/totalfreedom/user/User.java rename to Patchwork/src/main/java/fns/patchwork/user/User.java index f925492..bf25338 100644 --- a/Patchwork/src/main/java/me/totalfreedom/user/User.java +++ b/Patchwork/src/main/java/fns/patchwork/user/User.java @@ -1,8 +1,8 @@ -package me.totalfreedom.user; +package fns.patchwork.user; -import me.totalfreedom.economy.EconomicEntity; -import me.totalfreedom.economy.EconomicEntityData; -import me.totalfreedom.security.PermissionHolder; +import fns.patchwork.economy.EconomicEntity; +import fns.patchwork.economy.EconomicEntityData; +import fns.patchwork.security.PermissionHolder; import net.kyori.adventure.text.Component; public interface User extends PermissionHolder, EconomicEntity diff --git a/Patchwork/src/main/java/me/totalfreedom/user/UserData.java b/Patchwork/src/main/java/fns/patchwork/user/UserData.java similarity index 78% rename from Patchwork/src/main/java/me/totalfreedom/user/UserData.java rename to Patchwork/src/main/java/fns/patchwork/user/UserData.java index a2c4b4a..51afa7e 100644 --- a/Patchwork/src/main/java/me/totalfreedom/user/UserData.java +++ b/Patchwork/src/main/java/fns/patchwork/user/UserData.java @@ -1,13 +1,12 @@ -package me.totalfreedom.user; +package fns.patchwork.user; -import me.totalfreedom.display.adminchat.AdminChatFormat; -import me.totalfreedom.economy.EconomicEntityData; -import me.totalfreedom.security.Group; +import fns.patchwork.display.adminchat.AdminChatFormat; +import fns.patchwork.economy.EconomicEntityData; +import fns.patchwork.security.Group; +import java.util.UUID; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.UUID; - public interface UserData extends EconomicEntityData { @NotNull UUID getUniqueId(); diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/DurationTools.java b/Patchwork/src/main/java/fns/patchwork/utils/DurationTools.java similarity index 95% rename from Patchwork/src/main/java/me/totalfreedom/utils/DurationTools.java rename to Patchwork/src/main/java/fns/patchwork/utils/DurationTools.java index b629f09..84d1531 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/DurationTools.java +++ b/Patchwork/src/main/java/fns/patchwork/utils/DurationTools.java @@ -1,4 +1,4 @@ -package me.totalfreedom.utils; +package fns.patchwork.utils; import java.time.Duration; diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/InterpolationUtils.java b/Patchwork/src/main/java/fns/patchwork/utils/InterpolationUtils.java similarity index 98% rename from Patchwork/src/main/java/me/totalfreedom/utils/InterpolationUtils.java rename to Patchwork/src/main/java/fns/patchwork/utils/InterpolationUtils.java index 7be41c0..f8ca964 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/InterpolationUtils.java +++ b/Patchwork/src/main/java/fns/patchwork/utils/InterpolationUtils.java @@ -1,13 +1,12 @@ -package me.totalfreedom.utils; +package fns.patchwork.utils; -import me.totalfreedom.api.Interpolator; +import fns.patchwork.api.Interpolator; +import java.util.LinkedHashSet; +import java.util.Set; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextColor; import org.bukkit.Color; -import java.util.LinkedHashSet; -import java.util.Set; - public final class InterpolationUtils { private InterpolationUtils() diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/ShapeUtils.java b/Patchwork/src/main/java/fns/patchwork/utils/ShapeUtils.java similarity index 97% rename from Patchwork/src/main/java/me/totalfreedom/utils/ShapeUtils.java rename to Patchwork/src/main/java/fns/patchwork/utils/ShapeUtils.java index e4b533c..08f1f33 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/ShapeUtils.java +++ b/Patchwork/src/main/java/fns/patchwork/utils/ShapeUtils.java @@ -1,11 +1,10 @@ -package me.totalfreedom.utils; - -import org.bukkit.Location; -import org.bukkit.World; +package fns.patchwork.utils; import java.util.LinkedList; import java.util.List; import java.util.function.DoubleUnaryOperator; +import org.bukkit.Location; +import org.bukkit.World; public class ShapeUtils { diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/Tagged.java b/Patchwork/src/main/java/fns/patchwork/utils/Tagged.java similarity index 96% rename from Patchwork/src/main/java/me/totalfreedom/utils/Tagged.java rename to Patchwork/src/main/java/fns/patchwork/utils/Tagged.java index 568233e..b2f0e08 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/Tagged.java +++ b/Patchwork/src/main/java/fns/patchwork/utils/Tagged.java @@ -1,4 +1,4 @@ -package me.totalfreedom.utils; +package fns.patchwork.utils; import java.util.ArrayList; import java.util.List; @@ -80,16 +80,17 @@ public final class Tagged EntityType.BLOCK_DISPLAY, EntityType.ITEM_DISPLAY); - private final List tagged; + private final List taggable; - private Tagged(final T... tagged) + private Tagged(final T... taggable) { - this.tagged = new ArrayList<>(); + this.taggable = new ArrayList<>(); + this.taggable.addAll(List.of(taggable)); } public boolean isTagged(final @NotNull T object) { - for (final T t : this.tagged) + for (final T t : this.taggable) { if (object.equals(t)) return true; diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/container/Identity.java b/Patchwork/src/main/java/fns/patchwork/utils/container/Identity.java similarity index 89% rename from Patchwork/src/main/java/me/totalfreedom/utils/container/Identity.java rename to Patchwork/src/main/java/fns/patchwork/utils/container/Identity.java index 0770962..5a4415f 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/container/Identity.java +++ b/Patchwork/src/main/java/fns/patchwork/utils/container/Identity.java @@ -1,4 +1,4 @@ -package me.totalfreedom.utils.container; +package fns.patchwork.utils.container; import java.util.UUID; diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/container/Pair.java b/Patchwork/src/main/java/fns/patchwork/utils/container/Pair.java similarity index 52% rename from Patchwork/src/main/java/me/totalfreedom/utils/container/Pair.java rename to Patchwork/src/main/java/fns/patchwork/utils/container/Pair.java index 0cf4e76..1c6d3c7 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/container/Pair.java +++ b/Patchwork/src/main/java/fns/patchwork/utils/container/Pair.java @@ -1,4 +1,4 @@ -package me.totalfreedom.utils.container; +package fns.patchwork.utils.container; public record Pair(K key, V value) { diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/container/Trio.java b/Patchwork/src/main/java/fns/patchwork/utils/container/Trio.java similarity index 62% rename from Patchwork/src/main/java/me/totalfreedom/utils/container/Trio.java rename to Patchwork/src/main/java/fns/patchwork/utils/container/Trio.java index e3d61c2..77c95e2 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/container/Trio.java +++ b/Patchwork/src/main/java/fns/patchwork/utils/container/Trio.java @@ -1,4 +1,4 @@ -package me.totalfreedom.utils.container; +package fns.patchwork.utils.container; public record Trio(A primary, B secondary, C tertiary) { diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/container/UnaryPair.java b/Patchwork/src/main/java/fns/patchwork/utils/container/UnaryPair.java similarity index 55% rename from Patchwork/src/main/java/me/totalfreedom/utils/container/UnaryPair.java rename to Patchwork/src/main/java/fns/patchwork/utils/container/UnaryPair.java index 908cccf..6015249 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/container/UnaryPair.java +++ b/Patchwork/src/main/java/fns/patchwork/utils/container/UnaryPair.java @@ -1,4 +1,4 @@ -package me.totalfreedom.utils.container; +package fns.patchwork.utils.container; public record UnaryPair(T first, T second) { diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/container/UnaryTrio.java b/Patchwork/src/main/java/fns/patchwork/utils/container/UnaryTrio.java similarity index 62% rename from Patchwork/src/main/java/me/totalfreedom/utils/container/UnaryTrio.java rename to Patchwork/src/main/java/fns/patchwork/utils/container/UnaryTrio.java index ac455cd..de936f6 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/container/UnaryTrio.java +++ b/Patchwork/src/main/java/fns/patchwork/utils/container/UnaryTrio.java @@ -1,4 +1,4 @@ -package me.totalfreedom.utils.container; +package fns.patchwork.utils.container; public record UnaryTrio(T primary, T secondary, T tertiary) { diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/kyori/FreedomAdventure.java b/Patchwork/src/main/java/fns/patchwork/utils/kyori/FreedomAdventure.java similarity index 97% rename from Patchwork/src/main/java/me/totalfreedom/utils/kyori/FreedomAdventure.java rename to Patchwork/src/main/java/fns/patchwork/utils/kyori/FreedomAdventure.java index 3dc548a..5599756 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/kyori/FreedomAdventure.java +++ b/Patchwork/src/main/java/fns/patchwork/utils/kyori/FreedomAdventure.java @@ -1,9 +1,8 @@ -package me.totalfreedom.utils.kyori; - -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; +package fns.patchwork.utils.kyori; import java.util.function.Supplier; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; /** * This class contains the only reference to plain text component serializer, and allows access to it via wrapper diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/kyori/FreedomMiniMessage.java b/Patchwork/src/main/java/fns/patchwork/utils/kyori/FreedomMiniMessage.java similarity index 90% rename from Patchwork/src/main/java/me/totalfreedom/utils/kyori/FreedomMiniMessage.java rename to Patchwork/src/main/java/fns/patchwork/utils/kyori/FreedomMiniMessage.java index 3db5cdc..1a3b28f 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/kyori/FreedomMiniMessage.java +++ b/Patchwork/src/main/java/fns/patchwork/utils/kyori/FreedomMiniMessage.java @@ -19,7 +19,7 @@ * THE SOFTWARE. */ -package me.totalfreedom.utils.kyori; +package fns.patchwork.utils.kyori; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.TextDecoration; @@ -60,11 +60,11 @@ public class FreedomMiniMessage * @param placeholders Custom placeholders to use when processing the input * @return A processed Component */ - public static Component deserialize(boolean safe, String input, TagResolver... placeholders) + public static Component deserialize(final boolean safe, final String input, final TagResolver... placeholders) { return (safe - ? FreedomMiniMessage.safe - : unsafe).deserialize(input, placeholders); + ? FreedomMiniMessage.safe + : unsafe).deserialize(input, placeholders); } /** @@ -75,10 +75,10 @@ public class FreedomMiniMessage * @param input An already processed component * @return A processed Component */ - public static String serialize(boolean safe, Component input) + public static String serialize(final boolean safe, final Component input) { return (safe - ? FreedomMiniMessage.safe - : unsafe).serialize(input); + ? FreedomMiniMessage.safe + : unsafe).serialize(input); } } diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/kyori/KyoriConstants.java b/Patchwork/src/main/java/fns/patchwork/utils/kyori/KyoriConstants.java similarity index 97% rename from Patchwork/src/main/java/me/totalfreedom/utils/kyori/KyoriConstants.java rename to Patchwork/src/main/java/fns/patchwork/utils/kyori/KyoriConstants.java index aa33c59..4820f35 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/kyori/KyoriConstants.java +++ b/Patchwork/src/main/java/fns/patchwork/utils/kyori/KyoriConstants.java @@ -1,6 +1,6 @@ -package me.totalfreedom.utils.kyori; +package fns.patchwork.utils.kyori; -import me.totalfreedom.base.Patchwork; +import fns.patchwork.base.Patchwork; import net.kyori.adventure.chat.ChatType; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/Patchwork/src/main/java/me/totalfreedom/utils/logging/FreedomLogger.java b/Patchwork/src/main/java/fns/patchwork/utils/logging/FreedomLogger.java similarity index 98% rename from Patchwork/src/main/java/me/totalfreedom/utils/logging/FreedomLogger.java rename to Patchwork/src/main/java/fns/patchwork/utils/logging/FreedomLogger.java index 97cec23..8630f28 100644 --- a/Patchwork/src/main/java/me/totalfreedom/utils/logging/FreedomLogger.java +++ b/Patchwork/src/main/java/fns/patchwork/utils/logging/FreedomLogger.java @@ -1,6 +1,7 @@ -package me.totalfreedom.utils.logging; +package fns.patchwork.utils.logging; -import me.totalfreedom.utils.kyori.FreedomAdventure; +import fns.patchwork.utils.kyori.FreedomAdventure; +import java.util.function.Supplier; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.chat.ChatType; import net.kyori.adventure.chat.SignedMessage; @@ -10,8 +11,6 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.function.Supplier; - public class FreedomLogger implements Audience { private final Logger logger; From 169e387a5ac0159cb9e8d81f898dfddd05b27d4e Mon Sep 17 00:00:00 2001 From: EnZaXD <60033407+FlorianMichael@users.noreply.github.com> Date: Thu, 3 Aug 2023 22:58:40 +0200 Subject: [PATCH 14/18] Bump Gradle to latest, updated Dev list (#18) * Bump Gradle to latest, updated Dev list * Thanks git --- README.md | 2 ++ gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 63375 bytes gradle/wrapper/gradle-wrapper.properties | 5 ++-- gradlew | 30 +++++++++++++++++------ gradlew.bat | 15 +++++++----- 5 files changed, 36 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 1fd5129..3e0c956 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,8 @@ This proof-of-concept also uses the following libraries: [](https://github.com/VideoGameSmash12)
[](https://github.com/allinkdev) +
+[](https://github.com/FlorianMichael) # To Do List diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832f090a2944b7473328c07c9755baa3196..033e24c4cdf41af1ab109bc7f253b2b887023340 100644 GIT binary patch delta 41134 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 delta 38514 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

Ed3W8DKk=GWZ^H1%j3(j1_6^9H~ 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 39d04d3..9f4197d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Thu Apr 13 15:32:14 CDT 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..fcb6fca 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +130,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +213,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal From 9bb7ebb7708ee98a4ec6ab5eddc1f08cdd7f40e6 Mon Sep 17 00:00:00 2001 From: Paldiu Date: Sun, 6 Aug 2023 17:07:49 -0500 Subject: [PATCH 15/18] Changed phrasing to match latest changes. --- Patchwork/src/main/java/fns/patchwork/command/Commander.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Patchwork/src/main/java/fns/patchwork/command/Commander.java b/Patchwork/src/main/java/fns/patchwork/command/Commander.java index 07b893c..920a853 100644 --- a/Patchwork/src/main/java/fns/patchwork/command/Commander.java +++ b/Patchwork/src/main/java/fns/patchwork/command/Commander.java @@ -27,9 +27,7 @@ import org.jetbrains.annotations.Nullable; * You are allowed to have as many methods as you want which are annotated with the {@link Subcommand} annotation. These * methods will be called when the command is executed with the specified subcommand. *
- * You are also allowed to use multiple {@link Completion} annotations per method to define multiple tab completions for - * a single subcommand. This would be useful in the case where you would like to include specific completion cases, but - * also support basic String completion cases. + * You are also allowed to use multiple {@link Completion} annotations per class to define the tab completions for each method. *
* When creating {@link Completion} annotations, you only need to register arguments a single time per class. For more * information, see {@link Subcommand}. From 60b63b58578367292a1fc0f957078cbe81d4796a Mon Sep 17 00:00:00 2001 From: Paldiu Date: Sun, 6 Aug 2023 17:41:41 -0500 Subject: [PATCH 16/18] Fix readme incorrectly stating "proof of concept" --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3e0c956..f1f8f61 100644 --- a/README.md +++ b/README.md @@ -44,16 +44,17 @@ # ![Header Image](https://simplexdev.app/images/fns-content/fnslogo.png) -This is a proof of concept for a new suite of modules supported by a common library. +This project is a collection of plugins supported by a common library designed for creative-based freedom servers (servers which grant generous amounts of permission nodes to all players.) This is designed to encompass the ideologies of a Freedom server, while maintaining full customization through modules. -This is a ground up rewrite of [TotalFreedomMod]. +Most modules are designed to be either optional or interchangable, except Patchwork (API) and Datura (Data Manager). These two are required to run any of the other modules. +This is NOT a ground up rewrite of [TotalFreedomMod]. This is a completely new project designed to be entirely ambiguous.

Honorable mention:
[](https://github.com/plexusorg/Plex) -This proof-of-concept also uses the following libraries: +This plugin suite also uses the following libraries: - [Google GSON] for Json interpretation - [Jetbrains Annotations] for additional compiler annotations @@ -92,8 +93,8 @@ Patchwork (API): Datura (Data Manager): -- [ ] Permission Handling *(In Progress...)* -- [ ] Permission Registration & Assignment *(In Progress...)* +- [x] Permission Handling +- [x] Permission Registration & Assignment - [ ] SQL Data Handling *(In Progress...)* - [ ] Configuration Implementations - [ ] User Data Implementations *(In Progress...)* From 368f3cae1239cd034e6f3d23a5c2ceff9bd0fec4 Mon Sep 17 00:00:00 2001 From: Paldiu Date: Sun, 6 Aug 2023 17:44:39 -0500 Subject: [PATCH 17/18] Modify banner formatting --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f1f8f61..5bcfe6e 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,13 @@ ![Libraries.io dependency status for GitHub repo](https://img.shields.io/librariesio/github/AtlasMediaGroup/Freedom-Network-Suite?style=for-the-badge) ![TFM Used](https://img.shields.io/static/v1?label=TFM%20Code%20Used&message=0%25&color=red&style=for-the-badge&logo=tensorflow) -# ![Header Image](https://simplexdev.app/images/fns-content/fnslogo.png) +# + +

+ FNS Banner +

+ +# This project is a collection of plugins supported by a common library designed for creative-based freedom servers (servers which grant generous amounts of permission nodes to all players.) This is designed to encompass the ideologies of a Freedom server, while maintaining full customization through modules. From 3e8c63221d7aca3a2f3f33c8fa3bc86c7e09c417 Mon Sep 17 00:00:00 2001 From: Eva <66324759+evallll@users.noreply.github.com> Date: Fri, 11 Aug 2023 19:15:36 +0100 Subject: [PATCH 18/18] Overhaul of Patchwork and Registration system, fix-up for all plugin.yml files and removal of .negates(0 and .value() from DefaultNodes in turn for the .expiry() system removing the redundancies. (#21) Co-authored-by: eva <66324759+evax64@users.noreply.github.com> --- Corvo/src/main/java/fns/corvo/Corvo.java | 9 ++-- Corvo/src/main/resources/plugin.yml | 3 +- Datura/src/main/java/fns/datura/Datura.java | 24 ++++------ .../java/fns/datura/cmd/AdminChatCommand.java | 7 +-- .../fns/datura/cmd/ClearDropsCommand.java | 4 +- .../java/fns/datura/perms/DefaultNodes.java | 12 ++--- .../java/fns/datura/perms/FreedomGroup.java | 3 +- .../java/fns/datura/perms/FreedomUser.java | 13 ++--- .../java/fns/datura/punishment/Cager.java | 7 ++- .../java/fns/datura/punishment/Locker.java | 3 +- .../src/main/java/fns/datura/sql/MySQL.java | 17 +++---- .../java/fns/datura/user/SimpleUserData.java | 9 ++-- Datura/src/main/resources/plugin.yml | 3 +- Fossil/src/main/java/fns/fossil/Fossil.java | 12 ++--- .../java/fns/fossil/bouncypads/PadHolder.java | 10 ++-- Fossil/src/main/resources/plugin.yml | 3 +- .../java/fns/patchwork/base/Patchwork.java | 48 ++++++------------- .../java/fns/patchwork/base/Registration.java | 41 +++++++--------- .../java/fns/patchwork/base/Shortcuts.java | 12 ++--- .../display/adminchat/AdminChatDisplay.java | 13 +++-- .../patchwork/provider/ContextProvider.java | 1 - .../patchwork/service/FreedomExecutor.java | 6 +-- .../java/fns/patchwork/shop/ReactionTask.java | 8 ++-- Patchwork/src/main/resources/plugin.yml | 3 +- 24 files changed, 113 insertions(+), 158 deletions(-) diff --git a/Corvo/src/main/java/fns/corvo/Corvo.java b/Corvo/src/main/java/fns/corvo/Corvo.java index 8b021ec..69d9c7a 100644 --- a/Corvo/src/main/java/fns/corvo/Corvo.java +++ b/Corvo/src/main/java/fns/corvo/Corvo.java @@ -1,6 +1,7 @@ package fns.corvo; import fns.patchwork.base.Patchwork; +import fns.patchwork.base.Registration; import org.bukkit.plugin.java.JavaPlugin; public class Corvo extends JavaPlugin @@ -8,18 +9,14 @@ public class Corvo extends JavaPlugin @Override public void onDisable() { - Patchwork.getInstance() - .getRegistrations() - .getModuleRegistry() + Registration.getModuleRegistry() .removeModule(this); } @Override public void onEnable() { - Patchwork.getInstance() - .getRegistrations() - .getModuleRegistry() + Registration.getModuleRegistry() .addModule(this); } } diff --git a/Corvo/src/main/resources/plugin.yml b/Corvo/src/main/resources/plugin.yml index 557f40e..db2b827 100644 --- a/Corvo/src/main/resources/plugin.yml +++ b/Corvo/src/main/resources/plugin.yml @@ -1,5 +1,6 @@ name: Corvo -main: me.totalfreedom.corvo.Corvo +main: fns.corvo.Corvo +api-version: 1.20 version: 1.0.0 author: TotalFreedom description: Services and Listeners for the Freedom Network Suite diff --git a/Datura/src/main/java/fns/datura/Datura.java b/Datura/src/main/java/fns/datura/Datura.java index f28a9c1..cebc77e 100644 --- a/Datura/src/main/java/fns/datura/Datura.java +++ b/Datura/src/main/java/fns/datura/Datura.java @@ -6,7 +6,7 @@ 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.base.Registration; import fns.patchwork.service.SubscriptionProvider; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; @@ -18,7 +18,7 @@ public class Datura extends JavaPlugin // Punishment private final Halter halter = new Halter(); private final Locker locker = new Locker(); - private final Cager cager = new Cager(); + private Cager cager; // Features private final CommandSpy commandSpy = new CommandSpy(); @@ -27,28 +27,22 @@ public class Datura extends JavaPlugin @Override public void onEnable() { - Patchwork.getInstance() - .getRegistrations() - .getModuleRegistry() - .addModule(this); + cager = new Cager(this); - Patchwork.getInstance() - .getRegistrations() - .getServiceTaskRegistry() + Registration.getServiceTaskRegistry() .registerService(SubscriptionProvider.syncService(this, locker)); - Patchwork.getInstance() - .getRegistrations() - .getServiceTaskRegistry() + Registration.getServiceTaskRegistry() .registerService(SubscriptionProvider.syncService(this, cager)); - Patchwork.getInstance() - .getRegistrations() - .getServiceTaskRegistry() + Registration.getServiceTaskRegistry() .registerService(SubscriptionProvider.syncService(this, fuckoff)); Bukkit.getPluginManager() .registerEvents(halter, this); Bukkit.getPluginManager() .registerEvents(commandSpy, this); + + Registration.getModuleRegistry() + .addModule(this); } public MySQL getSQL() diff --git a/Datura/src/main/java/fns/datura/cmd/AdminChatCommand.java b/Datura/src/main/java/fns/datura/cmd/AdminChatCommand.java index ab38001..aff79a4 100644 --- a/Datura/src/main/java/fns/datura/cmd/AdminChatCommand.java +++ b/Datura/src/main/java/fns/datura/cmd/AdminChatCommand.java @@ -1,6 +1,7 @@ package fns.datura.cmd; 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.Info; @@ -38,11 +39,11 @@ public class AdminChatCommand extends Commander final Player player = (Player) sender; - Patchwork.getInstance() + Shortcuts.provideModule(Patchwork.class) .getAdminChatDisplay() .toggleChat(player); - final boolean toggled = Patchwork.getInstance() + final boolean toggled = Shortcuts.provideModule(Patchwork.class) .getAdminChatDisplay() .isToggled(player); @@ -57,7 +58,7 @@ public class AdminChatCommand extends Commander @Subcommand(permission = "patchwork.adminchat", args = {String.class}) public void sendMessage(final CommandSender sender, final String message) { - Patchwork.getInstance() + Shortcuts.provideModule(Patchwork.class) .getAdminChatDisplay() .adminChatMessage(sender, Component.text(message)); } diff --git a/Datura/src/main/java/fns/datura/cmd/ClearDropsCommand.java b/Datura/src/main/java/fns/datura/cmd/ClearDropsCommand.java index 99828f8..e0912cf 100644 --- a/Datura/src/main/java/fns/datura/cmd/ClearDropsCommand.java +++ b/Datura/src/main/java/fns/datura/cmd/ClearDropsCommand.java @@ -51,7 +51,7 @@ public class ClearDropsCommand extends Commander } final Player player = (Player) sender; - Patchwork.getInstance() + Shortcuts.provideModule(Patchwork.class) .getExecutor() .delayedExecutor(Shortcuts.provideModule(Datura.class), 20 * 10L) .execute(() -> @@ -73,7 +73,7 @@ public class ClearDropsCommand extends Commander @Subcommand(permission = "datura.cleardrops", args = {World.class}) public void clearDrops(final CommandSender sender, final World world) { - Patchwork.getInstance() + Shortcuts.provideModule(Patchwork.class) .getExecutor() .delayedExecutor(Shortcuts.provideModule(Datura.class), 20 * 10L) .execute(() -> diff --git a/Datura/src/main/java/fns/datura/perms/DefaultNodes.java b/Datura/src/main/java/fns/datura/perms/DefaultNodes.java index 71a9af4..fd85f65 100644 --- a/Datura/src/main/java/fns/datura/perms/DefaultNodes.java +++ b/Datura/src/main/java/fns/datura/perms/DefaultNodes.java @@ -7,30 +7,26 @@ public class DefaultNodes { public static final Node OP = new PermissionNodeBuilder() .key("freedom.master_key") - .value(true) + .expiry(-1) .type(NodeType.PERMISSION) - .negated(false) .wildcard(true) .build(); public static final Node NON_OP = new PermissionNodeBuilder() .key("freedom.default") - .value(true) + .expiry(-1) .type(NodeType.PERMISSION) - .negated(false) .wildcard(false) .build(); public static final Node ALL = new PermissionNodeBuilder() .key("*") - .value(true) + .expiry(-1) .type(NodeType.PERMISSION) - .negated(false) .wildcard(true) .build(); public static final Node NONE = new PermissionNodeBuilder() .key("freedom.none") - .value(true) + .expiry(-1) .type(NodeType.PERMISSION) - .negated(false) .wildcard(false) .build(); diff --git a/Datura/src/main/java/fns/datura/perms/FreedomGroup.java b/Datura/src/main/java/fns/datura/perms/FreedomGroup.java index 0077a5f..7694147 100644 --- a/Datura/src/main/java/fns/datura/perms/FreedomGroup.java +++ b/Datura/src/main/java/fns/datura/perms/FreedomGroup.java @@ -1,6 +1,7 @@ package fns.datura.perms; import fns.patchwork.base.Patchwork; +import fns.patchwork.base.Shortcuts; import fns.patchwork.security.Group; import fns.patchwork.security.Node; import java.util.HashSet; @@ -40,7 +41,7 @@ public class FreedomGroup implements Group this.isDefault = isDefault; this.isHidden = isHidden; this.permissions = new HashSet<>(); - this.attachment = new PermissionAttachment(Patchwork.getInstance(), this); + this.attachment = new PermissionAttachment(Shortcuts.provideModule(Patchwork.class), this); } @Override diff --git a/Datura/src/main/java/fns/datura/perms/FreedomUser.java b/Datura/src/main/java/fns/datura/perms/FreedomUser.java index 367ccd6..d246cad 100644 --- a/Datura/src/main/java/fns/datura/perms/FreedomUser.java +++ b/Datura/src/main/java/fns/datura/perms/FreedomUser.java @@ -3,6 +3,8 @@ package fns.datura.perms; import fns.datura.Datura; import fns.datura.user.SimpleUserData; import fns.patchwork.base.Patchwork; +import fns.patchwork.base.Registration; +import fns.patchwork.base.Shortcuts; import fns.patchwork.security.Node; import fns.patchwork.user.User; import fns.patchwork.user.UserData; @@ -41,11 +43,7 @@ public class FreedomUser implements User this.permissions = new HashSet<>(); this.displayName = player.displayName(); - final Datura datura = Patchwork.getInstance() - .getRegistrations() - .getModuleRegistry() - .getProvider(Datura.class) - .getModule(); + final Datura datura = Shortcuts.provideModule(Datura.class); UserData data = SimpleUserData.fromSQL(datura.getSQL(), uuid.toString()); @@ -56,8 +54,7 @@ public class FreedomUser implements User this.userData = data; - Patchwork.getInstance() - .getRegistrations() + Registration .getUserRegistry() .registerUserData(this, userData); } @@ -96,7 +93,7 @@ public class FreedomUser implements User public boolean addPermission(final Node node) { final boolean value = !node.isTemporary() || node.isExpired(); - final PermissionAttachment attachment = addAttachment(Patchwork.getInstance(), node.key(), value); + final PermissionAttachment attachment = addAttachment(Shortcuts.provideModule(Patchwork.class), node.key(), value); bukkitAttachments.put(node, attachment); return permissions().add(node); } diff --git a/Datura/src/main/java/fns/datura/punishment/Cager.java b/Datura/src/main/java/fns/datura/punishment/Cager.java index b411052..3a962d0 100644 --- a/Datura/src/main/java/fns/datura/punishment/Cager.java +++ b/Datura/src/main/java/fns/datura/punishment/Cager.java @@ -1,5 +1,6 @@ package fns.datura.punishment; +import fns.datura.Datura; import fns.patchwork.base.Patchwork; import fns.patchwork.service.Service; import fns.patchwork.utils.ShapeUtils; @@ -20,18 +21,20 @@ import org.bukkit.event.Listener; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.player.PlayerQuitEvent; +import javax.sound.midi.Patch; + public class Cager extends Service { private final Set cagedPlayers; private final Map cageLocations; - public Cager() + public Cager(final Datura datura) { super("cager-service"); this.cagedPlayers = new HashSet<>(); this.cageLocations = new HashMap<>(); Bukkit.getPluginManager() - .registerEvents(new CageListener(), Patchwork.getInstance()); + .registerEvents(new CageListener(), datura); } /** diff --git a/Datura/src/main/java/fns/datura/punishment/Locker.java b/Datura/src/main/java/fns/datura/punishment/Locker.java index 71a0abd..4649ff0 100644 --- a/Datura/src/main/java/fns/datura/punishment/Locker.java +++ b/Datura/src/main/java/fns/datura/punishment/Locker.java @@ -1,6 +1,7 @@ package fns.datura.punishment; import fns.patchwork.base.Patchwork; +import fns.patchwork.base.Shortcuts; import fns.patchwork.service.Service; import java.util.HashSet; import java.util.Set; @@ -34,7 +35,7 @@ public class Locker extends Service @Override public void tick() { - lockedPlayers.removeIf(uuid -> !Patchwork.getInstance() + lockedPlayers.removeIf(uuid -> !Shortcuts.provideModule(Patchwork.class) .getServer() .getOfflinePlayer(uuid) .isOnline()); diff --git a/Datura/src/main/java/fns/datura/sql/MySQL.java b/Datura/src/main/java/fns/datura/sql/MySQL.java index e3485e7..57afd1b 100644 --- a/Datura/src/main/java/fns/datura/sql/MySQL.java +++ b/Datura/src/main/java/fns/datura/sql/MySQL.java @@ -1,6 +1,7 @@ package fns.datura.sql; import fns.patchwork.base.Patchwork; +import fns.patchwork.base.Shortcuts; import fns.patchwork.sql.SQL; import fns.patchwork.utils.container.Identity; import java.sql.Connection; @@ -74,7 +75,7 @@ public class MySQL implements SQL throw new CompletionException("Failed to prepare statement: " + query + "\n", ex); } - }, Patchwork.getInstance() + }, Shortcuts.provideModule(Patchwork.class) .getExecutor() .getAsync()); } @@ -91,7 +92,7 @@ public class MySQL implements SQL throw new CompletionException("Failed to connect to the database: " + url.toString() + "\n", ex); } - }, Patchwork.getInstance() + }, Shortcuts.provideModule(Patchwork.class) .getExecutor() .getAsync()); } @@ -111,7 +112,7 @@ public class MySQL implements SQL "Failed to retrieve a result set from query: " + query + "\n", ex); } - }, Patchwork.getInstance() + }, Shortcuts.provideModule(Patchwork.class) .getExecutor() .getAsync()); } @@ -130,7 +131,7 @@ public class MySQL implements SQL throw new CompletionException("Failed to execute update: " + query + "\n", ex); } - }, Patchwork.getInstance() + }, Shortcuts.provideModule(Patchwork.class) .getExecutor() .getAsync()); } @@ -149,7 +150,7 @@ public class MySQL implements SQL throw new CompletionException("Failed to execute statement: " + query + "\n", ex); } - }, Patchwork.getInstance() + }, Shortcuts.provideModule(Patchwork.class) .getExecutor() .getAsync()); } @@ -193,7 +194,7 @@ public class MySQL implements SQL ex); } return null; - }, Patchwork.getInstance() + }, Shortcuts.provideModule(Patchwork.class) .getExecutor() .getAsync()); } @@ -202,7 +203,7 @@ public class MySQL implements SQL final String key, final Identity identity) { return executeUpdate("UPDATE ? SET ? = ? WHERE ? = ?", table, column, value, key, identity.getId()) - .thenApplyAsync(result -> result > 0, Patchwork.getInstance() + .thenApplyAsync(result -> result > 0, Shortcuts.provideModule(Patchwork.class) .getExecutor() .getAsync()); } @@ -210,7 +211,7 @@ public class MySQL implements SQL public CompletableFuture deleteRow(final String table, final String key, final Identity identity) { return executeUpdate("DELETE FROM ? WHERE ? = ?", table, key, identity.getId()) - .thenApplyAsync(result -> result > 0, Patchwork.getInstance() + .thenApplyAsync(result -> result > 0, Shortcuts.provideModule(Patchwork.class) .getExecutor() .getAsync()); } diff --git a/Datura/src/main/java/fns/datura/user/SimpleUserData.java b/Datura/src/main/java/fns/datura/user/SimpleUserData.java index 234306d..f313ef3 100644 --- a/Datura/src/main/java/fns/datura/user/SimpleUserData.java +++ b/Datura/src/main/java/fns/datura/user/SimpleUserData.java @@ -3,6 +3,8 @@ package fns.datura.user; import fns.datura.event.UserDataUpdateEvent; import fns.datura.perms.FreedomUser; import fns.patchwork.base.Patchwork; +import fns.patchwork.base.Registration; +import fns.patchwork.base.Shortcuts; import fns.patchwork.display.adminchat.AdminChatFormat; import fns.patchwork.security.Group; import fns.patchwork.sql.SQL; @@ -38,7 +40,7 @@ public class SimpleUserData implements UserData this.username = player.getName(); this.user = new FreedomUser(player); - Patchwork.getInstance() + Shortcuts.provideModule(Patchwork.class) .getEventBus() .addEvent(event); } @@ -84,8 +86,7 @@ public class SimpleUserData implements UserData throw new IllegalStateException("Player should be online but they are not!"); final User user = new FreedomUser(player); - final Group group = Patchwork.getInstance() - .getRegistrations() + final Group group = Registration .getGroupRegistry() .getGroup(g); @@ -116,7 +117,7 @@ public class SimpleUserData implements UserData if (player == null) throw new IllegalStateException("Player should be online but they are not!"); return new SimpleUserData(player); - }, Patchwork.getInstance() + }, Shortcuts.provideModule(Patchwork.class) .getExecutor() .getAsync()) .join(); diff --git a/Datura/src/main/resources/plugin.yml b/Datura/src/main/resources/plugin.yml index 0455676..a70371e 100644 --- a/Datura/src/main/resources/plugin.yml +++ b/Datura/src/main/resources/plugin.yml @@ -1,5 +1,6 @@ name: Datura -main: me.totalfreedom.datura.Datura +main: fns.datura.Datura +api-version: 1.20 version: 1.0.0 author: TotalFreedom description: Data Manager for the Freedom Network Suite diff --git a/Fossil/src/main/java/fns/fossil/Fossil.java b/Fossil/src/main/java/fns/fossil/Fossil.java index e32ce9b..7a470b5 100644 --- a/Fossil/src/main/java/fns/fossil/Fossil.java +++ b/Fossil/src/main/java/fns/fossil/Fossil.java @@ -1,7 +1,6 @@ package fns.fossil; 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; @@ -9,17 +8,14 @@ import org.bukkit.plugin.java.JavaPlugin; public class Fossil extends JavaPlugin { private final Trailer trailer = new Trailer(); - private final Registration registration = Patchwork.getInstance() - .getRegistrations(); - @Override public void onEnable() { - registration.getModuleRegistry() - .addModule(this); - - registration.getServiceTaskRegistry() + Registration.getServiceTaskRegistry() .registerService( SubscriptionProvider.syncService(this, trailer)); + + Registration.getModuleRegistry() + .addModule(this); } } diff --git a/Fossil/src/main/java/fns/fossil/bouncypads/PadHolder.java b/Fossil/src/main/java/fns/fossil/bouncypads/PadHolder.java index 93b5f91..487a263 100644 --- a/Fossil/src/main/java/fns/fossil/bouncypads/PadHolder.java +++ b/Fossil/src/main/java/fns/fossil/bouncypads/PadHolder.java @@ -1,11 +1,12 @@ package fns.fossil.bouncypads; 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 fns.patchwork.base.Shortcuts; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Tag; @@ -32,12 +33,7 @@ public class PadHolder implements Listener public PadHolder() { Bukkit.getPluginManager() - .registerEvents(this, Patchwork - .getInstance() - .getRegistrations() - .getModuleRegistry() - .getProvider(Fossil.class) - .getModule()); + .registerEvents(this, Shortcuts.provideModule(Fossil.class)); } /** diff --git a/Fossil/src/main/resources/plugin.yml b/Fossil/src/main/resources/plugin.yml index 99f537c..f3212a7 100644 --- a/Fossil/src/main/resources/plugin.yml +++ b/Fossil/src/main/resources/plugin.yml @@ -1,6 +1,7 @@ name: Fossil version: 1.0 -main: me.totalfreedom.fossil.Fossil +main: fns.fossil.Fossil +api-version: 1.20 author: TotalFreedom description: The Fun Module for the Freedom Network. depend: diff --git a/Patchwork/src/main/java/fns/patchwork/base/Patchwork.java b/Patchwork/src/main/java/fns/patchwork/base/Patchwork.java index 964180f..64d4099 100644 --- a/Patchwork/src/main/java/fns/patchwork/base/Patchwork.java +++ b/Patchwork/src/main/java/fns/patchwork/base/Patchwork.java @@ -15,52 +15,45 @@ public class Patchwork extends JavaPlugin /** * The {@link EventBus} for this plugin. */ - private final EventBus eventBus = new EventBus(this); - /** - * The {@link Registration} object for this plugin. - */ - private final Registration registration = new Registration(); + private EventBus eventBus; /** * The {@link FreedomExecutor} for this plugin. */ - private final FreedomExecutor executor = new FreedomExecutor(); + private FreedomExecutor executor; /** * The {@link AdminChatDisplay} for this plugin. */ - private final AdminChatDisplay acdisplay = new AdminChatDisplay(); - - /** - * Provides this plugin instance through a safe static method. This is effectively the same thing as using - * {@link JavaPlugin#getPlugin(Class)} - * - * @return the plugin instance - */ - public static Patchwork getInstance() - { - return JavaPlugin.getPlugin(Patchwork.class); - } + private AdminChatDisplay acdisplay; @Override public void onDisable() { Bukkit.getScheduler() - .runTaskLater(this, () -> getRegistrations() + .runTaskLater(this, () -> Registration .getServiceTaskRegistry() .stopAllServices(), 1L); - getRegistrations().getServiceTaskRegistry() + Registration.getServiceTaskRegistry() .unregisterService(EventBus.class); } @Override public void onEnable() { - getRegistrations().getServiceTaskRegistry() + eventBus = new EventBus(this); + executor = new FreedomExecutor(this); + acdisplay = new AdminChatDisplay(this); + + + Registration.getServiceTaskRegistry() .registerService(SubscriptionProvider.asyncService(this, eventBus)); + getExecutor().getSync() - .execute(() -> getRegistrations() + .execute(() -> Registration .getServiceTaskRegistry() .startAllServices()); + + Registration.getModuleRegistry().addModule(this); } /** @@ -73,17 +66,6 @@ public class Patchwork extends JavaPlugin return executor; } - /** - * Get's the Registration object for this plugin. This object contains every registry class for the various features - * provided by this plugin. - * - * @return the Registration object - */ - public Registration getRegistrations() - { - return registration; - } - /** * Gets the {@link EventBus} for this plugin. The EventBus is used to register and listen to custom events provided * by Freedom Network Suite. diff --git a/Patchwork/src/main/java/fns/patchwork/base/Registration.java b/Patchwork/src/main/java/fns/patchwork/base/Registration.java index c5aeee8..bbe5048 100644 --- a/Patchwork/src/main/java/fns/patchwork/base/Registration.java +++ b/Patchwork/src/main/java/fns/patchwork/base/Registration.java @@ -11,53 +11,44 @@ import fns.patchwork.data.UserRegistry; * This class is a holder for each registry in the data package. *
* Registries such as {@link ModuleRegistry} and {@link ServiceTaskRegistry} can be found as final objects in this - * class. These registries should only ever be accessed through the single Registration object in CommonsBase using - * {@link Patchwork#getRegistrations()} + * class. */ public class Registration { /** * The {@link EventRegistry} */ - private final EventRegistry eventRegistry; + private static final EventRegistry eventRegistry = new EventRegistry(); /** * The {@link UserRegistry} */ - private final UserRegistry userRegistry; + private static final UserRegistry userRegistry = new UserRegistry(); /** * The {@link ServiceTaskRegistry} */ - private final ServiceTaskRegistry serviceTaskRegistry; + private static final ServiceTaskRegistry serviceTaskRegistry = new ServiceTaskRegistry(); /** * The {@link ModuleRegistry} */ - private final ModuleRegistry moduleRegistry; + private static final ModuleRegistry moduleRegistry = new ModuleRegistry(); /** * The {@link GroupRegistry} */ - private final GroupRegistry groupRegistry; + private static final GroupRegistry groupRegistry = new GroupRegistry(); /** * The {@link ConfigRegistry} */ - private final ConfigRegistry configRegistry; + private static final ConfigRegistry configRegistry = new ConfigRegistry(); - /** - * Constructs a new Registration object and initializes all registries. - */ - Registration() + private Registration() { - this.eventRegistry = new EventRegistry(); - this.userRegistry = new UserRegistry(); - this.serviceTaskRegistry = new ServiceTaskRegistry(); - this.moduleRegistry = new ModuleRegistry(); - this.groupRegistry = new GroupRegistry(); - this.configRegistry = new ConfigRegistry(); + throw new AssertionError(); } /** * @return The {@link ModuleRegistry} */ - public ModuleRegistry getModuleRegistry() + public static ModuleRegistry getModuleRegistry() { return moduleRegistry; } @@ -65,7 +56,7 @@ public class Registration /** * @return The {@link EventRegistry} */ - public EventRegistry getEventRegistry() + public static EventRegistry getEventRegistry() { return eventRegistry; } @@ -73,7 +64,7 @@ public class Registration /** * @return The {@link UserRegistry} */ - public UserRegistry getUserRegistry() + public static UserRegistry getUserRegistry() { return userRegistry; } @@ -81,7 +72,7 @@ public class Registration /** * @return The {@link ServiceTaskRegistry} */ - public ServiceTaskRegistry getServiceTaskRegistry() + public static ServiceTaskRegistry getServiceTaskRegistry() { return serviceTaskRegistry; } @@ -89,7 +80,7 @@ public class Registration /** * @return The {@link GroupRegistry} */ - public GroupRegistry getGroupRegistry() + public static GroupRegistry getGroupRegistry() { return groupRegistry; } @@ -97,8 +88,8 @@ public class Registration /** * @return The {@link ConfigRegistry} */ - public ConfigRegistry getConfigRegistry() + public static ConfigRegistry getConfigRegistry() { return configRegistry; } -} +} \ No newline at end of file diff --git a/Patchwork/src/main/java/fns/patchwork/base/Shortcuts.java b/Patchwork/src/main/java/fns/patchwork/base/Shortcuts.java index 2e57e68..b591929 100644 --- a/Patchwork/src/main/java/fns/patchwork/base/Shortcuts.java +++ b/Patchwork/src/main/java/fns/patchwork/base/Shortcuts.java @@ -13,18 +13,14 @@ public final class Shortcuts public static T provideModule(final Class pluginClass) { - return Patchwork.getInstance() - .getRegistrations() - .getModuleRegistry() - .getProvider(pluginClass) - .getModule(); + return Registration.getModuleRegistry() + .getProvider(pluginClass) + .getModule(); } public static User getUser(final Player player) { - return Patchwork.getInstance() - .getRegistrations() - .getUserRegistry() + return Registration.getUserRegistry() .getUser(player); } } diff --git a/Patchwork/src/main/java/fns/patchwork/display/adminchat/AdminChatDisplay.java b/Patchwork/src/main/java/fns/patchwork/display/adminchat/AdminChatDisplay.java index 8e70100..3f6f250 100644 --- a/Patchwork/src/main/java/fns/patchwork/display/adminchat/AdminChatDisplay.java +++ b/Patchwork/src/main/java/fns/patchwork/display/adminchat/AdminChatDisplay.java @@ -1,6 +1,7 @@ package fns.patchwork.display.adminchat; import fns.patchwork.base.Patchwork; +import fns.patchwork.base.Registration; import fns.patchwork.base.Shortcuts; import fns.patchwork.security.Groups; import fns.patchwork.user.UserData; @@ -24,9 +25,9 @@ public class AdminChatDisplay private final Map adminChatFormat = new HashMap<>(); private final Set toggledChat = new HashSet<>(); - public AdminChatDisplay() + public AdminChatDisplay(final Patchwork patchwork) { - new ACListener(this); + new ACListener(this, patchwork); } public void addPlayer(final Player player, final AdminChatFormat format) @@ -101,11 +102,11 @@ public class AdminChatDisplay { private final AdminChatDisplay display; - public ACListener(final AdminChatDisplay display) + public ACListener(final AdminChatDisplay display, final Patchwork patchwork) { this.display = display; Bukkit.getPluginManager() - .registerEvents(this, Shortcuts.provideModule(Patchwork.class)); + .registerEvents(this, patchwork); } @EventHandler @@ -124,9 +125,7 @@ public class AdminChatDisplay final Player player = event.getPlayer(); if (player.hasPermission(ACPERM)) { - final UserData data = Patchwork.getInstance() - .getRegistrations() - .getUserRegistry() + final UserData data = Registration.getUserRegistry() .fromPlayer(player); if (data.hasCustomACFormat()) { diff --git a/Patchwork/src/main/java/fns/patchwork/provider/ContextProvider.java b/Patchwork/src/main/java/fns/patchwork/provider/ContextProvider.java index a33a7d9..01f1807 100644 --- a/Patchwork/src/main/java/fns/patchwork/provider/ContextProvider.java +++ b/Patchwork/src/main/java/fns/patchwork/provider/ContextProvider.java @@ -160,7 +160,6 @@ public class ContextProvider * * @param string The string to parse * @return A location object if xyz is valid - * @see BukkitDelegate#processSubCommands(String[], CommandSender, ContextProvider, Subcommand) */ private @Nullable Location toLocation(final String string, final Class clazz) { diff --git a/Patchwork/src/main/java/fns/patchwork/service/FreedomExecutor.java b/Patchwork/src/main/java/fns/patchwork/service/FreedomExecutor.java index a67d031..c957279 100644 --- a/Patchwork/src/main/java/fns/patchwork/service/FreedomExecutor.java +++ b/Patchwork/src/main/java/fns/patchwork/service/FreedomExecutor.java @@ -25,12 +25,12 @@ public class FreedomExecutor /** * Creates a new {@link FreedomExecutor} instance. */ - public FreedomExecutor() + public FreedomExecutor(final Patchwork patchwork) { syncExecutor = r -> Bukkit.getScheduler() - .runTask(Patchwork.getInstance(), r); + .runTask(patchwork, r); asyncExecutor = r -> Bukkit.getScheduler() - .runTaskAsynchronously(Patchwork.getInstance(), r); + .runTaskAsynchronously(patchwork, r); } /** diff --git a/Patchwork/src/main/java/fns/patchwork/shop/ReactionTask.java b/Patchwork/src/main/java/fns/patchwork/shop/ReactionTask.java index 3af5916..360781b 100644 --- a/Patchwork/src/main/java/fns/patchwork/shop/ReactionTask.java +++ b/Patchwork/src/main/java/fns/patchwork/shop/ReactionTask.java @@ -1,6 +1,8 @@ package fns.patchwork.shop; import fns.patchwork.base.Patchwork; +import fns.patchwork.base.Registration; +import fns.patchwork.base.Shortcuts; import fns.patchwork.display.BossBarDisplay; import fns.patchwork.display.BossBarTimer; import fns.patchwork.economy.EconomicEntity; @@ -36,7 +38,7 @@ public class ReactionTask extends Task implements Listener } final BossBarTimer timer = new BossBarTimer(bossBarDisplay, reaction.getReactionDuration()); - timer.runTaskTimer(Patchwork.getInstance(), 0L, timer.getInterval()); + timer.runTaskTimer(Shortcuts.provideModule(Patchwork.class), 0L, timer.getInterval()); } @EventHandler @@ -45,9 +47,7 @@ public class ReactionTask extends Task implements Listener if (event.message() .equals(reaction.getReactionMessage())) { - final EconomicEntity entity = Patchwork.getInstance() - .getRegistrations() - .getUserRegistry() + final EconomicEntity entity = Registration.getUserRegistry() .getUser(event.getPlayer()); reaction.onReact(entity); diff --git a/Patchwork/src/main/resources/plugin.yml b/Patchwork/src/main/resources/plugin.yml index 5cbde93..c51a0e3 100644 --- a/Patchwork/src/main/resources/plugin.yml +++ b/Patchwork/src/main/resources/plugin.yml @@ -1,5 +1,6 @@ name: Patchwork -main: me.totalfreedom.base.CommonsBase +main: fns.patchwork.base.Patchwork +api-version: 1.20 version: 1.0.0 author: TotalFreedom description: The Core of Freedom Network Suite \ No newline at end of file