From e442aec4f6051a9f54767d3598bdc3a29f7c04c5 Mon Sep 17 00:00:00 2001 From: yusshu Date: Sun, 29 Oct 2023 19:01:56 -0500 Subject: [PATCH 1/5] refactor: lowercase module names and rename universal to api only for convention purposes, most maven projects use lowercase module names, and main module is often named 'api' or 'core' --- {Universal => api}/pom.xml | 4 ++-- .../java/me/fixeddev/commandflow/Authorizer.java | 0 .../me/fixeddev/commandflow/CommandContext.java | 0 .../me/fixeddev/commandflow/CommandManager.java | 0 .../me/fixeddev/commandflow/ContextSnapshot.java | 0 .../me/fixeddev/commandflow/ErrorHandler.java | 0 .../java/me/fixeddev/commandflow/Namespace.java | 0 .../me/fixeddev/commandflow/NamespaceImpl.java | 0 .../java/me/fixeddev/commandflow/ParseResult.java | 0 .../commandflow/SimpleCommandContext.java | 0 .../commandflow/SimpleCommandManager.java | 0 .../fixeddev/commandflow/SimpleErrorHandler.java | 0 .../annotated/AnnotatedCommandTreeBuilder.java | 0 .../AnnotatedCommandTreeBuilderImpl.java | 0 .../commandflow/annotated/CommandClass.java | 0 .../annotated/ReflectionInstanceCreator.java | 0 .../annotated/ReflectionSubCommandHandler.java | 0 .../annotated/SubCommandInstanceCreator.java | 0 .../annotated/action/ReflectiveAction.java | 0 .../commandflow/annotated/action/ValueGetter.java | 0 .../annotated/annotation/ArgOrSub.java | 0 .../commandflow/annotated/annotation/Command.java | 0 .../annotated/annotation/ConsumeAll.java | 0 .../commandflow/annotated/annotation/Flag.java | 0 .../commandflow/annotated/annotation/Handler.java | 0 .../commandflow/annotated/annotation/Limit.java | 0 .../commandflow/annotated/annotation/Named.java | 0 .../commandflow/annotated/annotation/OptArg.java | 0 .../annotated/annotation/ParentArg.java | 0 .../commandflow/annotated/annotation/Range.java | 0 .../annotated/annotation/Required.java | 0 .../annotated/annotation/Rewrites.java | 0 .../commandflow/annotated/annotation/Strict.java | 0 .../annotated/annotation/SubCommandClasses.java | 0 .../annotated/annotation/Suggestions.java | 0 .../commandflow/annotated/annotation/Switch.java | 0 .../commandflow/annotated/annotation/Text.java | 0 .../commandflow/annotated/annotation/Usage.java | 0 .../builder/AnnotatedCommandBuilder.java | 0 .../builder/AnnotatedCommandBuilderImpl.java | 0 .../commandflow/annotated/builder/Buildable.java | 0 .../annotated/builder/CommandActionNode.java | 0 .../builder/CommandBuilderNodesImpl.java | 0 .../annotated/builder/CommandDataNode.java | 0 .../annotated/builder/CommandModifiersNode.java | 0 .../annotated/builder/CommandPartsNode.java | 0 .../annotated/builder/SubCommandsNode.java | 0 .../modifier/CommandModifierFactory.java | 0 .../annotated/part/AbstractModule.java | 0 .../annotated/part/DelegatePartModifier.java | 0 .../fixeddev/commandflow/annotated/part/Key.java | 0 .../commandflow/annotated/part/Module.java | 0 .../commandflow/annotated/part/PartFactory.java | 0 .../commandflow/annotated/part/PartInjector.java | 0 .../commandflow/annotated/part/PartModifier.java | 0 .../annotated/part/SimplePartInjector.java | 0 .../annotated/part/defaults/DefaultsModule.java | 0 .../factory/ArgumentStackPartFactory.java | 0 .../part/defaults/factory/BooleanPartFactory.java | 0 .../part/defaults/factory/ContextFactory.java | 0 .../part/defaults/factory/DoublePartFactory.java | 0 .../part/defaults/factory/EnumPartFactory.java | 0 .../part/defaults/factory/FloatPartFactory.java | 0 .../part/defaults/factory/IntegerPartFactory.java | 0 .../part/defaults/factory/LongPartFactory.java | 0 .../part/defaults/factory/StringPartFactory.java | 0 .../defaults/factory/StringTextPartFactory.java | 0 .../part/defaults/factory/SwitchPartFactory.java | 0 .../part/defaults/modifier/LimitModifier.java | 0 .../part/defaults/modifier/OptionalModifier.java | 0 .../part/defaults/modifier/RewritesModifier.java | 0 .../defaults/modifier/SuggestionsModifier.java | 0 .../part/defaults/modifier/ValueFlagModifier.java | 0 .../me/fixeddev/commandflow/command/Action.java | 0 .../me/fixeddev/commandflow/command/Command.java | 0 .../commandflow/command/SimpleCommand.java | 0 .../command/modifiers/CommandModifier.java | 0 .../command/modifiers/CommandModifiers.java | 0 .../modifiers/FallbackCommandModifiers.java | 0 .../command/modifiers/ModifierPhase.java | 0 .../command/modifiers/ModifierUtils.java | 0 .../modifiers/SequentialCommandModifier.java | 0 .../command/modifiers/SimpleCommandModifiers.java | 0 .../commandflow/exception/ArgumentException.java | 0 .../exception/ArgumentParseException.java | 0 .../commandflow/exception/CommandException.java | 0 .../commandflow/exception/CommandUsage.java | 0 .../exception/InvalidSubCommandException.java | 0 .../exception/NoMoreArgumentsException.java | 0 .../exception/NoPermissionsException.java | 0 .../commandflow/exception/StopParseException.java | 0 .../commandflow/executor/DefaultExecutor.java | 0 .../fixeddev/commandflow/executor/Executor.java | 0 .../commandflow/input/InputTokenizer.java | 0 .../commandflow/input/QuotedSpaceTokenizer.java | 0 .../commandflow/input/StringSpaceTokenizer.java | 0 .../fixeddev/commandflow/part/ArgumentPart.java | 0 .../me/fixeddev/commandflow/part/CommandPart.java | 0 .../java/me/fixeddev/commandflow/part/Parts.java | 0 .../fixeddev/commandflow/part/PartsWrapper.java | 0 .../commandflow/part/SinglePartWrapper.java | 0 .../part/defaults/ArgumentRewriterPart.java | 0 .../part/defaults/ArgumentStackPart.java | 0 .../commandflow/part/defaults/BooleanPart.java | 0 .../commandflow/part/defaults/ContextPart.java | 0 .../commandflow/part/defaults/DoublePart.java | 0 .../commandflow/part/defaults/EmptyPart.java | 0 .../commandflow/part/defaults/EnumPart.java | 0 .../commandflow/part/defaults/FirstMatchPart.java | 0 .../commandflow/part/defaults/FloatPart.java | 0 .../commandflow/part/defaults/IntegerPart.java | 0 .../commandflow/part/defaults/LimitingPart.java | 0 .../commandflow/part/defaults/LongPart.java | 0 .../commandflow/part/defaults/OptionalPart.java | 0 .../commandflow/part/defaults/PrimitivePart.java | 0 .../part/defaults/SequentialCommandPart.java | 0 .../commandflow/part/defaults/StringPart.java | 0 .../commandflow/part/defaults/SubCommandPart.java | 0 .../part/defaults/SuggestionsModifierPart.java | 0 .../commandflow/part/defaults/SwitchPart.java | 0 .../commandflow/part/defaults/ValueFlagPart.java | 0 .../part/visitor/CommandPartVisitor.java | 0 .../part/visitor/UnwrappedCommandPartVisitor.java | 0 .../fixeddev/commandflow/stack/ArgumentStack.java | 0 .../commandflow/stack/SimpleArgumentStack.java | 0 .../fixeddev/commandflow/stack/StackSnapshot.java | 0 .../translator/ComponentRendererTranslator.java | 0 .../translator/DefaultMapTranslationProvider.java | 0 .../commandflow/translator/DefaultTranslator.java | 0 .../translator/TranslationProvider.java | 0 .../commandflow/translator/Translator.java | 0 .../commandflow/usage/DefaultUsageBuilder.java | 0 .../fixeddev/commandflow/usage/UsageBuilder.java | 0 .../fixeddev/commandflow/InputTokenizerTest.java | 0 .../commandflow/ParameterizedPartTest.java | 0 .../annotated/CustomComponentParserTest.java | 0 {Brigadier => brigadier}/pom.xml | 4 ++-- .../brigadier/BrigadierCommandManager.java | 0 .../brigadier/BrigadierCommandWrapper.java | 0 .../BrigadierDefaultTranslationProvider.java | 0 .../brigadier/CommandBrigadierConverter.java | 0 .../commandflow/brigadier/MultipleHeadNode.java | 0 .../brigadier/MultipleHeadNodeBuilder.java | 0 .../brigadier/PermissionRequirement.java | 0 {Bukkit => bukkit}/pom.xml | 4 ++-- .../commandflow/bukkit/BukkitAuthorizer.java | 0 .../commandflow/bukkit/BukkitCommandManager.java | 0 .../commandflow/bukkit/BukkitCommandWrapper.java | 0 .../bukkit/BukkitDefaultTranslationProvider.java | 0 .../fixeddev/commandflow/bukkit/MessageUtils.java | 0 .../commandflow/bukkit/annotation/Exact.java | 0 .../bukkit/annotation/PlayerOrSource.java | 0 .../commandflow/bukkit/annotation/Sender.java | 0 .../commandflow/bukkit/factory/BukkitModule.java | 0 .../bukkit/factory/CommandSenderFactory.java | 0 .../bukkit/factory/GameModeFactory.java | 0 .../bukkit/factory/OfflinePlayerPartFactory.java | 0 .../bukkit/factory/PlayerPartFactory.java | 0 .../bukkit/factory/PlayerSenderFactory.java | 0 .../commandflow/bukkit/factory/WorldFactory.java | 0 .../commandflow/bukkit/part/BukkitParts.java | 0 .../bukkit/part/CommandSenderPart.java | 0 .../commandflow/bukkit/part/GameModePart.java | 0 .../bukkit/part/OfflinePlayerPart.java | 0 .../commandflow/bukkit/part/PlayerPart.java | 0 .../commandflow/bukkit/part/PlayerSenderPart.java | 0 .../commandflow/bukkit/part/WorldPart.java | 0 {Bungee => bungee}/pom.xml | 4 ++-- .../commandflow/bungee/BungeeAuthorizer.java | 0 .../commandflow/bungee/BungeeCommandManager.java | 0 .../commandflow/bungee/BungeeCommandWrapper.java | 0 .../bungee/BungeeDefaultTranslationProvider.java | 0 .../fixeddev/commandflow/bungee/MessageUtils.java | 0 .../bungee/annotation/ProxiedPlayerOrSource.java | 0 .../commandflow/bungee/annotation/Sender.java | 0 .../commandflow/bungee/factory/BungeeModule.java | 0 .../bungee/factory/CommandSenderPartFactory.java | 0 .../bungee/factory/ProxiedPlayerPartFactory.java | 0 .../factory/ProxiedPlayerSenderPartFactory.java | 0 .../bungee/part/CommandSenderPart.java | 0 .../bungee/part/ProxiedPlayerPart.java | 0 .../bungee/part/ProxiedPlayerSenderPart.java | 0 {Discord => discord}/pom.xml | 4 ++-- .../commandflow/discord/DiscordAuthorizer.java | 0 .../discord/DiscordCommandManager.java | 0 .../DiscordDefaultTranslationProvider.java | 0 .../commandflow/discord/MessageListener.java | 0 .../commandflow/discord/annotation/Sender.java | 0 .../discord/factory/DiscordModule.java | 0 .../discord/factory/MemberPartFactory.java | 0 .../discord/factory/MemberSenderPartFactory.java | 0 .../discord/factory/MessagePartFactory.java | 0 .../discord/factory/TextChannelPartFactory.java | 0 .../discord/factory/UserPartFactory.java | 0 .../discord/factory/UserSenderPartFactory.java | 0 .../commandflow/discord/part/MemberPart.java | 0 .../discord/part/MemberSenderPart.java | 0 .../commandflow/discord/part/MessagePart.java | 0 .../commandflow/discord/part/TextChannelPart.java | 0 .../commandflow/discord/part/UserPart.java | 0 .../commandflow/discord/part/UserSenderPart.java | 0 .../commandflow/discord/utils/ArgumentsUtils.java | 0 .../commandflow/discord/utils/MessageUtils.java | 0 pom.xml | 15 +++++++-------- {Velocity => velocity}/pom.xml | 4 ++-- .../commandflow/velocity/VelocityAuthorizer.java | 0 .../velocity/VelocityCommandManager.java | 0 .../velocity/VelocityCommandWrapper.java | 0 .../VelocityDefaultTranslationProvider.java | 0 .../velocity/annotation/PlayerOrSource.java | 0 .../commandflow/velocity/annotation/Sender.java | 0 .../factory/CommandSourcePartFactory.java | 0 .../velocity/factory/PlayerPartFactory.java | 0 .../velocity/factory/PlayerSenderPartFactory.java | 0 .../velocity/factory/VelocityModule.java | 0 .../velocity/part/CommandSenderPart.java | 0 .../commandflow/velocity/part/PlayerPart.java | 0 .../velocity/part/PlayerSenderPart.java | 0 218 files changed, 19 insertions(+), 20 deletions(-) rename {Universal => api}/pom.xml (95%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/Authorizer.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/CommandContext.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/CommandManager.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/ContextSnapshot.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/ErrorHandler.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/Namespace.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/NamespaceImpl.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/ParseResult.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/SimpleCommandContext.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/SimpleCommandManager.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/SimpleErrorHandler.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilder.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/CommandClass.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/ReflectionInstanceCreator.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/ReflectionSubCommandHandler.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/SubCommandInstanceCreator.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/action/ReflectiveAction.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/action/ValueGetter.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/ArgOrSub.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/Command.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/ConsumeAll.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/Flag.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/Handler.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/Limit.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/Named.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/OptArg.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/ParentArg.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/Range.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/Required.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/Rewrites.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/Strict.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/SubCommandClasses.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/Suggestions.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/Switch.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/Text.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/annotation/Usage.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilder.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilderImpl.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/builder/Buildable.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandActionNode.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandBuilderNodesImpl.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandDataNode.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandModifiersNode.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandPartsNode.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/builder/SubCommandsNode.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/modifier/CommandModifierFactory.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/AbstractModule.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/DelegatePartModifier.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/Key.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/Module.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/PartFactory.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/PartInjector.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/PartModifier.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/SimplePartInjector.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/DefaultsModule.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ArgumentStackPartFactory.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/BooleanPartFactory.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ContextFactory.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/DoublePartFactory.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/EnumPartFactory.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/FloatPartFactory.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/IntegerPartFactory.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/LongPartFactory.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringPartFactory.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringTextPartFactory.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/SwitchPartFactory.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/LimitModifier.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/OptionalModifier.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/RewritesModifier.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/SuggestionsModifier.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/ValueFlagModifier.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/command/Action.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/command/Command.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/command/SimpleCommand.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifier.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifiers.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/command/modifiers/FallbackCommandModifiers.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierPhase.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierUtils.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/command/modifiers/SequentialCommandModifier.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/command/modifiers/SimpleCommandModifiers.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/exception/ArgumentException.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/exception/ArgumentParseException.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/exception/CommandException.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/exception/CommandUsage.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/exception/InvalidSubCommandException.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/exception/NoMoreArgumentsException.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/exception/NoPermissionsException.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/exception/StopParseException.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/executor/DefaultExecutor.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/executor/Executor.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/input/InputTokenizer.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/input/QuotedSpaceTokenizer.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/input/StringSpaceTokenizer.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/ArgumentPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/CommandPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/Parts.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/PartsWrapper.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/SinglePartWrapper.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentRewriterPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentStackPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/BooleanPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/ContextPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/DoublePart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/EmptyPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/EnumPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/FirstMatchPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/FloatPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/IntegerPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/LimitingPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/LongPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/OptionalPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/PrimitivePart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/SequentialCommandPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/StringPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/SubCommandPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/SuggestionsModifierPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/SwitchPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/defaults/ValueFlagPart.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/visitor/CommandPartVisitor.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/part/visitor/UnwrappedCommandPartVisitor.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/stack/ArgumentStack.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/stack/SimpleArgumentStack.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/stack/StackSnapshot.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/translator/ComponentRendererTranslator.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/translator/DefaultMapTranslationProvider.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/translator/DefaultTranslator.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/translator/TranslationProvider.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/translator/Translator.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/usage/DefaultUsageBuilder.java (100%) rename {Universal => api}/src/main/java/me/fixeddev/commandflow/usage/UsageBuilder.java (100%) rename {Universal => api}/src/test/java/me/fixeddev/commandflow/InputTokenizerTest.java (100%) rename {Universal => api}/src/test/java/me/fixeddev/commandflow/ParameterizedPartTest.java (100%) rename {Universal => api}/src/test/java/me/fixeddev/commandflow/annotated/CustomComponentParserTest.java (100%) rename {Brigadier => brigadier}/pom.xml (94%) rename {Brigadier => brigadier}/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandManager.java (100%) rename {Brigadier => brigadier}/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandWrapper.java (100%) rename {Brigadier => brigadier}/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierDefaultTranslationProvider.java (100%) rename {Brigadier => brigadier}/src/main/java/me/fixeddev/commandflow/brigadier/CommandBrigadierConverter.java (100%) rename {Brigadier => brigadier}/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNode.java (100%) rename {Brigadier => brigadier}/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNodeBuilder.java (100%) rename {Brigadier => brigadier}/src/main/java/me/fixeddev/commandflow/brigadier/PermissionRequirement.java (100%) rename {Bukkit => bukkit}/pom.xml (91%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/BukkitAuthorizer.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandManager.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandWrapper.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/BukkitDefaultTranslationProvider.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/MessageUtils.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Exact.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/annotation/PlayerOrSource.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Sender.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/factory/BukkitModule.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/factory/CommandSenderFactory.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/factory/GameModeFactory.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/factory/OfflinePlayerPartFactory.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerPartFactory.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerSenderFactory.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/factory/WorldFactory.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/part/BukkitParts.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/part/CommandSenderPart.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/part/GameModePart.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/part/OfflinePlayerPart.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerPart.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerSenderPart.java (100%) rename {Bukkit => bukkit}/src/main/java/me/fixeddev/commandflow/bukkit/part/WorldPart.java (100%) rename {Bungee => bungee}/pom.xml (90%) rename {Bungee => bungee}/src/main/java/me/fixeddev/commandflow/bungee/BungeeAuthorizer.java (100%) rename {Bungee => bungee}/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandManager.java (100%) rename {Bungee => bungee}/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandWrapper.java (100%) rename {Bungee => bungee}/src/main/java/me/fixeddev/commandflow/bungee/BungeeDefaultTranslationProvider.java (100%) rename {Bungee => bungee}/src/main/java/me/fixeddev/commandflow/bungee/MessageUtils.java (100%) rename {Bungee => bungee}/src/main/java/me/fixeddev/commandflow/bungee/annotation/ProxiedPlayerOrSource.java (100%) rename {Bungee => bungee}/src/main/java/me/fixeddev/commandflow/bungee/annotation/Sender.java (100%) rename {Bungee => bungee}/src/main/java/me/fixeddev/commandflow/bungee/factory/BungeeModule.java (100%) rename {Bungee => bungee}/src/main/java/me/fixeddev/commandflow/bungee/factory/CommandSenderPartFactory.java (100%) rename {Bungee => bungee}/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerPartFactory.java (100%) rename {Bungee => bungee}/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerSenderPartFactory.java (100%) rename {Bungee => bungee}/src/main/java/me/fixeddev/commandflow/bungee/part/CommandSenderPart.java (100%) rename {Bungee => bungee}/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerPart.java (100%) rename {Bungee => bungee}/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerSenderPart.java (100%) rename {Discord => discord}/pom.xml (90%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/DiscordAuthorizer.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/DiscordCommandManager.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/DiscordDefaultTranslationProvider.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/MessageListener.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/annotation/Sender.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/factory/DiscordModule.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/factory/MemberPartFactory.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/factory/MemberSenderPartFactory.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/factory/MessagePartFactory.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/factory/TextChannelPartFactory.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/factory/UserPartFactory.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/factory/UserSenderPartFactory.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/part/MemberPart.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/part/MemberSenderPart.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/part/MessagePart.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/part/TextChannelPart.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/part/UserPart.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/part/UserSenderPart.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/utils/ArgumentsUtils.java (100%) rename {Discord => discord}/src/main/java/me/fixeddev/commandflow/discord/utils/MessageUtils.java (100%) rename {Velocity => velocity}/pom.xml (90%) rename {Velocity => velocity}/src/main/java/me/fixeddev/commandflow/velocity/VelocityAuthorizer.java (100%) rename {Velocity => velocity}/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandManager.java (100%) rename {Velocity => velocity}/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandWrapper.java (100%) rename {Velocity => velocity}/src/main/java/me/fixeddev/commandflow/velocity/VelocityDefaultTranslationProvider.java (100%) rename {Velocity => velocity}/src/main/java/me/fixeddev/commandflow/velocity/annotation/PlayerOrSource.java (100%) rename {Velocity => velocity}/src/main/java/me/fixeddev/commandflow/velocity/annotation/Sender.java (100%) rename {Velocity => velocity}/src/main/java/me/fixeddev/commandflow/velocity/factory/CommandSourcePartFactory.java (100%) rename {Velocity => velocity}/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerPartFactory.java (100%) rename {Velocity => velocity}/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerSenderPartFactory.java (100%) rename {Velocity => velocity}/src/main/java/me/fixeddev/commandflow/velocity/factory/VelocityModule.java (100%) rename {Velocity => velocity}/src/main/java/me/fixeddev/commandflow/velocity/part/CommandSenderPart.java (100%) rename {Velocity => velocity}/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerPart.java (100%) rename {Velocity => velocity}/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerSenderPart.java (100%) diff --git a/Universal/pom.xml b/api/pom.xml similarity index 95% rename from Universal/pom.xml rename to api/pom.xml index 26e3b865..8e71c2c4 100644 --- a/Universal/pom.xml +++ b/api/pom.xml @@ -9,8 +9,8 @@ 4.0.0 - ${version.universal} - commandflow-universal + ${version.api} + commandflow-api jar diff --git a/Universal/src/main/java/me/fixeddev/commandflow/Authorizer.java b/api/src/main/java/me/fixeddev/commandflow/Authorizer.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/Authorizer.java rename to api/src/main/java/me/fixeddev/commandflow/Authorizer.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/CommandContext.java b/api/src/main/java/me/fixeddev/commandflow/CommandContext.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/CommandContext.java rename to api/src/main/java/me/fixeddev/commandflow/CommandContext.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/CommandManager.java b/api/src/main/java/me/fixeddev/commandflow/CommandManager.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/CommandManager.java rename to api/src/main/java/me/fixeddev/commandflow/CommandManager.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/ContextSnapshot.java b/api/src/main/java/me/fixeddev/commandflow/ContextSnapshot.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/ContextSnapshot.java rename to api/src/main/java/me/fixeddev/commandflow/ContextSnapshot.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/ErrorHandler.java b/api/src/main/java/me/fixeddev/commandflow/ErrorHandler.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/ErrorHandler.java rename to api/src/main/java/me/fixeddev/commandflow/ErrorHandler.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/Namespace.java b/api/src/main/java/me/fixeddev/commandflow/Namespace.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/Namespace.java rename to api/src/main/java/me/fixeddev/commandflow/Namespace.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/NamespaceImpl.java b/api/src/main/java/me/fixeddev/commandflow/NamespaceImpl.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/NamespaceImpl.java rename to api/src/main/java/me/fixeddev/commandflow/NamespaceImpl.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/ParseResult.java b/api/src/main/java/me/fixeddev/commandflow/ParseResult.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/ParseResult.java rename to api/src/main/java/me/fixeddev/commandflow/ParseResult.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/SimpleCommandContext.java b/api/src/main/java/me/fixeddev/commandflow/SimpleCommandContext.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/SimpleCommandContext.java rename to api/src/main/java/me/fixeddev/commandflow/SimpleCommandContext.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/SimpleCommandManager.java b/api/src/main/java/me/fixeddev/commandflow/SimpleCommandManager.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/SimpleCommandManager.java rename to api/src/main/java/me/fixeddev/commandflow/SimpleCommandManager.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/SimpleErrorHandler.java b/api/src/main/java/me/fixeddev/commandflow/SimpleErrorHandler.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/SimpleErrorHandler.java rename to api/src/main/java/me/fixeddev/commandflow/SimpleErrorHandler.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilder.java b/api/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilder.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilder.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilder.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java b/api/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/CommandClass.java b/api/src/main/java/me/fixeddev/commandflow/annotated/CommandClass.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/CommandClass.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/CommandClass.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/ReflectionInstanceCreator.java b/api/src/main/java/me/fixeddev/commandflow/annotated/ReflectionInstanceCreator.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/ReflectionInstanceCreator.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/ReflectionInstanceCreator.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/ReflectionSubCommandHandler.java b/api/src/main/java/me/fixeddev/commandflow/annotated/ReflectionSubCommandHandler.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/ReflectionSubCommandHandler.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/ReflectionSubCommandHandler.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/SubCommandInstanceCreator.java b/api/src/main/java/me/fixeddev/commandflow/annotated/SubCommandInstanceCreator.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/SubCommandInstanceCreator.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/SubCommandInstanceCreator.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/action/ReflectiveAction.java b/api/src/main/java/me/fixeddev/commandflow/annotated/action/ReflectiveAction.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/action/ReflectiveAction.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/action/ReflectiveAction.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/action/ValueGetter.java b/api/src/main/java/me/fixeddev/commandflow/annotated/action/ValueGetter.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/action/ValueGetter.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/action/ValueGetter.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/ArgOrSub.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/ArgOrSub.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/ArgOrSub.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/ArgOrSub.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Command.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Command.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Command.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Command.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/ConsumeAll.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/ConsumeAll.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/ConsumeAll.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/ConsumeAll.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Flag.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Flag.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Flag.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Flag.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Handler.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Handler.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Handler.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Handler.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Limit.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Limit.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Limit.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Limit.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Named.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Named.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Named.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Named.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/OptArg.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/OptArg.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/OptArg.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/OptArg.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/ParentArg.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/ParentArg.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/ParentArg.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/ParentArg.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Range.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Range.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Range.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Range.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Required.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Required.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Required.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Required.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Rewrites.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Rewrites.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Rewrites.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Rewrites.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Strict.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Strict.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Strict.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Strict.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/SubCommandClasses.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/SubCommandClasses.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/SubCommandClasses.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/SubCommandClasses.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Suggestions.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Suggestions.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Suggestions.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Suggestions.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Switch.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Switch.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Switch.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Switch.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Text.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Text.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Text.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Text.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Usage.java b/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Usage.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/annotation/Usage.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Usage.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilder.java b/api/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilder.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilder.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilder.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilderImpl.java b/api/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilderImpl.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilderImpl.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilderImpl.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/Buildable.java b/api/src/main/java/me/fixeddev/commandflow/annotated/builder/Buildable.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/Buildable.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/builder/Buildable.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandActionNode.java b/api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandActionNode.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandActionNode.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandActionNode.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandBuilderNodesImpl.java b/api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandBuilderNodesImpl.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandBuilderNodesImpl.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandBuilderNodesImpl.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandDataNode.java b/api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandDataNode.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandDataNode.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandDataNode.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandModifiersNode.java b/api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandModifiersNode.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandModifiersNode.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandModifiersNode.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandPartsNode.java b/api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandPartsNode.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandPartsNode.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandPartsNode.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/SubCommandsNode.java b/api/src/main/java/me/fixeddev/commandflow/annotated/builder/SubCommandsNode.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/builder/SubCommandsNode.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/builder/SubCommandsNode.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/modifier/CommandModifierFactory.java b/api/src/main/java/me/fixeddev/commandflow/annotated/modifier/CommandModifierFactory.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/modifier/CommandModifierFactory.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/modifier/CommandModifierFactory.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/AbstractModule.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/AbstractModule.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/AbstractModule.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/AbstractModule.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/DelegatePartModifier.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/DelegatePartModifier.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/DelegatePartModifier.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/DelegatePartModifier.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/Key.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/Key.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/Key.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/Key.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/Module.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/Module.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/Module.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/Module.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/PartFactory.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/PartFactory.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/PartFactory.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/PartFactory.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/PartInjector.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/PartInjector.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/PartInjector.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/PartInjector.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/PartModifier.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/PartModifier.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/PartModifier.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/PartModifier.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/SimplePartInjector.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/SimplePartInjector.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/SimplePartInjector.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/SimplePartInjector.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/DefaultsModule.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/DefaultsModule.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/DefaultsModule.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/DefaultsModule.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ArgumentStackPartFactory.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ArgumentStackPartFactory.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ArgumentStackPartFactory.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ArgumentStackPartFactory.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/BooleanPartFactory.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/BooleanPartFactory.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/BooleanPartFactory.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/BooleanPartFactory.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ContextFactory.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ContextFactory.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ContextFactory.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ContextFactory.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/DoublePartFactory.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/DoublePartFactory.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/DoublePartFactory.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/DoublePartFactory.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/EnumPartFactory.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/EnumPartFactory.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/EnumPartFactory.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/EnumPartFactory.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/FloatPartFactory.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/FloatPartFactory.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/FloatPartFactory.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/FloatPartFactory.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/IntegerPartFactory.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/IntegerPartFactory.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/IntegerPartFactory.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/IntegerPartFactory.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/LongPartFactory.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/LongPartFactory.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/LongPartFactory.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/LongPartFactory.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringPartFactory.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringPartFactory.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringPartFactory.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringPartFactory.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringTextPartFactory.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringTextPartFactory.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringTextPartFactory.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringTextPartFactory.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/SwitchPartFactory.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/SwitchPartFactory.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/SwitchPartFactory.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/SwitchPartFactory.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/LimitModifier.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/LimitModifier.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/LimitModifier.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/LimitModifier.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/OptionalModifier.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/OptionalModifier.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/OptionalModifier.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/OptionalModifier.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/RewritesModifier.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/RewritesModifier.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/RewritesModifier.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/RewritesModifier.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/SuggestionsModifier.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/SuggestionsModifier.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/SuggestionsModifier.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/SuggestionsModifier.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/ValueFlagModifier.java b/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/ValueFlagModifier.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/ValueFlagModifier.java rename to api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/ValueFlagModifier.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/command/Action.java b/api/src/main/java/me/fixeddev/commandflow/command/Action.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/command/Action.java rename to api/src/main/java/me/fixeddev/commandflow/command/Action.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/command/Command.java b/api/src/main/java/me/fixeddev/commandflow/command/Command.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/command/Command.java rename to api/src/main/java/me/fixeddev/commandflow/command/Command.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/command/SimpleCommand.java b/api/src/main/java/me/fixeddev/commandflow/command/SimpleCommand.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/command/SimpleCommand.java rename to api/src/main/java/me/fixeddev/commandflow/command/SimpleCommand.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifier.java b/api/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifier.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifier.java rename to api/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifier.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifiers.java b/api/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifiers.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifiers.java rename to api/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifiers.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/command/modifiers/FallbackCommandModifiers.java b/api/src/main/java/me/fixeddev/commandflow/command/modifiers/FallbackCommandModifiers.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/command/modifiers/FallbackCommandModifiers.java rename to api/src/main/java/me/fixeddev/commandflow/command/modifiers/FallbackCommandModifiers.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierPhase.java b/api/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierPhase.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierPhase.java rename to api/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierPhase.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierUtils.java b/api/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierUtils.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierUtils.java rename to api/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierUtils.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/command/modifiers/SequentialCommandModifier.java b/api/src/main/java/me/fixeddev/commandflow/command/modifiers/SequentialCommandModifier.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/command/modifiers/SequentialCommandModifier.java rename to api/src/main/java/me/fixeddev/commandflow/command/modifiers/SequentialCommandModifier.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/command/modifiers/SimpleCommandModifiers.java b/api/src/main/java/me/fixeddev/commandflow/command/modifiers/SimpleCommandModifiers.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/command/modifiers/SimpleCommandModifiers.java rename to api/src/main/java/me/fixeddev/commandflow/command/modifiers/SimpleCommandModifiers.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/exception/ArgumentException.java b/api/src/main/java/me/fixeddev/commandflow/exception/ArgumentException.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/exception/ArgumentException.java rename to api/src/main/java/me/fixeddev/commandflow/exception/ArgumentException.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/exception/ArgumentParseException.java b/api/src/main/java/me/fixeddev/commandflow/exception/ArgumentParseException.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/exception/ArgumentParseException.java rename to api/src/main/java/me/fixeddev/commandflow/exception/ArgumentParseException.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/exception/CommandException.java b/api/src/main/java/me/fixeddev/commandflow/exception/CommandException.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/exception/CommandException.java rename to api/src/main/java/me/fixeddev/commandflow/exception/CommandException.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/exception/CommandUsage.java b/api/src/main/java/me/fixeddev/commandflow/exception/CommandUsage.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/exception/CommandUsage.java rename to api/src/main/java/me/fixeddev/commandflow/exception/CommandUsage.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/exception/InvalidSubCommandException.java b/api/src/main/java/me/fixeddev/commandflow/exception/InvalidSubCommandException.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/exception/InvalidSubCommandException.java rename to api/src/main/java/me/fixeddev/commandflow/exception/InvalidSubCommandException.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/exception/NoMoreArgumentsException.java b/api/src/main/java/me/fixeddev/commandflow/exception/NoMoreArgumentsException.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/exception/NoMoreArgumentsException.java rename to api/src/main/java/me/fixeddev/commandflow/exception/NoMoreArgumentsException.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/exception/NoPermissionsException.java b/api/src/main/java/me/fixeddev/commandflow/exception/NoPermissionsException.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/exception/NoPermissionsException.java rename to api/src/main/java/me/fixeddev/commandflow/exception/NoPermissionsException.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/exception/StopParseException.java b/api/src/main/java/me/fixeddev/commandflow/exception/StopParseException.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/exception/StopParseException.java rename to api/src/main/java/me/fixeddev/commandflow/exception/StopParseException.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/executor/DefaultExecutor.java b/api/src/main/java/me/fixeddev/commandflow/executor/DefaultExecutor.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/executor/DefaultExecutor.java rename to api/src/main/java/me/fixeddev/commandflow/executor/DefaultExecutor.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/executor/Executor.java b/api/src/main/java/me/fixeddev/commandflow/executor/Executor.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/executor/Executor.java rename to api/src/main/java/me/fixeddev/commandflow/executor/Executor.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/input/InputTokenizer.java b/api/src/main/java/me/fixeddev/commandflow/input/InputTokenizer.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/input/InputTokenizer.java rename to api/src/main/java/me/fixeddev/commandflow/input/InputTokenizer.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/input/QuotedSpaceTokenizer.java b/api/src/main/java/me/fixeddev/commandflow/input/QuotedSpaceTokenizer.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/input/QuotedSpaceTokenizer.java rename to api/src/main/java/me/fixeddev/commandflow/input/QuotedSpaceTokenizer.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/input/StringSpaceTokenizer.java b/api/src/main/java/me/fixeddev/commandflow/input/StringSpaceTokenizer.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/input/StringSpaceTokenizer.java rename to api/src/main/java/me/fixeddev/commandflow/input/StringSpaceTokenizer.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/ArgumentPart.java b/api/src/main/java/me/fixeddev/commandflow/part/ArgumentPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/ArgumentPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/ArgumentPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/CommandPart.java b/api/src/main/java/me/fixeddev/commandflow/part/CommandPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/CommandPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/CommandPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/Parts.java b/api/src/main/java/me/fixeddev/commandflow/part/Parts.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/Parts.java rename to api/src/main/java/me/fixeddev/commandflow/part/Parts.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/PartsWrapper.java b/api/src/main/java/me/fixeddev/commandflow/part/PartsWrapper.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/PartsWrapper.java rename to api/src/main/java/me/fixeddev/commandflow/part/PartsWrapper.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/SinglePartWrapper.java b/api/src/main/java/me/fixeddev/commandflow/part/SinglePartWrapper.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/SinglePartWrapper.java rename to api/src/main/java/me/fixeddev/commandflow/part/SinglePartWrapper.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentRewriterPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentRewriterPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentRewriterPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentRewriterPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentStackPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentStackPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentStackPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentStackPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/BooleanPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/BooleanPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/BooleanPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/BooleanPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/ContextPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/ContextPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/ContextPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/ContextPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/DoublePart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/DoublePart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/DoublePart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/DoublePart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/EmptyPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/EmptyPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/EmptyPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/EmptyPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/EnumPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/EnumPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/EnumPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/EnumPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/FirstMatchPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/FirstMatchPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/FirstMatchPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/FirstMatchPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/FloatPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/FloatPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/FloatPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/FloatPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/IntegerPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/IntegerPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/IntegerPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/IntegerPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/LimitingPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/LimitingPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/LimitingPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/LimitingPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/LongPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/LongPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/LongPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/LongPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/OptionalPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/OptionalPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/OptionalPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/OptionalPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/PrimitivePart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/PrimitivePart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/PrimitivePart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/PrimitivePart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/SequentialCommandPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/SequentialCommandPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/SequentialCommandPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/SequentialCommandPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/StringPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/StringPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/StringPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/StringPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/SubCommandPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/SubCommandPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/SubCommandPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/SubCommandPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/SuggestionsModifierPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/SuggestionsModifierPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/SuggestionsModifierPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/SuggestionsModifierPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/SwitchPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/SwitchPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/SwitchPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/SwitchPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/defaults/ValueFlagPart.java b/api/src/main/java/me/fixeddev/commandflow/part/defaults/ValueFlagPart.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/defaults/ValueFlagPart.java rename to api/src/main/java/me/fixeddev/commandflow/part/defaults/ValueFlagPart.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/visitor/CommandPartVisitor.java b/api/src/main/java/me/fixeddev/commandflow/part/visitor/CommandPartVisitor.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/visitor/CommandPartVisitor.java rename to api/src/main/java/me/fixeddev/commandflow/part/visitor/CommandPartVisitor.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/part/visitor/UnwrappedCommandPartVisitor.java b/api/src/main/java/me/fixeddev/commandflow/part/visitor/UnwrappedCommandPartVisitor.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/part/visitor/UnwrappedCommandPartVisitor.java rename to api/src/main/java/me/fixeddev/commandflow/part/visitor/UnwrappedCommandPartVisitor.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/stack/ArgumentStack.java b/api/src/main/java/me/fixeddev/commandflow/stack/ArgumentStack.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/stack/ArgumentStack.java rename to api/src/main/java/me/fixeddev/commandflow/stack/ArgumentStack.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/stack/SimpleArgumentStack.java b/api/src/main/java/me/fixeddev/commandflow/stack/SimpleArgumentStack.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/stack/SimpleArgumentStack.java rename to api/src/main/java/me/fixeddev/commandflow/stack/SimpleArgumentStack.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/stack/StackSnapshot.java b/api/src/main/java/me/fixeddev/commandflow/stack/StackSnapshot.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/stack/StackSnapshot.java rename to api/src/main/java/me/fixeddev/commandflow/stack/StackSnapshot.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/translator/ComponentRendererTranslator.java b/api/src/main/java/me/fixeddev/commandflow/translator/ComponentRendererTranslator.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/translator/ComponentRendererTranslator.java rename to api/src/main/java/me/fixeddev/commandflow/translator/ComponentRendererTranslator.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/translator/DefaultMapTranslationProvider.java b/api/src/main/java/me/fixeddev/commandflow/translator/DefaultMapTranslationProvider.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/translator/DefaultMapTranslationProvider.java rename to api/src/main/java/me/fixeddev/commandflow/translator/DefaultMapTranslationProvider.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/translator/DefaultTranslator.java b/api/src/main/java/me/fixeddev/commandflow/translator/DefaultTranslator.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/translator/DefaultTranslator.java rename to api/src/main/java/me/fixeddev/commandflow/translator/DefaultTranslator.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/translator/TranslationProvider.java b/api/src/main/java/me/fixeddev/commandflow/translator/TranslationProvider.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/translator/TranslationProvider.java rename to api/src/main/java/me/fixeddev/commandflow/translator/TranslationProvider.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/translator/Translator.java b/api/src/main/java/me/fixeddev/commandflow/translator/Translator.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/translator/Translator.java rename to api/src/main/java/me/fixeddev/commandflow/translator/Translator.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/usage/DefaultUsageBuilder.java b/api/src/main/java/me/fixeddev/commandflow/usage/DefaultUsageBuilder.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/usage/DefaultUsageBuilder.java rename to api/src/main/java/me/fixeddev/commandflow/usage/DefaultUsageBuilder.java diff --git a/Universal/src/main/java/me/fixeddev/commandflow/usage/UsageBuilder.java b/api/src/main/java/me/fixeddev/commandflow/usage/UsageBuilder.java similarity index 100% rename from Universal/src/main/java/me/fixeddev/commandflow/usage/UsageBuilder.java rename to api/src/main/java/me/fixeddev/commandflow/usage/UsageBuilder.java diff --git a/Universal/src/test/java/me/fixeddev/commandflow/InputTokenizerTest.java b/api/src/test/java/me/fixeddev/commandflow/InputTokenizerTest.java similarity index 100% rename from Universal/src/test/java/me/fixeddev/commandflow/InputTokenizerTest.java rename to api/src/test/java/me/fixeddev/commandflow/InputTokenizerTest.java diff --git a/Universal/src/test/java/me/fixeddev/commandflow/ParameterizedPartTest.java b/api/src/test/java/me/fixeddev/commandflow/ParameterizedPartTest.java similarity index 100% rename from Universal/src/test/java/me/fixeddev/commandflow/ParameterizedPartTest.java rename to api/src/test/java/me/fixeddev/commandflow/ParameterizedPartTest.java diff --git a/Universal/src/test/java/me/fixeddev/commandflow/annotated/CustomComponentParserTest.java b/api/src/test/java/me/fixeddev/commandflow/annotated/CustomComponentParserTest.java similarity index 100% rename from Universal/src/test/java/me/fixeddev/commandflow/annotated/CustomComponentParserTest.java rename to api/src/test/java/me/fixeddev/commandflow/annotated/CustomComponentParserTest.java diff --git a/Brigadier/pom.xml b/brigadier/pom.xml similarity index 94% rename from Brigadier/pom.xml rename to brigadier/pom.xml index e7e82608..429d7f3e 100644 --- a/Brigadier/pom.xml +++ b/brigadier/pom.xml @@ -27,8 +27,8 @@ me.fixeddev - commandflow-universal - ${version.universal} + commandflow-api + ${version.api} compile diff --git a/Brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandManager.java b/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandManager.java similarity index 100% rename from Brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandManager.java rename to brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandManager.java diff --git a/Brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandWrapper.java b/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandWrapper.java similarity index 100% rename from Brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandWrapper.java rename to brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandWrapper.java diff --git a/Brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierDefaultTranslationProvider.java b/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierDefaultTranslationProvider.java similarity index 100% rename from Brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierDefaultTranslationProvider.java rename to brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierDefaultTranslationProvider.java diff --git a/Brigadier/src/main/java/me/fixeddev/commandflow/brigadier/CommandBrigadierConverter.java b/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/CommandBrigadierConverter.java similarity index 100% rename from Brigadier/src/main/java/me/fixeddev/commandflow/brigadier/CommandBrigadierConverter.java rename to brigadier/src/main/java/me/fixeddev/commandflow/brigadier/CommandBrigadierConverter.java diff --git a/Brigadier/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNode.java b/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNode.java similarity index 100% rename from Brigadier/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNode.java rename to brigadier/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNode.java diff --git a/Brigadier/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNodeBuilder.java b/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNodeBuilder.java similarity index 100% rename from Brigadier/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNodeBuilder.java rename to brigadier/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNodeBuilder.java diff --git a/Brigadier/src/main/java/me/fixeddev/commandflow/brigadier/PermissionRequirement.java b/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/PermissionRequirement.java similarity index 100% rename from Brigadier/src/main/java/me/fixeddev/commandflow/brigadier/PermissionRequirement.java rename to brigadier/src/main/java/me/fixeddev/commandflow/brigadier/PermissionRequirement.java diff --git a/Bukkit/pom.xml b/bukkit/pom.xml similarity index 91% rename from Bukkit/pom.xml rename to bukkit/pom.xml index 1f416ed3..e50ee13a 100644 --- a/Bukkit/pom.xml +++ b/bukkit/pom.xml @@ -30,8 +30,8 @@ me.fixeddev - commandflow-universal - ${version.universal} + commandflow-api + ${version.api} compile diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitAuthorizer.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitAuthorizer.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitAuthorizer.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitAuthorizer.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandManager.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandManager.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandManager.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandManager.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandWrapper.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandWrapper.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandWrapper.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandWrapper.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitDefaultTranslationProvider.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitDefaultTranslationProvider.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitDefaultTranslationProvider.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitDefaultTranslationProvider.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/MessageUtils.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/MessageUtils.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/MessageUtils.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/MessageUtils.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Exact.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Exact.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Exact.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Exact.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/PlayerOrSource.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/PlayerOrSource.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/PlayerOrSource.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/PlayerOrSource.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Sender.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Sender.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Sender.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Sender.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/BukkitModule.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/BukkitModule.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/BukkitModule.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/BukkitModule.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/CommandSenderFactory.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/CommandSenderFactory.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/CommandSenderFactory.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/CommandSenderFactory.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/GameModeFactory.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/GameModeFactory.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/GameModeFactory.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/GameModeFactory.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/OfflinePlayerPartFactory.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/OfflinePlayerPartFactory.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/OfflinePlayerPartFactory.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/OfflinePlayerPartFactory.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerPartFactory.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerPartFactory.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerPartFactory.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerPartFactory.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerSenderFactory.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerSenderFactory.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerSenderFactory.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerSenderFactory.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/WorldFactory.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/WorldFactory.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/WorldFactory.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/WorldFactory.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/BukkitParts.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/BukkitParts.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/BukkitParts.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/BukkitParts.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/CommandSenderPart.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/CommandSenderPart.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/CommandSenderPart.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/CommandSenderPart.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/GameModePart.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/GameModePart.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/GameModePart.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/GameModePart.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/OfflinePlayerPart.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/OfflinePlayerPart.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/OfflinePlayerPart.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/OfflinePlayerPart.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerPart.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerPart.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerPart.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerPart.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerSenderPart.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerSenderPart.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerSenderPart.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerSenderPart.java diff --git a/Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/WorldPart.java b/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/WorldPart.java similarity index 100% rename from Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/WorldPart.java rename to bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/WorldPart.java diff --git a/Bungee/pom.xml b/bungee/pom.xml similarity index 90% rename from Bungee/pom.xml rename to bungee/pom.xml index f73e62f6..dc6551ef 100644 --- a/Bungee/pom.xml +++ b/bungee/pom.xml @@ -22,8 +22,8 @@ me.fixeddev - commandflow-universal - ${version.universal} + commandflow-api + ${version.api} compile diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeAuthorizer.java b/bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeAuthorizer.java similarity index 100% rename from Bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeAuthorizer.java rename to bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeAuthorizer.java diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandManager.java b/bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandManager.java similarity index 100% rename from Bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandManager.java rename to bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandManager.java diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandWrapper.java b/bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandWrapper.java similarity index 100% rename from Bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandWrapper.java rename to bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandWrapper.java diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeDefaultTranslationProvider.java b/bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeDefaultTranslationProvider.java similarity index 100% rename from Bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeDefaultTranslationProvider.java rename to bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeDefaultTranslationProvider.java diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/MessageUtils.java b/bungee/src/main/java/me/fixeddev/commandflow/bungee/MessageUtils.java similarity index 100% rename from Bungee/src/main/java/me/fixeddev/commandflow/bungee/MessageUtils.java rename to bungee/src/main/java/me/fixeddev/commandflow/bungee/MessageUtils.java diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/ProxiedPlayerOrSource.java b/bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/ProxiedPlayerOrSource.java similarity index 100% rename from Bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/ProxiedPlayerOrSource.java rename to bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/ProxiedPlayerOrSource.java diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/Sender.java b/bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/Sender.java similarity index 100% rename from Bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/Sender.java rename to bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/Sender.java diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/BungeeModule.java b/bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/BungeeModule.java similarity index 100% rename from Bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/BungeeModule.java rename to bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/BungeeModule.java diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/CommandSenderPartFactory.java b/bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/CommandSenderPartFactory.java similarity index 100% rename from Bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/CommandSenderPartFactory.java rename to bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/CommandSenderPartFactory.java diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerPartFactory.java b/bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerPartFactory.java similarity index 100% rename from Bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerPartFactory.java rename to bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerPartFactory.java diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerSenderPartFactory.java b/bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerSenderPartFactory.java similarity index 100% rename from Bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerSenderPartFactory.java rename to bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerSenderPartFactory.java diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/part/CommandSenderPart.java b/bungee/src/main/java/me/fixeddev/commandflow/bungee/part/CommandSenderPart.java similarity index 100% rename from Bungee/src/main/java/me/fixeddev/commandflow/bungee/part/CommandSenderPart.java rename to bungee/src/main/java/me/fixeddev/commandflow/bungee/part/CommandSenderPart.java diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerPart.java b/bungee/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerPart.java similarity index 100% rename from Bungee/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerPart.java rename to bungee/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerPart.java diff --git a/Bungee/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerSenderPart.java b/bungee/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerSenderPart.java similarity index 100% rename from Bungee/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerSenderPart.java rename to bungee/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerSenderPart.java diff --git a/Discord/pom.xml b/discord/pom.xml similarity index 90% rename from Discord/pom.xml rename to discord/pom.xml index 59e048be..e72cb1ed 100644 --- a/Discord/pom.xml +++ b/discord/pom.xml @@ -29,8 +29,8 @@ me.fixeddev - commandflow-universal - ${version.universal} + commandflow-api + ${version.api} compile diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/DiscordAuthorizer.java b/discord/src/main/java/me/fixeddev/commandflow/discord/DiscordAuthorizer.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/DiscordAuthorizer.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/DiscordAuthorizer.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/DiscordCommandManager.java b/discord/src/main/java/me/fixeddev/commandflow/discord/DiscordCommandManager.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/DiscordCommandManager.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/DiscordCommandManager.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/DiscordDefaultTranslationProvider.java b/discord/src/main/java/me/fixeddev/commandflow/discord/DiscordDefaultTranslationProvider.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/DiscordDefaultTranslationProvider.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/DiscordDefaultTranslationProvider.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/MessageListener.java b/discord/src/main/java/me/fixeddev/commandflow/discord/MessageListener.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/MessageListener.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/MessageListener.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/annotation/Sender.java b/discord/src/main/java/me/fixeddev/commandflow/discord/annotation/Sender.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/annotation/Sender.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/annotation/Sender.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/factory/DiscordModule.java b/discord/src/main/java/me/fixeddev/commandflow/discord/factory/DiscordModule.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/factory/DiscordModule.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/factory/DiscordModule.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/factory/MemberPartFactory.java b/discord/src/main/java/me/fixeddev/commandflow/discord/factory/MemberPartFactory.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/factory/MemberPartFactory.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/factory/MemberPartFactory.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/factory/MemberSenderPartFactory.java b/discord/src/main/java/me/fixeddev/commandflow/discord/factory/MemberSenderPartFactory.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/factory/MemberSenderPartFactory.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/factory/MemberSenderPartFactory.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/factory/MessagePartFactory.java b/discord/src/main/java/me/fixeddev/commandflow/discord/factory/MessagePartFactory.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/factory/MessagePartFactory.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/factory/MessagePartFactory.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/factory/TextChannelPartFactory.java b/discord/src/main/java/me/fixeddev/commandflow/discord/factory/TextChannelPartFactory.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/factory/TextChannelPartFactory.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/factory/TextChannelPartFactory.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/factory/UserPartFactory.java b/discord/src/main/java/me/fixeddev/commandflow/discord/factory/UserPartFactory.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/factory/UserPartFactory.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/factory/UserPartFactory.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/factory/UserSenderPartFactory.java b/discord/src/main/java/me/fixeddev/commandflow/discord/factory/UserSenderPartFactory.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/factory/UserSenderPartFactory.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/factory/UserSenderPartFactory.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/part/MemberPart.java b/discord/src/main/java/me/fixeddev/commandflow/discord/part/MemberPart.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/part/MemberPart.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/part/MemberPart.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/part/MemberSenderPart.java b/discord/src/main/java/me/fixeddev/commandflow/discord/part/MemberSenderPart.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/part/MemberSenderPart.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/part/MemberSenderPart.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/part/MessagePart.java b/discord/src/main/java/me/fixeddev/commandflow/discord/part/MessagePart.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/part/MessagePart.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/part/MessagePart.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/part/TextChannelPart.java b/discord/src/main/java/me/fixeddev/commandflow/discord/part/TextChannelPart.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/part/TextChannelPart.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/part/TextChannelPart.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/part/UserPart.java b/discord/src/main/java/me/fixeddev/commandflow/discord/part/UserPart.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/part/UserPart.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/part/UserPart.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/part/UserSenderPart.java b/discord/src/main/java/me/fixeddev/commandflow/discord/part/UserSenderPart.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/part/UserSenderPart.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/part/UserSenderPart.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/utils/ArgumentsUtils.java b/discord/src/main/java/me/fixeddev/commandflow/discord/utils/ArgumentsUtils.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/utils/ArgumentsUtils.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/utils/ArgumentsUtils.java diff --git a/Discord/src/main/java/me/fixeddev/commandflow/discord/utils/MessageUtils.java b/discord/src/main/java/me/fixeddev/commandflow/discord/utils/MessageUtils.java similarity index 100% rename from Discord/src/main/java/me/fixeddev/commandflow/discord/utils/MessageUtils.java rename to discord/src/main/java/me/fixeddev/commandflow/discord/utils/MessageUtils.java diff --git a/pom.xml b/pom.xml index b94cef60..b1624ed4 100644 --- a/pom.xml +++ b/pom.xml @@ -8,12 +8,12 @@ commandflow 0.6.0 - Universal - Bukkit - Discord - Bungee - Velocity - Brigadier + api + bukkit + discord + bungee + velocity + brigadier pom @@ -43,8 +43,7 @@ UTF-8 - 0.6.0 - 0.6.0 + 0.6.0 0.6.0 0.6.0 0.6.0 diff --git a/Velocity/pom.xml b/velocity/pom.xml similarity index 90% rename from Velocity/pom.xml rename to velocity/pom.xml index 8a2d24d1..c9161bd5 100644 --- a/Velocity/pom.xml +++ b/velocity/pom.xml @@ -22,8 +22,8 @@ me.fixeddev - commandflow-universal - ${version.universal} + commandflow-api + ${version.api} compile diff --git a/Velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityAuthorizer.java b/velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityAuthorizer.java similarity index 100% rename from Velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityAuthorizer.java rename to velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityAuthorizer.java diff --git a/Velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandManager.java b/velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandManager.java similarity index 100% rename from Velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandManager.java rename to velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandManager.java diff --git a/Velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandWrapper.java b/velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandWrapper.java similarity index 100% rename from Velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandWrapper.java rename to velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandWrapper.java diff --git a/Velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityDefaultTranslationProvider.java b/velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityDefaultTranslationProvider.java similarity index 100% rename from Velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityDefaultTranslationProvider.java rename to velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityDefaultTranslationProvider.java diff --git a/Velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/PlayerOrSource.java b/velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/PlayerOrSource.java similarity index 100% rename from Velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/PlayerOrSource.java rename to velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/PlayerOrSource.java diff --git a/Velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/Sender.java b/velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/Sender.java similarity index 100% rename from Velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/Sender.java rename to velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/Sender.java diff --git a/Velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/CommandSourcePartFactory.java b/velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/CommandSourcePartFactory.java similarity index 100% rename from Velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/CommandSourcePartFactory.java rename to velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/CommandSourcePartFactory.java diff --git a/Velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerPartFactory.java b/velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerPartFactory.java similarity index 100% rename from Velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerPartFactory.java rename to velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerPartFactory.java diff --git a/Velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerSenderPartFactory.java b/velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerSenderPartFactory.java similarity index 100% rename from Velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerSenderPartFactory.java rename to velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerSenderPartFactory.java diff --git a/Velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/VelocityModule.java b/velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/VelocityModule.java similarity index 100% rename from Velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/VelocityModule.java rename to velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/VelocityModule.java diff --git a/Velocity/src/main/java/me/fixeddev/commandflow/velocity/part/CommandSenderPart.java b/velocity/src/main/java/me/fixeddev/commandflow/velocity/part/CommandSenderPart.java similarity index 100% rename from Velocity/src/main/java/me/fixeddev/commandflow/velocity/part/CommandSenderPart.java rename to velocity/src/main/java/me/fixeddev/commandflow/velocity/part/CommandSenderPart.java diff --git a/Velocity/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerPart.java b/velocity/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerPart.java similarity index 100% rename from Velocity/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerPart.java rename to velocity/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerPart.java diff --git a/Velocity/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerSenderPart.java b/velocity/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerSenderPart.java similarity index 100% rename from Velocity/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerSenderPart.java rename to velocity/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerSenderPart.java From d79ae44ba49605affcb1c7acca5816aae179f96f Mon Sep 17 00:00:00 2001 From: yusshu Date: Sun, 29 Oct 2023 19:11:56 -0500 Subject: [PATCH 2/5] =?UTF-8?q?build:=20make=20all=20modules=20use=20the?= =?UTF-8?q?=20same=20version=20as=20parent,=20defined=20by=20the=20=C3=82'?= =?UTF-8?q?revision'=20property?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://maven.apache.org/maven-ci-friendly.html --- api/pom.xml | 6 ++---- brigadier/pom.xml | 10 ++++------ bukkit/pom.xml | 7 ++----- bungee/pom.xml | 9 ++++----- discord/pom.xml | 10 ++++------ pom.xml | 10 ++-------- velocity/pom.xml | 9 ++++----- 7 files changed, 22 insertions(+), 39 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 8e71c2c4..15d3142e 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -2,14 +2,12 @@ + 4.0.0 commandflow me.fixeddev - 0.6.0 + ${revision} - 4.0.0 - - ${version.api} commandflow-api jar diff --git a/brigadier/pom.xml b/brigadier/pom.xml index 429d7f3e..e4184aeb 100644 --- a/brigadier/pom.xml +++ b/brigadier/pom.xml @@ -2,14 +2,12 @@ + 4.0.0 commandflow me.fixeddev - 0.6.0 + ${revision} - 4.0.0 - - ${version.brigadier} commandflow-brigadier jar @@ -28,13 +26,13 @@ me.fixeddev commandflow-api - ${version.api} + ${revision} compile me.fixeddev commandflow-bukkit - ${version.bukkit} + ${project.version} compile diff --git a/bukkit/pom.xml b/bukkit/pom.xml index e50ee13a..4dedb035 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -3,14 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - commandflow me.fixeddev - 0.6.0 + ${revision} - - ${version.bukkit} commandflow-bukkit jar @@ -31,7 +28,7 @@ me.fixeddev commandflow-api - ${version.api} + ${project.version} compile diff --git a/bungee/pom.xml b/bungee/pom.xml index dc6551ef..f02d773d 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -2,15 +2,14 @@ + 4.0.0 me.fixeddev commandflow - 0.6.0 + ${revision} - 4.0.0 - - ${version.bungee} commandflow-bungee + jar @@ -23,7 +22,7 @@ me.fixeddev commandflow-api - ${version.api} + ${project.version} compile diff --git a/discord/pom.xml b/discord/pom.xml index e72cb1ed..d7524c81 100644 --- a/discord/pom.xml +++ b/discord/pom.xml @@ -2,14 +2,12 @@ + 4.0.0 - commandflow me.fixeddev - 0.6.0 + commandflow + ${revision} - 4.0.0 - - ${version.discord} commandflow-discord jar @@ -30,7 +28,7 @@ me.fixeddev commandflow-api - ${version.api} + ${project.version} compile diff --git a/pom.xml b/pom.xml index b1624ed4..0f0fd525 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ me.fixeddev commandflow - 0.6.0 + ${revision} api bukkit @@ -42,13 +42,7 @@ UTF-8 - - 0.6.0 - 0.6.0 - 0.6.0 - 0.6.0 - 0.6.0 - 0.6.0 + 0.6.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index c9161bd5..25558dfd 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -2,15 +2,14 @@ + 4.0.0 me.fixeddev commandflow - 0.6.0 + ${revision} - 4.0.0 - - ${version.velocity} commandflow-velocity + jar @@ -23,7 +22,7 @@ me.fixeddev commandflow-api - ${version.api} + ${project.version} compile From 2e283fd8ab001590695190d93f94c524c2d76118 Mon Sep 17 00:00:00 2001 From: yusshu Date: Sun, 29 Oct 2023 19:16:30 -0500 Subject: [PATCH 3/5] *: change groupId from me.fixeddev to team.unnamed --- api/pom.xml | 2 +- brigadier/pom.xml | 6 +++--- bukkit/pom.xml | 4 ++-- bungee/pom.xml | 4 ++-- discord/pom.xml | 4 ++-- docs/installation.md | 8 ++++---- docs/platforms/bukkit.md | 6 +++--- pom.xml | 2 +- velocity/pom.xml | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 15d3142e..6c73bb59 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + team.unnamed commandflow - me.fixeddev ${revision} commandflow-api diff --git a/brigadier/pom.xml b/brigadier/pom.xml index e4184aeb..023df43b 100644 --- a/brigadier/pom.xml +++ b/brigadier/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + team.unnamed commandflow - me.fixeddev ${revision} commandflow-brigadier @@ -24,13 +24,13 @@ - me.fixeddev + team.unnamed commandflow-api ${revision} compile - me.fixeddev + team.unnamed commandflow-bukkit ${project.version} compile diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 4dedb035..4a038003 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + team.unnamed commandflow - me.fixeddev ${revision} commandflow-bukkit @@ -26,7 +26,7 @@ provided - me.fixeddev + team.unnamed commandflow-api ${project.version} compile diff --git a/bungee/pom.xml b/bungee/pom.xml index f02d773d..fb30eea1 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - me.fixeddev + team.unnamed commandflow ${revision} @@ -20,7 +20,7 @@ - me.fixeddev + team.unnamed commandflow-api ${project.version} compile diff --git a/discord/pom.xml b/discord/pom.xml index d7524c81..63d3c50c 100644 --- a/discord/pom.xml +++ b/discord/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - me.fixeddev + team.unnamed commandflow ${revision} @@ -26,7 +26,7 @@ 4.2.0_208 - me.fixeddev + team.unnamed commandflow-api ${project.version} compile diff --git a/docs/installation.md b/docs/installation.md index 1c21ea84..8b4fc1bd 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -11,7 +11,7 @@ repositories { ``` ```kotlin dependencies { - implementation("me.fixeddev:commandflow-universal:%%REPLACE_latestReleaseOrSnapshot{me.fixeddev:commandflow-universal}%%") + implementation("team.unnamed:commandflow-api:%%REPLACE_latestReleaseOrSnapshot{team.unnamed:commandflow-api}%%") } ``` @@ -24,8 +24,8 @@ dependencies { ``` ```xml - me.fixeddev - commandflow-universal - %%REPLACE_latestReleaseOrSnapshot{me.fixeddev:commandflow-universal}%% + team.unnamed + commandflow-api + %%REPLACE_latestReleaseOrSnapshot{team.unnamed:commandflow-api}%% ``` diff --git a/docs/platforms/bukkit.md b/docs/platforms/bukkit.md index fb5a46b2..1c5e9138 100644 --- a/docs/platforms/bukkit.md +++ b/docs/platforms/bukkit.md @@ -8,7 +8,7 @@ subproject that can be included in your project by doing the following: ```kotlin dependencies { // ... - implementation("me.fixeddev:commandflow-bukkit:%%REPLACE_latestReleaseOrSnapshot{me.fixeddev:commandflow-bukkit}%%") + implementation("team.unnamed:commandflow-bukkit:%%REPLACE_latestReleaseOrSnapshot{team.unnamed:commandflow-bukkit}%%") } ``` @@ -17,9 +17,9 @@ dependencies { - me.fixeddev + team.unnamed commandflow-bukkit - %%REPLACE_latestReleaseOrSnapshot{me.fixeddev:commandflow-bukkit}%% + %%REPLACE_latestReleaseOrSnapshot{team.unnamed:commandflow-bukkit}%% ``` diff --git a/pom.xml b/pom.xml index 0f0fd525..056b67f2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - me.fixeddev + team.unnamed commandflow ${revision} diff --git a/velocity/pom.xml b/velocity/pom.xml index 25558dfd..4638be13 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - me.fixeddev + team.unnamed commandflow ${revision} @@ -20,7 +20,7 @@ - me.fixeddev + team.unnamed commandflow-api ${project.version} compile From b7857c89d581c34ad691cd0d48793c2dae759c45 Mon Sep 17 00:00:00 2001 From: yusshu Date: Mon, 30 Oct 2023 12:18:36 -0500 Subject: [PATCH 4/5] refactor!: move packages from me.fixeddev to team.unnamed --- .../builder/AnnotatedCommandBuilder.java | 23 -------- .../part/visitor/CommandPartVisitor.java | 21 ------- .../unnamed}/commandflow/Authorizer.java | 2 +- .../unnamed}/commandflow/CommandContext.java | 6 +- .../unnamed}/commandflow/CommandManager.java | 21 +++---- .../unnamed}/commandflow/ContextSnapshot.java | 6 +- .../unnamed}/commandflow/ErrorHandler.java | 2 +- .../unnamed}/commandflow/Namespace.java | 2 +- .../unnamed}/commandflow/NamespaceImpl.java | 2 +- .../unnamed}/commandflow/ParseResult.java | 4 +- .../commandflow/SimpleCommandContext.java | 6 +- .../commandflow/SimpleCommandManager.java | 48 ++++++++-------- .../commandflow/SimpleErrorHandler.java | 2 +- .../AnnotatedCommandTreeBuilder.java | 19 ++++--- .../AnnotatedCommandTreeBuilderImpl.java | 33 +++++------ .../commandflow/annotated/CommandClass.java | 2 +- .../annotated/ReflectionInstanceCreator.java | 2 +- .../ReflectionSubCommandHandler.java | 10 ++-- .../annotated/SubCommandInstanceCreator.java | 2 +- .../annotated/action/ReflectiveAction.java | 10 ++-- .../annotated/action/ValueGetter.java | 8 +-- .../annotated/annotation/ArgOrSub.java | 2 +- .../annotated/annotation/Command.java | 2 +- .../annotated/annotation/ConsumeAll.java | 2 +- .../annotated/annotation/Flag.java | 2 +- .../annotated/annotation/Handler.java | 2 +- .../annotated/annotation/Limit.java | 2 +- .../annotated/annotation/Named.java | 2 +- .../annotated/annotation/OptArg.java | 6 +- .../annotated/annotation/ParentArg.java | 2 +- .../annotated/annotation/Range.java | 2 +- .../annotated/annotation/Required.java | 2 +- .../annotated/annotation/Rewrites.java | 2 +- .../annotated/annotation/Strict.java | 2 +- .../annotation/SubCommandClasses.java | 4 +- .../annotated/annotation/Suggestions.java | 2 +- .../annotated/annotation/Switch.java | 2 +- .../annotated/annotation/Text.java | 2 +- .../annotated/annotation/Usage.java | 2 +- .../builder/AnnotatedCommandBuilder.java | 26 +++++++++ .../builder/AnnotatedCommandBuilderImpl.java | 4 +- .../annotated/builder/Buildable.java | 4 +- .../annotated/builder/CommandActionNode.java | 6 +- .../builder/CommandBuilderNodesImpl.java | 40 ++++++------- .../annotated/builder/CommandDataNode.java | 19 ++++--- .../builder/CommandModifiersNode.java | 16 +++--- .../annotated/builder/CommandPartsNode.java | 22 +++++--- .../annotated/builder/SubCommandsNode.java | 6 +- .../modifier/CommandModifierFactory.java | 6 +- .../annotated/part/AbstractModule.java | 4 +- .../annotated/part/DelegatePartModifier.java | 4 +- .../commandflow/annotated/part/Key.java | 2 +- .../commandflow/annotated/part/Module.java | 2 +- .../annotated/part/PartFactory.java | 4 +- .../annotated/part/PartInjector.java | 14 ++--- .../annotated/part/PartModifier.java | 4 +- .../annotated/part/SimplePartInjector.java | 4 +- .../part/defaults/DefaultsModule.java | 37 ++++++------ .../factory/ArgumentStackPartFactory.java | 8 +-- .../defaults/factory/BooleanPartFactory.java | 8 +-- .../part/defaults/factory/ContextFactory.java | 8 +-- .../defaults/factory/DoublePartFactory.java | 10 ++-- .../defaults/factory/EnumPartFactory.java | 8 +-- .../defaults/factory/FloatPartFactory.java | 10 ++-- .../defaults/factory/IntegerPartFactory.java | 10 ++-- .../defaults/factory/LongPartFactory.java | 12 ++-- .../defaults/factory/StringPartFactory.java | 10 ++-- .../factory/StringTextPartFactory.java | 8 +-- .../defaults/factory/SwitchPartFactory.java | 10 ++-- .../part/defaults/modifier/LimitModifier.java | 10 ++-- .../defaults/modifier/OptionalModifier.java | 13 ++--- .../defaults/modifier/RewritesModifier.java | 10 ++-- .../modifier/SuggestionsModifier.java | 10 ++-- .../defaults/modifier/ValueFlagModifier.java | 10 ++-- .../unnamed}/commandflow/command/Action.java | 9 +-- .../unnamed}/commandflow/command/Command.java | 14 ++--- .../commandflow/command/SimpleCommand.java | 10 ++-- .../command/modifiers/CommandModifier.java | 6 +- .../command/modifiers/CommandModifiers.java | 10 +--- .../modifiers/FallbackCommandModifiers.java | 2 +- .../command/modifiers/ModifierPhase.java | 2 +- .../command/modifiers/ModifierUtils.java | 2 +- .../modifiers/SequentialCommandModifier.java | 6 +- .../modifiers/SimpleCommandModifiers.java | 6 +- .../exception/ArgumentException.java | 6 +- .../exception/ArgumentParseException.java | 2 +- .../exception/CommandException.java | 4 +- .../commandflow/exception/CommandUsage.java | 2 +- .../exception/InvalidSubCommandException.java | 2 +- .../exception/NoMoreArgumentsException.java | 2 +- .../exception/NoPermissionsException.java | 2 +- .../exception/StopParseException.java | 2 +- .../commandflow/executor/DefaultExecutor.java | 10 ++-- .../commandflow/executor/Executor.java | 13 +++-- .../commandflow/input/InputTokenizer.java | 2 +- .../input/QuotedSpaceTokenizer.java | 2 +- .../input/StringSpaceTokenizer.java | 2 +- .../commandflow/part/ArgumentPart.java | 12 ++-- .../commandflow/part/CommandPart.java | 10 ++-- .../unnamed}/commandflow/part/Parts.java | 56 +++++++++---------- .../commandflow/part/PartsWrapper.java | 4 +- .../commandflow/part/SinglePartWrapper.java | 4 +- .../part/defaults/ArgumentRewriterPart.java | 12 ++-- .../part/defaults/ArgumentStackPart.java | 18 +++--- .../part/defaults/BooleanPart.java | 12 ++-- .../part/defaults/ContextPart.java | 10 ++-- .../commandflow/part/defaults/DoublePart.java | 14 ++--- .../commandflow/part/defaults/EmptyPart.java | 10 ++-- .../commandflow/part/defaults/EnumPart.java | 12 ++-- .../part/defaults/FirstMatchPart.java | 20 +++---- .../commandflow/part/defaults/FloatPart.java | 10 ++-- .../part/defaults/IntegerPart.java | 10 ++-- .../part/defaults/LimitingPart.java | 12 ++-- .../commandflow/part/defaults/LongPart.java | 10 ++-- .../part/defaults/OptionalPart.java | 26 ++++----- .../part/defaults/PrimitivePart.java | 8 +-- .../part/defaults/SequentialCommandPart.java | 12 ++-- .../commandflow/part/defaults/StringPart.java | 10 ++-- .../part/defaults/SubCommandPart.java | 41 +++++++------- .../defaults/SuggestionsModifierPart.java | 10 ++-- .../commandflow/part/defaults/SwitchPart.java | 12 ++-- .../part/defaults/ValueFlagPart.java | 18 +++--- .../part/visitor/CommandPartVisitor.java | 21 +++++++ .../visitor/UnwrappedCommandPartVisitor.java | 8 +-- .../commandflow/stack/ArgumentStack.java | 6 +- .../stack/SimpleArgumentStack.java | 6 +- .../commandflow/stack/StackSnapshot.java | 2 +- .../ComponentRendererTranslator.java | 5 +- .../DefaultMapTranslationProvider.java | 4 +- .../translator/DefaultTranslator.java | 4 +- .../translator/TranslationProvider.java | 4 +- .../commandflow/translator/Translator.java | 4 +- .../usage/DefaultUsageBuilder.java | 6 +- .../commandflow/usage/UsageBuilder.java | 7 ++- .../commandflow/InputTokenizerTest.java | 6 +- .../commandflow/ParameterizedPartTest.java | 23 ++++---- .../annotated/CustomComponentParserTest.java | 12 ++-- .../brigadier/BrigadierCommandManager.java | 21 ++++--- .../brigadier/BrigadierCommandWrapper.java | 10 ++-- .../BrigadierDefaultTranslationProvider.java | 4 +- .../brigadier/CommandBrigadierConverter.java | 50 ++++++++--------- .../brigadier/MultipleHeadNode.java | 2 +- .../brigadier/MultipleHeadNodeBuilder.java | 2 +- .../brigadier/PermissionRequirement.java | 8 +-- .../commandflow/bukkit/BukkitAuthorizer.java | 6 +- .../bukkit/BukkitCommandManager.java | 44 +++++++-------- .../bukkit/BukkitCommandWrapper.java | 18 +++--- .../BukkitDefaultTranslationProvider.java | 4 +- .../commandflow/bukkit/MessageUtils.java | 2 +- .../commandflow/bukkit/annotation/Exact.java | 2 +- .../bukkit/annotation/PlayerOrSource.java | 2 +- .../bukkit}/annotation/Sender.java | 2 +- .../bukkit/factory/BukkitModule.java | 8 +-- .../bukkit/factory/CommandSenderFactory.java | 8 +-- .../bukkit/factory/GameModeFactory.java | 8 +-- .../factory/OfflinePlayerPartFactory.java | 10 ++-- .../bukkit/factory/PlayerPartFactory.java | 12 ++-- .../bukkit/factory/PlayerSenderFactory.java | 8 +-- .../bukkit/factory/WorldFactory.java | 8 +-- .../commandflow/bukkit/part/BukkitParts.java | 32 ++++++----- .../bukkit/part/CommandSenderPart.java | 16 +++--- .../commandflow/bukkit/part/GameModePart.java | 12 ++-- .../bukkit/part/OfflinePlayerPart.java | 16 +++--- .../commandflow/bukkit/part/PlayerPart.java | 18 +++--- .../bukkit/part/PlayerSenderPart.java | 16 +++--- .../commandflow/bukkit/part/WorldPart.java | 12 ++-- .../commandflow/bungee/BungeeAuthorizer.java | 6 +- .../bungee/BungeeCommandManager.java | 42 +++++++------- .../bungee/BungeeCommandWrapper.java | 12 ++-- .../BungeeDefaultTranslationProvider.java | 4 +- .../commandflow/bungee/MessageUtils.java | 2 +- .../annotation/ProxiedPlayerOrSource.java | 2 +- .../bungee}/annotation/Sender.java | 2 +- .../bungee/factory/BungeeModule.java | 8 +-- .../factory/CommandSenderPartFactory.java | 8 +-- .../factory/ProxiedPlayerPartFactory.java | 10 ++-- .../ProxiedPlayerSenderPartFactory.java | 8 +-- .../bungee/part/CommandSenderPart.java | 16 +++--- .../bungee/part/ProxiedPlayerPart.java | 16 +++--- .../bungee/part/ProxiedPlayerSenderPart.java | 16 +++--- .../discord/DiscordAuthorizer.java | 6 +- .../discord/DiscordCommandManager.java | 43 +++++++------- .../DiscordDefaultTranslationProvider.java | 4 +- .../commandflow/discord/MessageListener.java | 17 ++---- .../discord}/annotation/Sender.java | 2 +- .../discord/factory/DiscordModule.java | 8 +-- .../discord/factory/MemberPartFactory.java | 8 +-- .../factory/MemberSenderPartFactory.java | 8 +-- .../discord/factory/MessagePartFactory.java | 8 +-- .../factory/TextChannelPartFactory.java | 8 +-- .../discord/factory/UserPartFactory.java | 8 +-- .../factory/UserSenderPartFactory.java | 8 +-- .../commandflow/discord/part/MemberPart.java | 18 +++--- .../discord/part/MemberSenderPart.java | 16 +++--- .../commandflow/discord/part/MessagePart.java | 12 ++-- .../discord/part/TextChannelPart.java | 18 +++--- .../commandflow/discord/part/UserPart.java | 18 +++--- .../discord/part/UserSenderPart.java | 16 +++--- .../discord/utils/ArgumentsUtils.java | 2 +- .../discord/utils/MessageUtils.java | 2 +- docs/imperatively/argument.md | 2 +- .../velocity/VelocityAuthorizer.java | 6 +- .../velocity/VelocityCommandManager.java | 40 ++++++------- .../velocity/VelocityCommandWrapper.java | 12 ++-- .../VelocityDefaultTranslationProvider.java | 4 +- .../velocity/annotation/PlayerOrSource.java | 2 +- .../velocity}/annotation/Sender.java | 2 +- .../factory/CommandSourcePartFactory.java | 8 +-- .../velocity/factory/PlayerPartFactory.java | 10 ++-- .../factory/PlayerSenderPartFactory.java | 8 +-- .../velocity/factory/VelocityModule.java | 8 +-- .../velocity/part/CommandSenderPart.java | 14 ++--- .../commandflow/velocity/part/PlayerPart.java | 14 ++--- .../velocity/part/PlayerSenderPart.java | 14 ++--- 214 files changed, 1077 insertions(+), 1071 deletions(-) delete mode 100644 api/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilder.java delete mode 100644 api/src/main/java/me/fixeddev/commandflow/part/visitor/CommandPartVisitor.java rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/Authorizer.java (92%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/CommandContext.java (98%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/CommandManager.java (93%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/ContextSnapshot.java (95%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/ErrorHandler.java (98%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/Namespace.java (96%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/NamespaceImpl.java (96%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/ParseResult.java (71%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/SimpleCommandContext.java (97%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/SimpleCommandManager.java (91%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/SimpleErrorHandler.java (97%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/AnnotatedCommandTreeBuilder.java (72%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java (86%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/CommandClass.java (69%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/ReflectionInstanceCreator.java (96%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/ReflectionSubCommandHandler.java (82%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/SubCommandInstanceCreator.java (93%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/action/ReflectiveAction.java (86%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/action/ValueGetter.java (89%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/ArgOrSub.java (90%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/Command.java (89%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/ConsumeAll.java (82%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/Flag.java (89%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/Handler.java (83%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/Limit.java (83%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/Named.java (83%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/OptArg.java (74%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/ParentArg.java (90%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/Range.java (52%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/Required.java (86%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/Rewrites.java (89%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/Strict.java (88%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/SubCommandClasses.java (82%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/Suggestions.java (84%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/Switch.java (89%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/Text.java (82%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/annotation/Usage.java (90%) create mode 100644 api/src/main/java/team/unnamed/commandflow/annotated/builder/AnnotatedCommandBuilder.java rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/builder/AnnotatedCommandBuilderImpl.java (75%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/builder/Buildable.java (66%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/builder/CommandActionNode.java (87%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/builder/CommandBuilderNodesImpl.java (90%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/builder/CommandDataNode.java (74%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/builder/CommandModifiersNode.java (72%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/builder/CommandPartsNode.java (65%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/builder/SubCommandsNode.java (81%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/modifier/CommandModifierFactory.java (74%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/AbstractModule.java (94%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/DelegatePartModifier.java (85%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/Key.java (95%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/Module.java (89%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/PartFactory.java (89%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/PartInjector.java (91%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/PartModifier.java (89%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/SimplePartInjector.java (94%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/DefaultsModule.java (61%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/factory/ArgumentStackPartFactory.java (54%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/factory/BooleanPartFactory.java (53%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/factory/ContextFactory.java (53%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/factory/DoublePartFactory.java (59%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/factory/EnumPartFactory.java (71%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/factory/FloatPartFactory.java (59%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/factory/IntegerPartFactory.java (59%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/factory/LongPartFactory.java (52%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/factory/StringPartFactory.java (52%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/factory/StringTextPartFactory.java (55%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/factory/SwitchPartFactory.java (60%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/modifier/LimitModifier.java (59%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/modifier/OptionalModifier.java (61%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/modifier/RewritesModifier.java (64%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/modifier/SuggestionsModifier.java (58%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/annotated/part/defaults/modifier/ValueFlagModifier.java (61%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/command/Action.java (72%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/command/Command.java (88%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/command/SimpleCommand.java (95%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/command/modifiers/CommandModifier.java (82%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/command/modifiers/CommandModifiers.java (94%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/command/modifiers/FallbackCommandModifiers.java (98%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/command/modifiers/ModifierPhase.java (94%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/command/modifiers/ModifierUtils.java (96%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/command/modifiers/SequentialCommandModifier.java (92%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/command/modifiers/SimpleCommandModifiers.java (95%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/exception/ArgumentException.java (86%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/exception/ArgumentParseException.java (92%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/exception/CommandException.java (94%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/exception/CommandUsage.java (92%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/exception/InvalidSubCommandException.java (92%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/exception/NoMoreArgumentsException.java (92%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/exception/NoPermissionsException.java (90%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/exception/StopParseException.java (87%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/executor/DefaultExecutor.java (67%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/executor/Executor.java (71%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/input/InputTokenizer.java (88%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/input/QuotedSpaceTokenizer.java (98%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/input/StringSpaceTokenizer.java (88%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/ArgumentPart.java (82%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/CommandPart.java (76%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/Parts.java (93%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/PartsWrapper.java (85%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/SinglePartWrapper.java (84%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/ArgumentRewriterPart.java (84%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/ArgumentStackPart.java (62%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/BooleanPart.java (74%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/ContextPart.java (65%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/DoublePart.java (77%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/EmptyPart.java (62%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/EnumPart.java (89%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/FirstMatchPart.java (91%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/FloatPart.java (80%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/IntegerPart.java (80%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/LimitingPart.java (82%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/LongPart.java (80%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/OptionalPart.java (82%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/PrimitivePart.java (80%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/SequentialCommandPart.java (89%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/StringPart.java (92%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/SubCommandPart.java (88%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/SuggestionsModifierPart.java (85%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/SwitchPart.java (89%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/defaults/ValueFlagPart.java (88%) create mode 100644 api/src/main/java/team/unnamed/commandflow/part/visitor/CommandPartVisitor.java rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/part/visitor/UnwrappedCommandPartVisitor.java (73%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/stack/ArgumentStack.java (88%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/stack/SimpleArgumentStack.java (97%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/stack/StackSnapshot.java (96%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/translator/ComponentRendererTranslator.java (92%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/translator/DefaultMapTranslationProvider.java (94%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/translator/DefaultTranslator.java (97%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/translator/TranslationProvider.java (54%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/translator/Translator.java (94%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/usage/DefaultUsageBuilder.java (85%) rename api/src/main/java/{me/fixeddev => team/unnamed}/commandflow/usage/UsageBuilder.java (73%) rename api/src/test/java/{me/fixeddev => team/unnamed}/commandflow/InputTokenizerTest.java (86%) rename api/src/test/java/{me/fixeddev => team/unnamed}/commandflow/ParameterizedPartTest.java (78%) rename api/src/test/java/{me/fixeddev => team/unnamed}/commandflow/annotated/CustomComponentParserTest.java (76%) rename brigadier/src/main/java/{me/fixeddev => team/unnamed}/commandflow/brigadier/BrigadierCommandManager.java (93%) rename brigadier/src/main/java/{me/fixeddev => team/unnamed}/commandflow/brigadier/BrigadierCommandWrapper.java (67%) rename brigadier/src/main/java/{me/fixeddev => team/unnamed}/commandflow/brigadier/BrigadierDefaultTranslationProvider.java (76%) rename brigadier/src/main/java/{me/fixeddev => team/unnamed}/commandflow/brigadier/CommandBrigadierConverter.java (93%) rename brigadier/src/main/java/{me/fixeddev => team/unnamed}/commandflow/brigadier/MultipleHeadNode.java (99%) rename brigadier/src/main/java/{me/fixeddev => team/unnamed}/commandflow/brigadier/MultipleHeadNodeBuilder.java (99%) rename brigadier/src/main/java/{me/fixeddev => team/unnamed}/commandflow/brigadier/PermissionRequirement.java (81%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/BukkitAuthorizer.java (77%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/BukkitCommandManager.java (87%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/BukkitCommandWrapper.java (91%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/BukkitDefaultTranslationProvider.java (80%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/MessageUtils.java (96%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/annotation/Exact.java (83%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/annotation/PlayerOrSource.java (83%) rename {discord/src/main/java/me/fixeddev/commandflow/discord => bukkit/src/main/java/team/unnamed/commandflow/bukkit}/annotation/Sender.java (83%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/factory/BukkitModule.java (75%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/factory/CommandSenderFactory.java (55%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/factory/GameModeFactory.java (55%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/factory/OfflinePlayerPartFactory.java (56%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/factory/PlayerPartFactory.java (56%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/factory/PlayerSenderFactory.java (55%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/factory/WorldFactory.java (55%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/part/BukkitParts.java (67%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/part/CommandSenderPart.java (74%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/part/GameModePart.java (87%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/part/OfflinePlayerPart.java (88%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/part/PlayerPart.java (86%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/part/PlayerSenderPart.java (77%) rename bukkit/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bukkit/part/WorldPart.java (82%) rename bungee/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bungee/BungeeAuthorizer.java (77%) rename bungee/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bungee/BungeeCommandManager.java (87%) rename bungee/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bungee/BungeeCommandWrapper.java (89%) rename bungee/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bungee/BungeeDefaultTranslationProvider.java (77%) rename bungee/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bungee/MessageUtils.java (93%) rename bungee/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bungee/annotation/ProxiedPlayerOrSource.java (84%) rename {bukkit/src/main/java/me/fixeddev/commandflow/bukkit => bungee/src/main/java/team/unnamed/commandflow/bungee}/annotation/Sender.java (83%) rename bungee/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bungee/factory/BungeeModule.java (67%) rename bungee/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bungee/factory/CommandSenderPartFactory.java (56%) rename bungee/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bungee/factory/ProxiedPlayerPartFactory.java (56%) rename bungee/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bungee/factory/ProxiedPlayerSenderPartFactory.java (56%) rename bungee/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bungee/part/CommandSenderPart.java (74%) rename bungee/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bungee/part/ProxiedPlayerPart.java (88%) rename bungee/src/main/java/{me/fixeddev => team/unnamed}/commandflow/bungee/part/ProxiedPlayerSenderPart.java (78%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/DiscordAuthorizer.java (89%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/DiscordCommandManager.java (85%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/DiscordDefaultTranslationProvider.java (75%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/MessageListener.java (83%) rename {velocity/src/main/java/me/fixeddev/commandflow/velocity => discord/src/main/java/team/unnamed/commandflow/discord}/annotation/Sender.java (83%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/factory/DiscordModule.java (75%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/factory/MemberPartFactory.java (55%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/factory/MemberSenderPartFactory.java (55%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/factory/MessagePartFactory.java (55%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/factory/TextChannelPartFactory.java (55%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/factory/UserPartFactory.java (55%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/factory/UserSenderPartFactory.java (55%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/part/MemberPart.java (80%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/part/MemberSenderPart.java (74%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/part/MessagePart.java (73%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/part/TextChannelPart.java (79%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/part/UserPart.java (77%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/part/UserSenderPart.java (65%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/utils/ArgumentsUtils.java (96%) rename discord/src/main/java/{me/fixeddev => team/unnamed}/commandflow/discord/utils/MessageUtils.java (88%) rename velocity/src/main/java/{me/fixeddev => team/unnamed}/commandflow/velocity/VelocityAuthorizer.java (77%) rename velocity/src/main/java/{me/fixeddev => team/unnamed}/commandflow/velocity/VelocityCommandManager.java (87%) rename velocity/src/main/java/{me/fixeddev => team/unnamed}/commandflow/velocity/VelocityCommandWrapper.java (91%) rename velocity/src/main/java/{me/fixeddev => team/unnamed}/commandflow/velocity/VelocityDefaultTranslationProvider.java (77%) rename velocity/src/main/java/{me/fixeddev => team/unnamed}/commandflow/velocity/annotation/PlayerOrSource.java (83%) rename {bungee/src/main/java/me/fixeddev/commandflow/bungee => velocity/src/main/java/team/unnamed/commandflow/velocity}/annotation/Sender.java (82%) rename velocity/src/main/java/{me/fixeddev => team/unnamed}/commandflow/velocity/factory/CommandSourcePartFactory.java (55%) rename velocity/src/main/java/{me/fixeddev => team/unnamed}/commandflow/velocity/factory/PlayerPartFactory.java (66%) rename velocity/src/main/java/{me/fixeddev => team/unnamed}/commandflow/velocity/factory/PlayerSenderPartFactory.java (55%) rename velocity/src/main/java/{me/fixeddev => team/unnamed}/commandflow/velocity/factory/VelocityModule.java (73%) rename velocity/src/main/java/{me/fixeddev => team/unnamed}/commandflow/velocity/part/CommandSenderPart.java (74%) rename velocity/src/main/java/{me/fixeddev => team/unnamed}/commandflow/velocity/part/PlayerPart.java (84%) rename velocity/src/main/java/{me/fixeddev => team/unnamed}/commandflow/velocity/part/PlayerSenderPart.java (77%) diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilder.java b/api/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilder.java deleted file mode 100644 index 0853aaae..00000000 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilder.java +++ /dev/null @@ -1,23 +0,0 @@ -package me.fixeddev.commandflow.annotated.builder; - -import me.fixeddev.commandflow.annotated.part.PartInjector; - -public interface AnnotatedCommandBuilder { - - /** - * Creates a new builder to create a {@link me.fixeddev.commandflow.command.Command} instance. - *

- * While being similar to {@link me.fixeddev.commandflow.command.Command.Builder} it allows to create commands based on annotations, - * that means that the {@link me.fixeddev.commandflow.command.Action} or {@link me.fixeddev.commandflow.part.CommandPart} instances - * for the build command will be created based on a given method. - * - * @param name The name of {@link me.fixeddev.commandflow.command.Command} to build. - * @return A {@link CommandDataNode} which will allow building a complete {@link me.fixeddev.commandflow.command.Command} tree. - */ - CommandDataNode newCommand(String name); - - static AnnotatedCommandBuilder create(PartInjector injector) { - return new AnnotatedCommandBuilderImpl(injector); - } - -} diff --git a/api/src/main/java/me/fixeddev/commandflow/part/visitor/CommandPartVisitor.java b/api/src/main/java/me/fixeddev/commandflow/part/visitor/CommandPartVisitor.java deleted file mode 100644 index 29d4f026..00000000 --- a/api/src/main/java/me/fixeddev/commandflow/part/visitor/CommandPartVisitor.java +++ /dev/null @@ -1,21 +0,0 @@ -package me.fixeddev.commandflow.part.visitor; - -import me.fixeddev.commandflow.part.ArgumentPart; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.PartsWrapper; -import me.fixeddev.commandflow.part.SinglePartWrapper; -import me.fixeddev.commandflow.part.defaults.SubCommandPart; - -public interface CommandPartVisitor { - - R visit(CommandPart part); - - R visit(ArgumentPart argumentPart); - - R visit(PartsWrapper partsWrapper); - - R visit(SinglePartWrapper singlePartWrapper); - - R visit(SubCommandPart subCommandPart); - -} diff --git a/api/src/main/java/me/fixeddev/commandflow/Authorizer.java b/api/src/main/java/team/unnamed/commandflow/Authorizer.java similarity index 92% rename from api/src/main/java/me/fixeddev/commandflow/Authorizer.java rename to api/src/main/java/team/unnamed/commandflow/Authorizer.java index d4624849..a87ee1ad 100644 --- a/api/src/main/java/me/fixeddev/commandflow/Authorizer.java +++ b/api/src/main/java/team/unnamed/commandflow/Authorizer.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow; +package team.unnamed.commandflow; public interface Authorizer { diff --git a/api/src/main/java/me/fixeddev/commandflow/CommandContext.java b/api/src/main/java/team/unnamed/commandflow/CommandContext.java similarity index 98% rename from api/src/main/java/me/fixeddev/commandflow/CommandContext.java rename to api/src/main/java/team/unnamed/commandflow/CommandContext.java index 9b73d0f9..fecece2f 100644 --- a/api/src/main/java/me/fixeddev/commandflow/CommandContext.java +++ b/api/src/main/java/team/unnamed/commandflow/CommandContext.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow; +package team.unnamed.commandflow; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.part.CommandPart; import java.util.Collections; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/CommandManager.java b/api/src/main/java/team/unnamed/commandflow/CommandManager.java similarity index 93% rename from api/src/main/java/me/fixeddev/commandflow/CommandManager.java rename to api/src/main/java/team/unnamed/commandflow/CommandManager.java index dcfa257a..fa78772a 100644 --- a/api/src/main/java/me/fixeddev/commandflow/CommandManager.java +++ b/api/src/main/java/team/unnamed/commandflow/CommandManager.java @@ -1,12 +1,13 @@ -package me.fixeddev.commandflow; +package team.unnamed.commandflow; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.command.modifiers.FallbackCommandModifiers; -import me.fixeddev.commandflow.executor.Executor; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.input.InputTokenizer; -import me.fixeddev.commandflow.translator.Translator; -import me.fixeddev.commandflow.usage.UsageBuilder; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.command.modifiers.FallbackCommandModifiers; +import team.unnamed.commandflow.executor.Executor; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.input.InputTokenizer; +import team.unnamed.commandflow.translator.Translator; +import team.unnamed.commandflow.usage.UsageBuilder; +import team.unnamed.commandflow.command.Action; import java.util.List; import java.util.Optional; @@ -149,7 +150,7 @@ public interface CommandManager { /** * Executes a command based on the provided {@link CommandContext}. *

- * If the executed {@link Command}'s {@link me.fixeddev.commandflow.command.Action} returns a false value then this method gets the usage for the executed Command + * If the executed {@link Command}'s {@link Action} returns a false value then this method gets the usage for the executed Command * * @param commandContext The {@link CommandContext} used to execute the command. * @return A boolean indicating if a command was executed or not @@ -160,7 +161,7 @@ public interface CommandManager { /** * Calls {@link CommandManager#parse(Namespace, List)} and executes the command with the {@link CommandContext} returned by the method. *

- * If the executed {@link Command}'s {@link me.fixeddev.commandflow.command.Action} returns a false value then this method gets the usage for the executed Command + * If the executed {@link Command}'s {@link Action} returns a false value then this method gets the usage for the executed Command * * @param accessor The {@link Namespace} used to inject things into the Command parsing/execution phase * @param arguments A {@link List} of arguments including the command used to parse the actual command used and the parameters of that command diff --git a/api/src/main/java/me/fixeddev/commandflow/ContextSnapshot.java b/api/src/main/java/team/unnamed/commandflow/ContextSnapshot.java similarity index 95% rename from api/src/main/java/me/fixeddev/commandflow/ContextSnapshot.java rename to api/src/main/java/team/unnamed/commandflow/ContextSnapshot.java index 1166c96e..9f2b8f9f 100644 --- a/api/src/main/java/me/fixeddev/commandflow/ContextSnapshot.java +++ b/api/src/main/java/team/unnamed/commandflow/ContextSnapshot.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow; +package team.unnamed.commandflow; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.part.CommandPart; import java.util.List; import java.util.Map; diff --git a/api/src/main/java/me/fixeddev/commandflow/ErrorHandler.java b/api/src/main/java/team/unnamed/commandflow/ErrorHandler.java similarity index 98% rename from api/src/main/java/me/fixeddev/commandflow/ErrorHandler.java rename to api/src/main/java/team/unnamed/commandflow/ErrorHandler.java index e147effd..92c91670 100644 --- a/api/src/main/java/me/fixeddev/commandflow/ErrorHandler.java +++ b/api/src/main/java/team/unnamed/commandflow/ErrorHandler.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow; +package team.unnamed.commandflow; /** * This interface is used to handle errors that occur during the execution of a command, by the usage of error handlers diff --git a/api/src/main/java/me/fixeddev/commandflow/Namespace.java b/api/src/main/java/team/unnamed/commandflow/Namespace.java similarity index 96% rename from api/src/main/java/me/fixeddev/commandflow/Namespace.java rename to api/src/main/java/team/unnamed/commandflow/Namespace.java index d8b96b24..cc0221c9 100644 --- a/api/src/main/java/me/fixeddev/commandflow/Namespace.java +++ b/api/src/main/java/team/unnamed/commandflow/Namespace.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow; +package team.unnamed.commandflow; public interface Namespace { diff --git a/api/src/main/java/me/fixeddev/commandflow/NamespaceImpl.java b/api/src/main/java/team/unnamed/commandflow/NamespaceImpl.java similarity index 96% rename from api/src/main/java/me/fixeddev/commandflow/NamespaceImpl.java rename to api/src/main/java/team/unnamed/commandflow/NamespaceImpl.java index 0f6e1dad..cb507165 100644 --- a/api/src/main/java/me/fixeddev/commandflow/NamespaceImpl.java +++ b/api/src/main/java/team/unnamed/commandflow/NamespaceImpl.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow; +package team.unnamed.commandflow; import java.util.Map; import java.util.Objects; diff --git a/api/src/main/java/me/fixeddev/commandflow/ParseResult.java b/api/src/main/java/team/unnamed/commandflow/ParseResult.java similarity index 71% rename from api/src/main/java/me/fixeddev/commandflow/ParseResult.java rename to api/src/main/java/team/unnamed/commandflow/ParseResult.java index 0f8f7a6f..671d2d18 100644 --- a/api/src/main/java/me/fixeddev/commandflow/ParseResult.java +++ b/api/src/main/java/team/unnamed/commandflow/ParseResult.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow; +package team.unnamed.commandflow; -import me.fixeddev.commandflow.exception.CommandException; +import team.unnamed.commandflow.exception.CommandException; import java.util.Optional; diff --git a/api/src/main/java/me/fixeddev/commandflow/SimpleCommandContext.java b/api/src/main/java/team/unnamed/commandflow/SimpleCommandContext.java similarity index 97% rename from api/src/main/java/me/fixeddev/commandflow/SimpleCommandContext.java rename to api/src/main/java/team/unnamed/commandflow/SimpleCommandContext.java index 8a049c31..24054906 100644 --- a/api/src/main/java/me/fixeddev/commandflow/SimpleCommandContext.java +++ b/api/src/main/java/team/unnamed/commandflow/SimpleCommandContext.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow; +package team.unnamed.commandflow; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.part.CommandPart; import java.util.ArrayList; import java.util.HashMap; diff --git a/api/src/main/java/me/fixeddev/commandflow/SimpleCommandManager.java b/api/src/main/java/team/unnamed/commandflow/SimpleCommandManager.java similarity index 91% rename from api/src/main/java/me/fixeddev/commandflow/SimpleCommandManager.java rename to api/src/main/java/team/unnamed/commandflow/SimpleCommandManager.java index 9feaf521..5fbcdaf3 100644 --- a/api/src/main/java/me/fixeddev/commandflow/SimpleCommandManager.java +++ b/api/src/main/java/team/unnamed/commandflow/SimpleCommandManager.java @@ -1,27 +1,27 @@ -package me.fixeddev.commandflow; - -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.command.modifiers.CommandModifiers; -import me.fixeddev.commandflow.command.modifiers.FallbackCommandModifiers; -import me.fixeddev.commandflow.command.modifiers.ModifierPhase; -import me.fixeddev.commandflow.exception.ArgumentException; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.exception.CommandUsage; -import me.fixeddev.commandflow.exception.NoPermissionsException; -import me.fixeddev.commandflow.exception.StopParseException; -import me.fixeddev.commandflow.executor.DefaultExecutor; -import me.fixeddev.commandflow.executor.Executor; -import me.fixeddev.commandflow.input.InputTokenizer; -import me.fixeddev.commandflow.input.StringSpaceTokenizer; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; -import me.fixeddev.commandflow.stack.SimpleArgumentStack; -import me.fixeddev.commandflow.translator.DefaultMapTranslationProvider; -import me.fixeddev.commandflow.translator.DefaultTranslator; -import me.fixeddev.commandflow.translator.Translator; -import me.fixeddev.commandflow.usage.DefaultUsageBuilder; -import me.fixeddev.commandflow.usage.UsageBuilder; +package team.unnamed.commandflow; + +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.command.modifiers.CommandModifiers; +import team.unnamed.commandflow.command.modifiers.FallbackCommandModifiers; +import team.unnamed.commandflow.command.modifiers.ModifierPhase; +import team.unnamed.commandflow.exception.ArgumentException; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.exception.CommandUsage; +import team.unnamed.commandflow.exception.NoPermissionsException; +import team.unnamed.commandflow.exception.StopParseException; +import team.unnamed.commandflow.executor.DefaultExecutor; +import team.unnamed.commandflow.executor.Executor; +import team.unnamed.commandflow.input.InputTokenizer; +import team.unnamed.commandflow.input.StringSpaceTokenizer; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.stack.SimpleArgumentStack; +import team.unnamed.commandflow.translator.DefaultMapTranslationProvider; +import team.unnamed.commandflow.translator.DefaultTranslator; +import team.unnamed.commandflow.translator.Translator; +import team.unnamed.commandflow.usage.DefaultUsageBuilder; +import team.unnamed.commandflow.usage.UsageBuilder; import java.util.Collections; import java.util.HashMap; diff --git a/api/src/main/java/me/fixeddev/commandflow/SimpleErrorHandler.java b/api/src/main/java/team/unnamed/commandflow/SimpleErrorHandler.java similarity index 97% rename from api/src/main/java/me/fixeddev/commandflow/SimpleErrorHandler.java rename to api/src/main/java/team/unnamed/commandflow/SimpleErrorHandler.java index 0c2928f7..da288fc0 100644 --- a/api/src/main/java/me/fixeddev/commandflow/SimpleErrorHandler.java +++ b/api/src/main/java/team/unnamed/commandflow/SimpleErrorHandler.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow; +package team.unnamed.commandflow; import java.util.HashMap; import java.util.Map; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilder.java b/api/src/main/java/team/unnamed/commandflow/annotated/AnnotatedCommandTreeBuilder.java similarity index 72% rename from api/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilder.java rename to api/src/main/java/team/unnamed/commandflow/annotated/AnnotatedCommandTreeBuilder.java index 30568124..0858dd6b 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilder.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/AnnotatedCommandTreeBuilder.java @@ -1,9 +1,12 @@ -package me.fixeddev.commandflow.annotated; +package team.unnamed.commandflow.annotated; -import me.fixeddev.commandflow.annotated.builder.AnnotatedCommandBuilder; -import me.fixeddev.commandflow.annotated.part.PartInjector; -import me.fixeddev.commandflow.command.Command; +import team.unnamed.commandflow.annotated.builder.AnnotatedCommandBuilder; +import team.unnamed.commandflow.annotated.part.PartInjector; +import team.unnamed.commandflow.command.Command; import net.kyori.adventure.text.Component; +import team.unnamed.commandflow.annotated.annotation.Handler; +import team.unnamed.commandflow.annotated.annotation.SubCommandClasses; +import team.unnamed.commandflow.part.defaults.SubCommandPart; import java.util.List; import java.util.function.Function; @@ -19,15 +22,15 @@ public interface AnnotatedCommandTreeBuilder { * The {@link Command} instances created from annotated methods should be public instance methods(not static ones) that return boolean or void, * not being inherited from other classes. *

- * The {@link me.fixeddev.commandflow.annotated.annotation.Command} annotation is used to indicate whether a method or a class is a Command, + * The {@link team.unnamed.commandflow.annotated.annotation.Command} annotation is used to indicate whether a method or a class is a Command, * if a class has this annotation, that means that every command in that class is his subcommand, with the main command being * a command with empty name. *

- * The {@link me.fixeddev.commandflow.annotated.annotation.Handler} annotation is used to indicate that a method of a class with subcommands is the one that - * handles the sub commands, actualy being a {@link me.fixeddev.commandflow.part.defaults.SubCommandPart.SubCommandHandler} but created with + * The {@link Handler} annotation is used to indicate that a method of a class with subcommands is the one that + * handles the sub commands, actualy being a {@link SubCommandPart.SubCommandHandler} but created with * an annotated method. *

- * The {@link me.fixeddev.commandflow.annotated.annotation.SubCommandClasses} annotation is used to indicate that the given classes are actually subcommands + * The {@link SubCommandClasses} annotation is used to indicate that the given classes are actually subcommands * of the given {@link CommandClass}, these sub command classes will be instantiated using a {@link SubCommandInstanceCreator} and * parsed with this same method, the returned commands will be added as subcommands for the provided {@link CommandClass}. * This allows multiple levels of subcommands without a lot of hassle. diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java b/api/src/main/java/team/unnamed/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java similarity index 86% rename from api/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java rename to api/src/main/java/team/unnamed/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java index 84dc4921..e612c3d2 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java @@ -1,17 +1,18 @@ -package me.fixeddev.commandflow.annotated; +package team.unnamed.commandflow.annotated; import me.fixeddev.commandflow.annotated.annotation.*; -import me.fixeddev.commandflow.annotated.builder.AnnotatedCommandBuilder; -import me.fixeddev.commandflow.annotated.builder.CommandDataNode; -import me.fixeddev.commandflow.annotated.builder.CommandModifiersNode; -import me.fixeddev.commandflow.annotated.builder.CommandPartsNode; -import me.fixeddev.commandflow.annotated.builder.SubCommandsNode; -import me.fixeddev.commandflow.annotated.part.PartInjector; -import me.fixeddev.commandflow.command.Action; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.part.defaults.SubCommandPart; +import team.unnamed.commandflow.annotated.builder.AnnotatedCommandBuilder; +import team.unnamed.commandflow.annotated.builder.CommandDataNode; +import team.unnamed.commandflow.annotated.builder.CommandModifiersNode; +import team.unnamed.commandflow.annotated.builder.CommandPartsNode; +import team.unnamed.commandflow.annotated.builder.SubCommandsNode; +import team.unnamed.commandflow.annotated.part.PartInjector; +import team.unnamed.commandflow.command.Action; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.part.defaults.SubCommandPart; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; +import team.unnamed.commandflow.annotated.annotation.*; import java.lang.reflect.Method; import java.lang.reflect.Modifier; @@ -55,16 +56,16 @@ public void setComponentParser(Function componentParser) { public List fromClass(CommandClass commandClass) { Class clazz = commandClass.getClass(); - me.fixeddev.commandflow.annotated.annotation.Command rootCommandAnnotation = - clazz.getAnnotation(me.fixeddev.commandflow.annotated.annotation.Command.class); + team.unnamed.commandflow.annotated.annotation.Command rootCommandAnnotation = + clazz.getAnnotation(team.unnamed.commandflow.annotated.annotation.Command.class); List commandList = new ArrayList<>(); Method rootCommandMethod = null; for (Method method : clazz.getDeclaredMethods()) { - me.fixeddev.commandflow.annotated.annotation.Command commandAnnotation = - method.getAnnotation(me.fixeddev.commandflow.annotated.annotation.Command.class); + team.unnamed.commandflow.annotated.annotation.Command commandAnnotation = + method.getAnnotation(team.unnamed.commandflow.annotated.annotation.Command.class); if (commandAnnotation == null) { continue; @@ -91,7 +92,7 @@ public List fromClass(CommandClass commandClass) { } private Command fromMethod(CommandClass commandClass, - me.fixeddev.commandflow.annotated.annotation.Command commandAnnotation, + team.unnamed.commandflow.annotated.annotation.Command commandAnnotation, Method method) { if (Modifier.isStatic(method.getModifiers()) || !Modifier.isPublic(method.getModifiers())) { return null; @@ -128,7 +129,7 @@ private Command fromMethod(CommandClass commandClass, @NotNull private List createRootCommand(CommandClass commandClass, Class clazz, - me.fixeddev.commandflow.annotated.annotation.Command rootCommandAnnotation, + team.unnamed.commandflow.annotated.annotation.Command rootCommandAnnotation, List commandList, Method rootCommandMethod) { String[] names = rootCommandAnnotation.names(); diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/CommandClass.java b/api/src/main/java/team/unnamed/commandflow/annotated/CommandClass.java similarity index 69% rename from api/src/main/java/me/fixeddev/commandflow/annotated/CommandClass.java rename to api/src/main/java/team/unnamed/commandflow/annotated/CommandClass.java index 0551f2ba..d249e2b5 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/CommandClass.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/CommandClass.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated; +package team.unnamed.commandflow.annotated; /** * A marker interface for Commands based on annotations. diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/ReflectionInstanceCreator.java b/api/src/main/java/team/unnamed/commandflow/annotated/ReflectionInstanceCreator.java similarity index 96% rename from api/src/main/java/me/fixeddev/commandflow/annotated/ReflectionInstanceCreator.java rename to api/src/main/java/team/unnamed/commandflow/annotated/ReflectionInstanceCreator.java index 99d813f5..20b0a67b 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/ReflectionInstanceCreator.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/ReflectionInstanceCreator.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated; +package team.unnamed.commandflow.annotated; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/ReflectionSubCommandHandler.java b/api/src/main/java/team/unnamed/commandflow/annotated/ReflectionSubCommandHandler.java similarity index 82% rename from api/src/main/java/me/fixeddev/commandflow/annotated/ReflectionSubCommandHandler.java rename to api/src/main/java/team/unnamed/commandflow/annotated/ReflectionSubCommandHandler.java index 4297a292..ee147e03 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/ReflectionSubCommandHandler.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/ReflectionSubCommandHandler.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.annotated; +package team.unnamed.commandflow.annotated; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.exception.ArgumentException; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.defaults.SubCommandPart; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.exception.ArgumentException; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.defaults.SubCommandPart; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/SubCommandInstanceCreator.java b/api/src/main/java/team/unnamed/commandflow/annotated/SubCommandInstanceCreator.java similarity index 93% rename from api/src/main/java/me/fixeddev/commandflow/annotated/SubCommandInstanceCreator.java rename to api/src/main/java/team/unnamed/commandflow/annotated/SubCommandInstanceCreator.java index 294cf639..4066d6f4 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/SubCommandInstanceCreator.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/SubCommandInstanceCreator.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated; +package team.unnamed.commandflow.annotated; /** * An interface with the purpose of creating a {@link CommandClass} instance that is a sub commands class of another diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/action/ReflectiveAction.java b/api/src/main/java/team/unnamed/commandflow/annotated/action/ReflectiveAction.java similarity index 86% rename from api/src/main/java/me/fixeddev/commandflow/annotated/action/ReflectiveAction.java rename to api/src/main/java/team/unnamed/commandflow/annotated/action/ReflectiveAction.java index e4771e4b..5ec81eb5 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/action/ReflectiveAction.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/action/ReflectiveAction.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.annotated.action; +package team.unnamed.commandflow.annotated.action; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.annotated.CommandClass; -import me.fixeddev.commandflow.command.Action; -import me.fixeddev.commandflow.exception.CommandException; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.annotated.CommandClass; +import team.unnamed.commandflow.command.Action; +import team.unnamed.commandflow.exception.CommandException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/action/ValueGetter.java b/api/src/main/java/team/unnamed/commandflow/annotated/action/ValueGetter.java similarity index 89% rename from api/src/main/java/me/fixeddev/commandflow/annotated/action/ValueGetter.java rename to api/src/main/java/team/unnamed/commandflow/annotated/action/ValueGetter.java index 9beba130..4ff3862e 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/action/ValueGetter.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/action/ValueGetter.java @@ -1,9 +1,7 @@ -package me.fixeddev.commandflow.annotated.action; +package team.unnamed.commandflow.annotated.action; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.part.CommandPart; - -import java.util.Collections; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.part.CommandPart; public interface ValueGetter { Object getValue(CommandContext commandContext); diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/ArgOrSub.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/ArgOrSub.java similarity index 90% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/ArgOrSub.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/ArgOrSub.java index 29a06ccf..8627c3dc 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/ArgOrSub.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/ArgOrSub.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Command.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Command.java similarity index 89% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Command.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/Command.java index f3a8cd0f..10bb302f 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Command.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Command.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/ConsumeAll.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/ConsumeAll.java similarity index 82% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/ConsumeAll.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/ConsumeAll.java index ac6f58b7..54d695ba 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/ConsumeAll.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/ConsumeAll.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Flag.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Flag.java similarity index 89% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Flag.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/Flag.java index b57f7a9c..9768b733 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Flag.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Flag.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Handler.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Handler.java similarity index 83% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Handler.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/Handler.java index 0dd5d59f..a45bf841 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Handler.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Handler.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Limit.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Limit.java similarity index 83% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Limit.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/Limit.java index 7344134a..f273669c 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Limit.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Limit.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Named.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Named.java similarity index 83% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Named.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/Named.java index fa6f85b1..6a7b3722 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Named.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Named.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/OptArg.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/OptArg.java similarity index 74% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/OptArg.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/OptArg.java index f9422de8..06303ca6 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/OptArg.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/OptArg.java @@ -1,4 +1,6 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; + +import team.unnamed.commandflow.command.Command; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -7,7 +9,7 @@ /** * The purpose of this annotation is to define the default value of a parameter - * in an {@link me.fixeddev.commandflow.command.Command}. + * in an {@link Command}. */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.PARAMETER) diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/ParentArg.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/ParentArg.java similarity index 90% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/ParentArg.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/ParentArg.java index ee9ceaaa..b23b44e3 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/ParentArg.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/ParentArg.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Range.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Range.java similarity index 52% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Range.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/Range.java index 9da1139f..2a6fa028 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Range.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Range.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; public @interface Range { diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Required.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Required.java similarity index 86% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Required.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/Required.java index 0c097469..aa18ba1d 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Required.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Required.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Rewrites.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Rewrites.java similarity index 89% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Rewrites.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/Rewrites.java index 8ddad349..9d8983fd 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Rewrites.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Rewrites.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Strict.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Strict.java similarity index 88% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Strict.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/Strict.java index f2a86058..3f482b55 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Strict.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Strict.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/SubCommandClasses.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/SubCommandClasses.java similarity index 82% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/SubCommandClasses.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/SubCommandClasses.java index 9c4d45ad..2397cd38 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/SubCommandClasses.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/SubCommandClasses.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; -import me.fixeddev.commandflow.annotated.CommandClass; +import team.unnamed.commandflow.annotated.CommandClass; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Suggestions.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Suggestions.java similarity index 84% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Suggestions.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/Suggestions.java index 4b50655b..27855f98 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Suggestions.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Suggestions.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Switch.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Switch.java similarity index 89% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Switch.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/Switch.java index 247284a1..b5159b56 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Switch.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Switch.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Text.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Text.java similarity index 82% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Text.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/Text.java index 6ba6de96..c3ade0b3 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Text.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Text.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Usage.java b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Usage.java similarity index 90% rename from api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Usage.java rename to api/src/main/java/team/unnamed/commandflow/annotated/annotation/Usage.java index 0c87377d..632bd16e 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/annotation/Usage.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/annotation/Usage.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.annotation; +package team.unnamed.commandflow.annotated.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/team/unnamed/commandflow/annotated/builder/AnnotatedCommandBuilder.java b/api/src/main/java/team/unnamed/commandflow/annotated/builder/AnnotatedCommandBuilder.java new file mode 100644 index 00000000..46ef0774 --- /dev/null +++ b/api/src/main/java/team/unnamed/commandflow/annotated/builder/AnnotatedCommandBuilder.java @@ -0,0 +1,26 @@ +package team.unnamed.commandflow.annotated.builder; + +import team.unnamed.commandflow.annotated.part.PartInjector; +import team.unnamed.commandflow.command.Action; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.part.CommandPart; + +public interface AnnotatedCommandBuilder { + + /** + * Creates a new builder to create a {@link Command} instance. + *

+ * While being similar to {@link Command.Builder} it allows to create commands based on annotations, + * that means that the {@link Action} or {@link CommandPart} instances + * for the build command will be created based on a given method. + * + * @param name The name of {@link Command} to build. + * @return A {@link CommandDataNode} which will allow building a complete {@link Command} tree. + */ + CommandDataNode newCommand(String name); + + static AnnotatedCommandBuilder create(PartInjector injector) { + return new AnnotatedCommandBuilderImpl(injector); + } + +} diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilderImpl.java b/api/src/main/java/team/unnamed/commandflow/annotated/builder/AnnotatedCommandBuilderImpl.java similarity index 75% rename from api/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilderImpl.java rename to api/src/main/java/team/unnamed/commandflow/annotated/builder/AnnotatedCommandBuilderImpl.java index 3524215c..d96d49d3 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/AnnotatedCommandBuilderImpl.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/builder/AnnotatedCommandBuilderImpl.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.annotated.builder; +package team.unnamed.commandflow.annotated.builder; -import me.fixeddev.commandflow.annotated.part.PartInjector; +import team.unnamed.commandflow.annotated.part.PartInjector; final class AnnotatedCommandBuilderImpl implements AnnotatedCommandBuilder { diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/Buildable.java b/api/src/main/java/team/unnamed/commandflow/annotated/builder/Buildable.java similarity index 66% rename from api/src/main/java/me/fixeddev/commandflow/annotated/builder/Buildable.java rename to api/src/main/java/team/unnamed/commandflow/annotated/builder/Buildable.java index b7bd3cf1..cc183796 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/Buildable.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/builder/Buildable.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.annotated.builder; +package team.unnamed.commandflow.annotated.builder; -import me.fixeddev.commandflow.command.Command; +import team.unnamed.commandflow.command.Command; public interface Buildable { diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandActionNode.java b/api/src/main/java/team/unnamed/commandflow/annotated/builder/CommandActionNode.java similarity index 87% rename from api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandActionNode.java rename to api/src/main/java/team/unnamed/commandflow/annotated/builder/CommandActionNode.java index 2c0fd4bb..97174617 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandActionNode.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/builder/CommandActionNode.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow.annotated.builder; +package team.unnamed.commandflow.annotated.builder; -import me.fixeddev.commandflow.annotated.CommandClass; -import me.fixeddev.commandflow.command.Action; +import team.unnamed.commandflow.annotated.CommandClass; +import team.unnamed.commandflow.command.Action; import org.jetbrains.annotations.NotNull; import java.lang.reflect.Method; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandBuilderNodesImpl.java b/api/src/main/java/team/unnamed/commandflow/annotated/builder/CommandBuilderNodesImpl.java similarity index 90% rename from api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandBuilderNodesImpl.java rename to api/src/main/java/team/unnamed/commandflow/annotated/builder/CommandBuilderNodesImpl.java index 3bffad4f..f6b2edce 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandBuilderNodesImpl.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/builder/CommandBuilderNodesImpl.java @@ -1,23 +1,23 @@ -package me.fixeddev.commandflow.annotated.builder; - -import me.fixeddev.commandflow.annotated.CommandClass; -import me.fixeddev.commandflow.annotated.action.ReflectiveAction; -import me.fixeddev.commandflow.annotated.action.ValueGetter; -import me.fixeddev.commandflow.annotated.annotation.Named; -import me.fixeddev.commandflow.annotated.annotation.ParentArg; -import me.fixeddev.commandflow.annotated.modifier.CommandModifierFactory; -import me.fixeddev.commandflow.annotated.part.Key; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.annotated.part.PartInjector; -import me.fixeddev.commandflow.annotated.part.PartModifier; -import me.fixeddev.commandflow.command.Action; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.command.modifiers.CommandModifier; -import me.fixeddev.commandflow.command.modifiers.CommandModifiers; -import me.fixeddev.commandflow.command.modifiers.ModifierPhase; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.Parts; -import me.fixeddev.commandflow.part.defaults.SubCommandPart; +package team.unnamed.commandflow.annotated.builder; + +import team.unnamed.commandflow.annotated.CommandClass; +import team.unnamed.commandflow.annotated.action.ReflectiveAction; +import team.unnamed.commandflow.annotated.action.ValueGetter; +import team.unnamed.commandflow.annotated.annotation.Named; +import team.unnamed.commandflow.annotated.annotation.ParentArg; +import team.unnamed.commandflow.annotated.modifier.CommandModifierFactory; +import team.unnamed.commandflow.annotated.part.Key; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.annotated.part.PartInjector; +import team.unnamed.commandflow.annotated.part.PartModifier; +import team.unnamed.commandflow.command.Action; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.command.modifiers.CommandModifier; +import team.unnamed.commandflow.command.modifiers.CommandModifiers; +import team.unnamed.commandflow.command.modifiers.ModifierPhase; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.Parts; +import team.unnamed.commandflow.part.defaults.SubCommandPart; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandDataNode.java b/api/src/main/java/team/unnamed/commandflow/annotated/builder/CommandDataNode.java similarity index 74% rename from api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandDataNode.java rename to api/src/main/java/team/unnamed/commandflow/annotated/builder/CommandDataNode.java index f9dbaad7..3adc2722 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandDataNode.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/builder/CommandDataNode.java @@ -1,7 +1,8 @@ -package me.fixeddev.commandflow.annotated.builder; +package team.unnamed.commandflow.annotated.builder; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; +import team.unnamed.commandflow.command.Command; import java.util.Arrays; import java.util.List; @@ -11,14 +12,14 @@ public interface CommandDataNode extends Buildable { /** * @param aliases The command aliases * @return The same {@link CommandDataNode} instance. - * @see me.fixeddev.commandflow.command.Command.Builder#aliases(List) + * @see Command.Builder#aliases(List) */ @NotNull CommandDataNode aliases(@NotNull List aliases); /** * @param aliases The command aliases * @return The same {@link CommandDataNode} instance. - * @see me.fixeddev.commandflow.command.Command.Builder#aliases(String...) + * @see Command.Builder#aliases(String...) */ @NotNull default CommandDataNode aliases(@NotNull String... aliases) { @@ -28,40 +29,40 @@ default CommandDataNode aliases(@NotNull String... aliases) { /** * @param alias The alias to add * @return The same {@link CommandDataNode} instance. - * @see me.fixeddev.commandflow.command.Command.Builder#addAlias(String) + * @see Command.Builder#addAlias(String) */ @NotNull CommandDataNode addAlias(@NotNull String alias); /** * @param component The description component * @return The same {@link CommandDataNode} instance. - * @see me.fixeddev.commandflow.command.Command.Builder#description(Component) + * @see Command.Builder#description(Component) */ @NotNull CommandDataNode description(@NotNull Component component); /** * @param component The usage component * @return The same {@link CommandDataNode} instance. - * @see me.fixeddev.commandflow.command.Command.Builder#usage(Component) + * @see Command.Builder#usage(Component) */ @NotNull CommandDataNode usage(@NotNull Component component); /** * @param permission The permission string for the command. * @return The same {@link CommandDataNode} instance. - * @see me.fixeddev.commandflow.command.Command.Builder#permission(String) + * @see Command.Builder#permission(String) */ @NotNull CommandDataNode permission(@NotNull String permission); /** * @param permissionMessage The component to be sent when the user doesn't have permissions4. * @return The same {@link CommandDataNode} instance. - * @see me.fixeddev.commandflow.command.Command.Builder#permissionMessage(Component) + * @see Command.Builder#permissionMessage(Component) */ @NotNull CommandDataNode permissionMessage(@NotNull Component permissionMessage); /** - * This method gives you the next step of the process of building a {@link me.fixeddev.commandflow.command.Command}. + * This method gives you the next step of the process of building a {@link Command}. * * @return A {@link CommandModifiersNode} instance, which will allow continuing the building process of this command. */ diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandModifiersNode.java b/api/src/main/java/team/unnamed/commandflow/annotated/builder/CommandModifiersNode.java similarity index 72% rename from api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandModifiersNode.java rename to api/src/main/java/team/unnamed/commandflow/annotated/builder/CommandModifiersNode.java index 776d1bdc..c6932dfe 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandModifiersNode.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/builder/CommandModifiersNode.java @@ -1,10 +1,12 @@ -package me.fixeddev.commandflow.annotated.builder; +package team.unnamed.commandflow.annotated.builder; -import me.fixeddev.commandflow.annotated.CommandClass; -import me.fixeddev.commandflow.command.modifiers.CommandModifier; -import me.fixeddev.commandflow.command.modifiers.ModifierPhase; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.CommandClass; +import team.unnamed.commandflow.command.modifiers.CommandModifier; +import team.unnamed.commandflow.command.modifiers.ModifierPhase; +import team.unnamed.commandflow.part.CommandPart; import org.jetbrains.annotations.NotNull; +import team.unnamed.commandflow.annotated.modifier.CommandModifierFactory; +import team.unnamed.commandflow.command.Command; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -15,7 +17,7 @@ public interface CommandModifiersNode extends Buildable { /** * Sets the {@link CommandModifier} list of this command to a one created based on a {@link Method} with annotations. * The actual {@link CommandModifier} instances will be created based on the annotations that the method has, those - * are created using a {@link me.fixeddev.commandflow.annotated.modifier.CommandModifierFactory} provided by the PartInjector. + * are created using a {@link CommandModifierFactory} provided by the PartInjector. * * @param method The method which parameters will be converted to the list of {@link CommandPart} instances of the comand. * @param handler The {@link CommandClass} instance in which this method is present. @@ -30,7 +32,7 @@ public interface CommandModifiersNode extends Buildable { @NotNull CommandModifiersNode addModifier(@NotNull ModifierPhase phase, @NotNull CommandModifier modifier); /** - * This method gives you the next step of the process of building a {@link me.fixeddev.commandflow.command.Command}. + * This method gives you the next step of the process of building a {@link Command}. * * @return A {@link CommandPartsNode} instance, which will allow continuing the building process of this command. */ diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandPartsNode.java b/api/src/main/java/team/unnamed/commandflow/annotated/builder/CommandPartsNode.java similarity index 65% rename from api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandPartsNode.java rename to api/src/main/java/team/unnamed/commandflow/annotated/builder/CommandPartsNode.java index dc2e2230..23a501bb 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/CommandPartsNode.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/builder/CommandPartsNode.java @@ -1,8 +1,12 @@ -package me.fixeddev.commandflow.annotated.builder; +package team.unnamed.commandflow.annotated.builder; -import me.fixeddev.commandflow.annotated.CommandClass; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.CommandClass; +import team.unnamed.commandflow.part.CommandPart; import org.jetbrains.annotations.NotNull; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.annotated.part.PartInjector; +import team.unnamed.commandflow.annotated.part.PartModifier; +import team.unnamed.commandflow.command.Command; import java.lang.reflect.Method; @@ -11,8 +15,8 @@ public interface CommandPartsNode extends Buildable { /** * Sets the {@link CommandPart} list of this command to a one created based on a {@link Method} with annotations. * The actual {@link CommandPart} instances will be created based on the type and annotations that the parameter has, - * those are created with a {@link me.fixeddev.commandflow.annotated.part.PartFactory} and after that modified by a {@link me.fixeddev.commandflow.annotated.part.PartModifier} - * which are returned by the {@link me.fixeddev.commandflow.annotated.part.PartInjector} used on the builder. + * those are created with a {@link PartFactory} and after that modified by a {@link PartModifier} + * which are returned by the {@link PartInjector} used on the builder. * * @param method The method which parameters will be converted to the list of {@link CommandPart} instances of the comand. * @param handler The {@link CommandClass} instance in which this method is present. @@ -22,16 +26,16 @@ public interface CommandPartsNode extends Buildable { @NotNull CommandClass handler); /** - * Adds a {@link CommandPart} into the {@link me.fixeddev.commandflow.command.Command} being built. + * Adds a {@link CommandPart} into the {@link Command} being built. * - * @param part The {@link CommandPart} to add into the {@link me.fixeddev.commandflow.command.Command} parts. + * @param part The {@link CommandPart} to add into the {@link Command} parts. * @return A {@link CommandActionNode} instance, which will allow continuing the building process of this command. - * @see me.fixeddev.commandflow.command.Command.Builder#addPart(CommandPart) + * @see Command.Builder#addPart(CommandPart) */ @NotNull CommandPartsNode addPart(@NotNull CommandPart part); /** - * This method gives you the next step of the process of building a {@link me.fixeddev.commandflow.command.Command}. + * This method gives you the next step of the process of building a {@link Command}. * * @return A {@link CommandActionNode} instance, which will allow continuing the building process of this command. */ diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/SubCommandsNode.java b/api/src/main/java/team/unnamed/commandflow/annotated/builder/SubCommandsNode.java similarity index 81% rename from api/src/main/java/me/fixeddev/commandflow/annotated/builder/SubCommandsNode.java rename to api/src/main/java/team/unnamed/commandflow/annotated/builder/SubCommandsNode.java index 1ae440c8..7e7dee63 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/builder/SubCommandsNode.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/builder/SubCommandsNode.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow.annotated.builder; +package team.unnamed.commandflow.annotated.builder; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.part.defaults.SubCommandPart; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.part.defaults.SubCommandPart; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/modifier/CommandModifierFactory.java b/api/src/main/java/team/unnamed/commandflow/annotated/modifier/CommandModifierFactory.java similarity index 74% rename from api/src/main/java/me/fixeddev/commandflow/annotated/modifier/CommandModifierFactory.java rename to api/src/main/java/team/unnamed/commandflow/annotated/modifier/CommandModifierFactory.java index efe439b6..6b0be280 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/modifier/CommandModifierFactory.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/modifier/CommandModifierFactory.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow.annotated.modifier; +package team.unnamed.commandflow.annotated.modifier; -import me.fixeddev.commandflow.command.modifiers.CommandModifier; -import me.fixeddev.commandflow.command.modifiers.CommandModifiers; +import team.unnamed.commandflow.command.modifiers.CommandModifier; +import team.unnamed.commandflow.command.modifiers.CommandModifiers; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/AbstractModule.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/AbstractModule.java similarity index 94% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/AbstractModule.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/AbstractModule.java index 28dd50bb..8adb17cf 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/AbstractModule.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/AbstractModule.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.annotated.part; +package team.unnamed.commandflow.annotated.part; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.lang.reflect.Type; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/DelegatePartModifier.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/DelegatePartModifier.java similarity index 85% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/DelegatePartModifier.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/DelegatePartModifier.java index 721890f4..b684cf90 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/DelegatePartModifier.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/DelegatePartModifier.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.annotated.part; +package team.unnamed.commandflow.annotated.part; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/Key.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/Key.java similarity index 95% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/Key.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/Key.java index 36a0b31d..06a24b8a 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/Key.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/Key.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.part; +package team.unnamed.commandflow.annotated.part; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/Module.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/Module.java similarity index 89% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/Module.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/Module.java index 3841e68c..6f61244c 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/Module.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/Module.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.annotated.part; +package team.unnamed.commandflow.annotated.part; /** * An aggregation of multiple bindings of {@linkplain PartModifier} or {@linkplain PartFactory}, allowing to automatically register diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/PartFactory.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/PartFactory.java similarity index 89% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/PartFactory.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/PartFactory.java index b53501ea..d516e382 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/PartFactory.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/PartFactory.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.annotated.part; +package team.unnamed.commandflow.annotated.part; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/PartInjector.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/PartInjector.java similarity index 91% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/PartInjector.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/PartInjector.java index 7bd4e8d2..f3af3b12 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/PartInjector.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/PartInjector.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.annotated.part; +package team.unnamed.commandflow.annotated.part; -import me.fixeddev.commandflow.annotated.modifier.CommandModifierFactory; -import me.fixeddev.commandflow.command.modifiers.CommandModifier; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.modifier.CommandModifierFactory; +import team.unnamed.commandflow.command.modifiers.CommandModifier; +import team.unnamed.commandflow.part.CommandPart; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -17,7 +17,7 @@ public interface PartInjector { /** * Gets a {@link PartFactory} for a given {@link Type}. * - * @param type The type of {@link me.fixeddev.commandflow.part.CommandPart} to generate. + * @param type The type of {@link CommandPart} to generate. * @return An {@link PartFactory} for a specific {@link Type} of CommandPart. */ @Nullable @@ -28,7 +28,7 @@ default PartFactory getFactory(Type type) { /** * Gets a {@link PartFactory} for a given {@link Key}. * - * @param key The type of {@link me.fixeddev.commandflow.part.CommandPart} to generate. + * @param key The type of {@link CommandPart} to generate. * @return An {@link PartFactory} for a specific {@link Type} of CommandPart. */ @Nullable PartFactory getFactory(Key key); @@ -36,7 +36,7 @@ default PartFactory getFactory(Type type) { /** * Gets a {@link PartFactory} for a given {@link Key}. * - * @param annotation The type of {@link me.fixeddev.commandflow.part.CommandPart} to generate. + * @param annotation The type of {@link CommandPart} to generate. * @return An {@link PartFactory} for a specific {@link Type} of CommandPart. */ @Nullable PartModifier getModifier(Class annotation); diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/PartModifier.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/PartModifier.java similarity index 89% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/PartModifier.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/PartModifier.java index f210844c..cb21c946 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/PartModifier.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/PartModifier.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.annotated.part; +package team.unnamed.commandflow.annotated.part; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/SimplePartInjector.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/SimplePartInjector.java similarity index 94% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/SimplePartInjector.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/SimplePartInjector.java index 0efc053b..f44050f1 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/SimplePartInjector.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/SimplePartInjector.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.annotated.part; +package team.unnamed.commandflow.annotated.part; -import me.fixeddev.commandflow.annotated.modifier.CommandModifierFactory; +import team.unnamed.commandflow.annotated.modifier.CommandModifierFactory; import org.jetbrains.annotations.Nullable; import java.lang.annotation.Annotation; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/DefaultsModule.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/DefaultsModule.java similarity index 61% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/DefaultsModule.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/DefaultsModule.java index 5c778cd5..0ec1835f 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/DefaultsModule.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/DefaultsModule.java @@ -1,22 +1,23 @@ -package me.fixeddev.commandflow.annotated.part.defaults; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.annotated.annotation.Flag; -import me.fixeddev.commandflow.annotated.annotation.Limit; -import me.fixeddev.commandflow.annotated.annotation.OptArg; -import me.fixeddev.commandflow.annotated.annotation.Rewrites; -import me.fixeddev.commandflow.annotated.annotation.Suggestions; -import me.fixeddev.commandflow.annotated.annotation.Switch; -import me.fixeddev.commandflow.annotated.annotation.Text; -import me.fixeddev.commandflow.annotated.part.AbstractModule; -import me.fixeddev.commandflow.annotated.part.Key; +package team.unnamed.commandflow.annotated.part.defaults; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.annotated.annotation.Flag; +import team.unnamed.commandflow.annotated.annotation.Limit; +import team.unnamed.commandflow.annotated.annotation.OptArg; +import team.unnamed.commandflow.annotated.annotation.Rewrites; +import team.unnamed.commandflow.annotated.annotation.Suggestions; +import team.unnamed.commandflow.annotated.annotation.Switch; +import team.unnamed.commandflow.annotated.annotation.Text; +import team.unnamed.commandflow.annotated.part.AbstractModule; +import team.unnamed.commandflow.annotated.part.Key; import me.fixeddev.commandflow.annotated.part.defaults.factory.*; -import me.fixeddev.commandflow.annotated.part.defaults.modifier.LimitModifier; -import me.fixeddev.commandflow.annotated.part.defaults.modifier.OptionalModifier; -import me.fixeddev.commandflow.annotated.part.defaults.modifier.RewritesModifier; -import me.fixeddev.commandflow.annotated.part.defaults.modifier.SuggestionsModifier; -import me.fixeddev.commandflow.annotated.part.defaults.modifier.ValueFlagModifier; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.annotated.part.defaults.modifier.LimitModifier; +import team.unnamed.commandflow.annotated.part.defaults.modifier.OptionalModifier; +import team.unnamed.commandflow.annotated.part.defaults.modifier.RewritesModifier; +import team.unnamed.commandflow.annotated.part.defaults.modifier.SuggestionsModifier; +import team.unnamed.commandflow.annotated.part.defaults.modifier.ValueFlagModifier; +import team.unnamed.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.annotated.part.defaults.factory.*; public class DefaultsModule extends AbstractModule { diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ArgumentStackPartFactory.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/ArgumentStackPartFactory.java similarity index 54% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ArgumentStackPartFactory.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/ArgumentStackPartFactory.java index 64a3e9db..3d3acb65 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ArgumentStackPartFactory.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/ArgumentStackPartFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.annotated.part.defaults.factory; +package team.unnamed.commandflow.annotated.part.defaults.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.defaults.ArgumentStackPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.defaults.ArgumentStackPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/BooleanPartFactory.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/BooleanPartFactory.java similarity index 53% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/BooleanPartFactory.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/BooleanPartFactory.java index 724219ae..df8c581f 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/BooleanPartFactory.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/BooleanPartFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.annotated.part.defaults.factory; +package team.unnamed.commandflow.annotated.part.defaults.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.defaults.BooleanPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.defaults.BooleanPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ContextFactory.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/ContextFactory.java similarity index 53% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ContextFactory.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/ContextFactory.java index 1c7d3608..a5fad38a 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/ContextFactory.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/ContextFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.annotated.part.defaults.factory; +package team.unnamed.commandflow.annotated.part.defaults.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.defaults.ContextPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.defaults.ContextPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/DoublePartFactory.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/DoublePartFactory.java similarity index 59% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/DoublePartFactory.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/DoublePartFactory.java index 613457a0..5ed772b4 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/DoublePartFactory.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/DoublePartFactory.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.annotated.part.defaults.factory; +package team.unnamed.commandflow.annotated.part.defaults.factory; -import me.fixeddev.commandflow.annotated.annotation.Range; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.defaults.DoublePart; +import team.unnamed.commandflow.annotated.annotation.Range; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.defaults.DoublePart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/EnumPartFactory.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/EnumPartFactory.java similarity index 71% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/EnumPartFactory.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/EnumPartFactory.java index 75421bb0..3ecbba49 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/EnumPartFactory.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/EnumPartFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.annotated.part.defaults.factory; +package team.unnamed.commandflow.annotated.part.defaults.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.Parts; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.Parts; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/FloatPartFactory.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/FloatPartFactory.java similarity index 59% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/FloatPartFactory.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/FloatPartFactory.java index 5217afcf..516c634f 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/FloatPartFactory.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/FloatPartFactory.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.annotated.part.defaults.factory; +package team.unnamed.commandflow.annotated.part.defaults.factory; -import me.fixeddev.commandflow.annotated.annotation.Range; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.defaults.FloatPart; +import team.unnamed.commandflow.annotated.annotation.Range; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.defaults.FloatPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/IntegerPartFactory.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/IntegerPartFactory.java similarity index 59% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/IntegerPartFactory.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/IntegerPartFactory.java index de8cc70d..c440b080 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/IntegerPartFactory.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/IntegerPartFactory.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.annotated.part.defaults.factory; +package team.unnamed.commandflow.annotated.part.defaults.factory; -import me.fixeddev.commandflow.annotated.annotation.Range; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.defaults.IntegerPart; +import team.unnamed.commandflow.annotated.annotation.Range; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.defaults.IntegerPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/LongPartFactory.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/LongPartFactory.java similarity index 52% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/LongPartFactory.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/LongPartFactory.java index cafcfffe..d8e0cc8a 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/LongPartFactory.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/LongPartFactory.java @@ -1,10 +1,10 @@ -package me.fixeddev.commandflow.annotated.part.defaults.factory; +package team.unnamed.commandflow.annotated.part.defaults.factory; -import me.fixeddev.commandflow.annotated.annotation.Range; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.defaults.FloatPart; -import me.fixeddev.commandflow.part.defaults.LongPart; +import team.unnamed.commandflow.annotated.annotation.Range; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.defaults.FloatPart; +import team.unnamed.commandflow.part.defaults.LongPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringPartFactory.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/StringPartFactory.java similarity index 52% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringPartFactory.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/StringPartFactory.java index 3b2c26ac..5299b40b 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringPartFactory.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/StringPartFactory.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.annotated.part.defaults.factory; +package team.unnamed.commandflow.annotated.part.defaults.factory; -import me.fixeddev.commandflow.annotated.annotation.ConsumeAll; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.defaults.StringPart; +import team.unnamed.commandflow.annotated.annotation.ConsumeAll; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.defaults.StringPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringTextPartFactory.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/StringTextPartFactory.java similarity index 55% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringTextPartFactory.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/StringTextPartFactory.java index 1b3e34dd..93d665a2 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/StringTextPartFactory.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/StringTextPartFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.annotated.part.defaults.factory; +package team.unnamed.commandflow.annotated.part.defaults.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.defaults.StringPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.defaults.StringPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/SwitchPartFactory.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/SwitchPartFactory.java similarity index 60% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/SwitchPartFactory.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/SwitchPartFactory.java index 6b7db1c3..8c955b2b 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/factory/SwitchPartFactory.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/factory/SwitchPartFactory.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.annotated.part.defaults.factory; +package team.unnamed.commandflow.annotated.part.defaults.factory; -import me.fixeddev.commandflow.annotated.annotation.Switch; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.defaults.SwitchPart; +import team.unnamed.commandflow.annotated.annotation.Switch; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.defaults.SwitchPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/LimitModifier.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/modifier/LimitModifier.java similarity index 59% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/LimitModifier.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/modifier/LimitModifier.java index aff82921..f7da159d 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/LimitModifier.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/modifier/LimitModifier.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.annotated.part.defaults.modifier; +package team.unnamed.commandflow.annotated.part.defaults.modifier; -import me.fixeddev.commandflow.annotated.annotation.Limit; -import me.fixeddev.commandflow.annotated.part.PartModifier; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.Parts; +import team.unnamed.commandflow.annotated.annotation.Limit; +import team.unnamed.commandflow.annotated.part.PartModifier; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.Parts; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/OptionalModifier.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/modifier/OptionalModifier.java similarity index 61% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/OptionalModifier.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/modifier/OptionalModifier.java index a15bdaec..cf0e239e 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/OptionalModifier.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/modifier/OptionalModifier.java @@ -1,11 +1,10 @@ -package me.fixeddev.commandflow.annotated.part.defaults.modifier; +package team.unnamed.commandflow.annotated.part.defaults.modifier; -import me.fixeddev.commandflow.annotated.annotation.OptArg; -import me.fixeddev.commandflow.annotated.annotation.Strict; -import me.fixeddev.commandflow.annotated.part.PartModifier; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.Parts; -import me.fixeddev.commandflow.part.defaults.OptionalPart; +import team.unnamed.commandflow.annotated.annotation.OptArg; +import team.unnamed.commandflow.annotated.annotation.Strict; +import team.unnamed.commandflow.annotated.part.PartModifier; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.Parts; import java.lang.annotation.Annotation; import java.util.Arrays; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/RewritesModifier.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/modifier/RewritesModifier.java similarity index 64% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/RewritesModifier.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/modifier/RewritesModifier.java index 0f997211..4f2d12c9 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/RewritesModifier.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/modifier/RewritesModifier.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.annotated.part.defaults.modifier; +package team.unnamed.commandflow.annotated.part.defaults.modifier; -import me.fixeddev.commandflow.annotated.annotation.Rewrites; -import me.fixeddev.commandflow.annotated.part.PartModifier; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.defaults.ArgumentRewriterPart; +import team.unnamed.commandflow.annotated.annotation.Rewrites; +import team.unnamed.commandflow.annotated.part.PartModifier; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.defaults.ArgumentRewriterPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/SuggestionsModifier.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/modifier/SuggestionsModifier.java similarity index 58% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/SuggestionsModifier.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/modifier/SuggestionsModifier.java index 8a9f30d4..731dedc7 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/SuggestionsModifier.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/modifier/SuggestionsModifier.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.annotated.part.defaults.modifier; +package team.unnamed.commandflow.annotated.part.defaults.modifier; -import me.fixeddev.commandflow.annotated.annotation.Suggestions; -import me.fixeddev.commandflow.annotated.part.PartModifier; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.defaults.SuggestionsModifierPart; +import team.unnamed.commandflow.annotated.annotation.Suggestions; +import team.unnamed.commandflow.annotated.part.PartModifier; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.defaults.SuggestionsModifierPart; import java.lang.annotation.Annotation; import java.util.Arrays; diff --git a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/ValueFlagModifier.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/modifier/ValueFlagModifier.java similarity index 61% rename from api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/ValueFlagModifier.java rename to api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/modifier/ValueFlagModifier.java index b6729735..d98c2d49 100644 --- a/api/src/main/java/me/fixeddev/commandflow/annotated/part/defaults/modifier/ValueFlagModifier.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/modifier/ValueFlagModifier.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.annotated.part.defaults.modifier; +package team.unnamed.commandflow.annotated.part.defaults.modifier; -import me.fixeddev.commandflow.annotated.annotation.Flag; -import me.fixeddev.commandflow.annotated.part.PartModifier; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.defaults.ValueFlagPart; +import team.unnamed.commandflow.annotated.annotation.Flag; +import team.unnamed.commandflow.annotated.part.PartModifier; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.defaults.ValueFlagPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/command/Action.java b/api/src/main/java/team/unnamed/commandflow/command/Action.java similarity index 72% rename from api/src/main/java/me/fixeddev/commandflow/command/Action.java rename to api/src/main/java/team/unnamed/commandflow/command/Action.java index 5b835f39..9123b67e 100644 --- a/api/src/main/java/me/fixeddev/commandflow/command/Action.java +++ b/api/src/main/java/team/unnamed/commandflow/command/Action.java @@ -1,7 +1,8 @@ -package me.fixeddev.commandflow.command; +package team.unnamed.commandflow.command; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.CommandException; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.CommandManager; +import team.unnamed.commandflow.exception.CommandException; public interface Action { @@ -11,7 +12,7 @@ public interface Action { Action NULL_ACTION = context -> false; /** - * The action to execute when the {@link Command} is being called/run by the {@link me.fixeddev.commandflow.CommandManager}. + * The action to execute when the {@link Command} is being called/run by the {@link CommandManager}. * * @param context The {@link CommandContext} for this executed command. * @return If the action was executed sucessfully or not, if the value is false, the usage will be send to the source. diff --git a/api/src/main/java/me/fixeddev/commandflow/command/Command.java b/api/src/main/java/team/unnamed/commandflow/command/Command.java similarity index 88% rename from api/src/main/java/me/fixeddev/commandflow/command/Command.java rename to api/src/main/java/team/unnamed/commandflow/command/Command.java index 067d25da..33dd66fe 100644 --- a/api/src/main/java/me/fixeddev/commandflow/command/Command.java +++ b/api/src/main/java/team/unnamed/commandflow/command/Command.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.command; +package team.unnamed.commandflow.command; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.command.modifiers.CommandModifiers; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.defaults.SequentialCommandPart; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.command.modifiers.CommandModifiers; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.defaults.SequentialCommandPart; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -73,7 +73,7 @@ public interface Command { CommandPart getPart(); /** - * A utility object, that has all the {@linkplain me.fixeddev.commandflow.command.modifiers.CommandModifiers} for this command, + * A utility object, that has all the {@linkplain CommandModifiers} for this command, * and allows to easily call them at any phase of the execution of the command * * @return The {@link CommandModifiers} for this command. @@ -82,7 +82,7 @@ public interface Command { CommandModifiers getModifiers(); /** - * The {@link Action} executed after the parsing has been finished. The {@link me.fixeddev.commandflow.CommandContext} passed to the action + * The {@link Action} executed after the parsing has been finished. The {@link CommandContext} passed to the action * is the resulting one after the parsing by the {@link CommandPart} returned by {@link Command#getPart()} is done. * * @return The {@link Action} for this command. diff --git a/api/src/main/java/me/fixeddev/commandflow/command/SimpleCommand.java b/api/src/main/java/team/unnamed/commandflow/command/SimpleCommand.java similarity index 95% rename from api/src/main/java/me/fixeddev/commandflow/command/SimpleCommand.java rename to api/src/main/java/team/unnamed/commandflow/command/SimpleCommand.java index 3ee6f34b..3f1c3cb2 100644 --- a/api/src/main/java/me/fixeddev/commandflow/command/SimpleCommand.java +++ b/api/src/main/java/team/unnamed/commandflow/command/SimpleCommand.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.command; +package team.unnamed.commandflow.command; -import me.fixeddev.commandflow.command.modifiers.CommandModifiers; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.defaults.EmptyPart; -import me.fixeddev.commandflow.part.Parts; +import team.unnamed.commandflow.command.modifiers.CommandModifiers; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.defaults.EmptyPart; +import team.unnamed.commandflow.part.Parts; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifier.java b/api/src/main/java/team/unnamed/commandflow/command/modifiers/CommandModifier.java similarity index 82% rename from api/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifier.java rename to api/src/main/java/team/unnamed/commandflow/command/modifiers/CommandModifier.java index d1fc8aba..a171bee9 100644 --- a/api/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifier.java +++ b/api/src/main/java/team/unnamed/commandflow/command/modifiers/CommandModifier.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow.command.modifiers; +package team.unnamed.commandflow.command.modifiers; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.stack.ArgumentStack; public interface CommandModifier { diff --git a/api/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifiers.java b/api/src/main/java/team/unnamed/commandflow/command/modifiers/CommandModifiers.java similarity index 94% rename from api/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifiers.java rename to api/src/main/java/team/unnamed/commandflow/command/modifiers/CommandModifiers.java index 30dcb3a3..2c4a4802 100644 --- a/api/src/main/java/me/fixeddev/commandflow/command/modifiers/CommandModifiers.java +++ b/api/src/main/java/team/unnamed/commandflow/command/modifiers/CommandModifiers.java @@ -1,11 +1,7 @@ -package me.fixeddev.commandflow.command.modifiers; +package team.unnamed.commandflow.command.modifiers; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.stack.ArgumentStack; - -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.stack.ArgumentStack; /** * This class is used to store all the modifiers of a command, and aid in the process of calling them in the right order at diff --git a/api/src/main/java/me/fixeddev/commandflow/command/modifiers/FallbackCommandModifiers.java b/api/src/main/java/team/unnamed/commandflow/command/modifiers/FallbackCommandModifiers.java similarity index 98% rename from api/src/main/java/me/fixeddev/commandflow/command/modifiers/FallbackCommandModifiers.java rename to api/src/main/java/team/unnamed/commandflow/command/modifiers/FallbackCommandModifiers.java index ccd2d6a4..297ef20e 100644 --- a/api/src/main/java/me/fixeddev/commandflow/command/modifiers/FallbackCommandModifiers.java +++ b/api/src/main/java/team/unnamed/commandflow/command/modifiers/FallbackCommandModifiers.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.command.modifiers; +package team.unnamed.commandflow.command.modifiers; import java.util.HashMap; import java.util.LinkedList; diff --git a/api/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierPhase.java b/api/src/main/java/team/unnamed/commandflow/command/modifiers/ModifierPhase.java similarity index 94% rename from api/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierPhase.java rename to api/src/main/java/team/unnamed/commandflow/command/modifiers/ModifierPhase.java index 7f6fa5a8..2cb503d7 100644 --- a/api/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierPhase.java +++ b/api/src/main/java/team/unnamed/commandflow/command/modifiers/ModifierPhase.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.command.modifiers; +package team.unnamed.commandflow.command.modifiers; /** * This enum represents the different phases in which a modifier may be applied. diff --git a/api/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierUtils.java b/api/src/main/java/team/unnamed/commandflow/command/modifiers/ModifierUtils.java similarity index 96% rename from api/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierUtils.java rename to api/src/main/java/team/unnamed/commandflow/command/modifiers/ModifierUtils.java index aebe9c3f..fc287a42 100644 --- a/api/src/main/java/me/fixeddev/commandflow/command/modifiers/ModifierUtils.java +++ b/api/src/main/java/team/unnamed/commandflow/command/modifiers/ModifierUtils.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.command.modifiers; +package team.unnamed.commandflow.command.modifiers; import java.util.LinkedList; import java.util.Map; diff --git a/api/src/main/java/me/fixeddev/commandflow/command/modifiers/SequentialCommandModifier.java b/api/src/main/java/team/unnamed/commandflow/command/modifiers/SequentialCommandModifier.java similarity index 92% rename from api/src/main/java/me/fixeddev/commandflow/command/modifiers/SequentialCommandModifier.java rename to api/src/main/java/team/unnamed/commandflow/command/modifiers/SequentialCommandModifier.java index c230aa27..98ddd0e1 100644 --- a/api/src/main/java/me/fixeddev/commandflow/command/modifiers/SequentialCommandModifier.java +++ b/api/src/main/java/team/unnamed/commandflow/command/modifiers/SequentialCommandModifier.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow.command.modifiers; +package team.unnamed.commandflow.command.modifiers; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.stack.ArgumentStack; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/command/modifiers/SimpleCommandModifiers.java b/api/src/main/java/team/unnamed/commandflow/command/modifiers/SimpleCommandModifiers.java similarity index 95% rename from api/src/main/java/me/fixeddev/commandflow/command/modifiers/SimpleCommandModifiers.java rename to api/src/main/java/team/unnamed/commandflow/command/modifiers/SimpleCommandModifiers.java index d8b7df92..92f8b4eb 100644 --- a/api/src/main/java/me/fixeddev/commandflow/command/modifiers/SimpleCommandModifiers.java +++ b/api/src/main/java/team/unnamed/commandflow/command/modifiers/SimpleCommandModifiers.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow.command.modifiers; +package team.unnamed.commandflow.command.modifiers; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.stack.ArgumentStack; import java.util.HashMap; import java.util.Iterator; diff --git a/api/src/main/java/me/fixeddev/commandflow/exception/ArgumentException.java b/api/src/main/java/team/unnamed/commandflow/exception/ArgumentException.java similarity index 86% rename from api/src/main/java/me/fixeddev/commandflow/exception/ArgumentException.java rename to api/src/main/java/team/unnamed/commandflow/exception/ArgumentException.java index 037de0aa..a2e6c812 100644 --- a/api/src/main/java/me/fixeddev/commandflow/exception/ArgumentException.java +++ b/api/src/main/java/team/unnamed/commandflow/exception/ArgumentException.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow.exception; +package team.unnamed.commandflow.exception; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.part.CommandPart; import net.kyori.adventure.text.Component; public class ArgumentException extends CommandException { diff --git a/api/src/main/java/me/fixeddev/commandflow/exception/ArgumentParseException.java b/api/src/main/java/team/unnamed/commandflow/exception/ArgumentParseException.java similarity index 92% rename from api/src/main/java/me/fixeddev/commandflow/exception/ArgumentParseException.java rename to api/src/main/java/team/unnamed/commandflow/exception/ArgumentParseException.java index 7576893c..645421c7 100644 --- a/api/src/main/java/me/fixeddev/commandflow/exception/ArgumentParseException.java +++ b/api/src/main/java/team/unnamed/commandflow/exception/ArgumentParseException.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.exception; +package team.unnamed.commandflow.exception; import net.kyori.adventure.text.Component; diff --git a/api/src/main/java/me/fixeddev/commandflow/exception/CommandException.java b/api/src/main/java/team/unnamed/commandflow/exception/CommandException.java similarity index 94% rename from api/src/main/java/me/fixeddev/commandflow/exception/CommandException.java rename to api/src/main/java/team/unnamed/commandflow/exception/CommandException.java index 5ceaa30c..af8c1bbc 100644 --- a/api/src/main/java/me/fixeddev/commandflow/exception/CommandException.java +++ b/api/src/main/java/team/unnamed/commandflow/exception/CommandException.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.exception; +package team.unnamed.commandflow.exception; -import me.fixeddev.commandflow.command.Command; +import team.unnamed.commandflow.command.Command; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TranslatableComponent; diff --git a/api/src/main/java/me/fixeddev/commandflow/exception/CommandUsage.java b/api/src/main/java/team/unnamed/commandflow/exception/CommandUsage.java similarity index 92% rename from api/src/main/java/me/fixeddev/commandflow/exception/CommandUsage.java rename to api/src/main/java/team/unnamed/commandflow/exception/CommandUsage.java index f54af75d..c263eaab 100644 --- a/api/src/main/java/me/fixeddev/commandflow/exception/CommandUsage.java +++ b/api/src/main/java/team/unnamed/commandflow/exception/CommandUsage.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.exception; +package team.unnamed.commandflow.exception; import net.kyori.adventure.text.Component; diff --git a/api/src/main/java/me/fixeddev/commandflow/exception/InvalidSubCommandException.java b/api/src/main/java/team/unnamed/commandflow/exception/InvalidSubCommandException.java similarity index 92% rename from api/src/main/java/me/fixeddev/commandflow/exception/InvalidSubCommandException.java rename to api/src/main/java/team/unnamed/commandflow/exception/InvalidSubCommandException.java index bc1e6f6b..d70cc639 100644 --- a/api/src/main/java/me/fixeddev/commandflow/exception/InvalidSubCommandException.java +++ b/api/src/main/java/team/unnamed/commandflow/exception/InvalidSubCommandException.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.exception; +package team.unnamed.commandflow.exception; import net.kyori.adventure.text.Component; diff --git a/api/src/main/java/me/fixeddev/commandflow/exception/NoMoreArgumentsException.java b/api/src/main/java/team/unnamed/commandflow/exception/NoMoreArgumentsException.java similarity index 92% rename from api/src/main/java/me/fixeddev/commandflow/exception/NoMoreArgumentsException.java rename to api/src/main/java/team/unnamed/commandflow/exception/NoMoreArgumentsException.java index 1192d87b..69c79978 100644 --- a/api/src/main/java/me/fixeddev/commandflow/exception/NoMoreArgumentsException.java +++ b/api/src/main/java/team/unnamed/commandflow/exception/NoMoreArgumentsException.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.exception; +package team.unnamed.commandflow.exception; import net.kyori.adventure.text.Component; diff --git a/api/src/main/java/me/fixeddev/commandflow/exception/NoPermissionsException.java b/api/src/main/java/team/unnamed/commandflow/exception/NoPermissionsException.java similarity index 90% rename from api/src/main/java/me/fixeddev/commandflow/exception/NoPermissionsException.java rename to api/src/main/java/team/unnamed/commandflow/exception/NoPermissionsException.java index 422f7898..8aa9cecd 100644 --- a/api/src/main/java/me/fixeddev/commandflow/exception/NoPermissionsException.java +++ b/api/src/main/java/team/unnamed/commandflow/exception/NoPermissionsException.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.exception; +package team.unnamed.commandflow.exception; import net.kyori.adventure.text.Component; diff --git a/api/src/main/java/me/fixeddev/commandflow/exception/StopParseException.java b/api/src/main/java/team/unnamed/commandflow/exception/StopParseException.java similarity index 87% rename from api/src/main/java/me/fixeddev/commandflow/exception/StopParseException.java rename to api/src/main/java/team/unnamed/commandflow/exception/StopParseException.java index 69b10341..14a333a0 100644 --- a/api/src/main/java/me/fixeddev/commandflow/exception/StopParseException.java +++ b/api/src/main/java/team/unnamed/commandflow/exception/StopParseException.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.exception; +package team.unnamed.commandflow.exception; /** * Thrown when we should stop parsing the command, without doing any further processing. diff --git a/api/src/main/java/me/fixeddev/commandflow/executor/DefaultExecutor.java b/api/src/main/java/team/unnamed/commandflow/executor/DefaultExecutor.java similarity index 67% rename from api/src/main/java/me/fixeddev/commandflow/executor/DefaultExecutor.java rename to api/src/main/java/team/unnamed/commandflow/executor/DefaultExecutor.java index 19870c8c..b7ba7b65 100644 --- a/api/src/main/java/me/fixeddev/commandflow/executor/DefaultExecutor.java +++ b/api/src/main/java/team/unnamed/commandflow/executor/DefaultExecutor.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.executor; +package team.unnamed.commandflow.executor; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.exception.CommandUsage; -import me.fixeddev.commandflow.usage.UsageBuilder; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.exception.CommandUsage; +import team.unnamed.commandflow.usage.UsageBuilder; public class DefaultExecutor implements Executor { diff --git a/api/src/main/java/me/fixeddev/commandflow/executor/Executor.java b/api/src/main/java/team/unnamed/commandflow/executor/Executor.java similarity index 71% rename from api/src/main/java/me/fixeddev/commandflow/executor/Executor.java rename to api/src/main/java/team/unnamed/commandflow/executor/Executor.java index cce08bf6..cf427ccb 100644 --- a/api/src/main/java/me/fixeddev/commandflow/executor/Executor.java +++ b/api/src/main/java/team/unnamed/commandflow/executor/Executor.java @@ -1,9 +1,10 @@ -package me.fixeddev.commandflow.executor; +package team.unnamed.commandflow.executor; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.command.Action; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.usage.UsageBuilder; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.command.Action; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.usage.UsageBuilder; /** * This class has the functionality of actually calling the {@link Action} of the command @@ -14,7 +15,7 @@ public interface Executor { /** * Executes the right {@link Action} based on the given {@link CommandContext}. * - * @param commandContext The {@link CommandContext} of the {@link me.fixeddev.commandflow.command.Command} to execute. + * @param commandContext The {@link CommandContext} of the {@link Command} to execute. * @param builder The {@link UsageBuilder} used to generate an usage text if the {@link Action} returns false or if * the command execution fails for a valid reason. * @return If the {@link Action} for the given {@link CommandContext} could be executed. diff --git a/api/src/main/java/me/fixeddev/commandflow/input/InputTokenizer.java b/api/src/main/java/team/unnamed/commandflow/input/InputTokenizer.java similarity index 88% rename from api/src/main/java/me/fixeddev/commandflow/input/InputTokenizer.java rename to api/src/main/java/team/unnamed/commandflow/input/InputTokenizer.java index cf622677..c4fddc30 100644 --- a/api/src/main/java/me/fixeddev/commandflow/input/InputTokenizer.java +++ b/api/src/main/java/team/unnamed/commandflow/input/InputTokenizer.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.input; +package team.unnamed.commandflow.input; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/input/QuotedSpaceTokenizer.java b/api/src/main/java/team/unnamed/commandflow/input/QuotedSpaceTokenizer.java similarity index 98% rename from api/src/main/java/me/fixeddev/commandflow/input/QuotedSpaceTokenizer.java rename to api/src/main/java/team/unnamed/commandflow/input/QuotedSpaceTokenizer.java index 0379b943..ede9b6cf 100644 --- a/api/src/main/java/me/fixeddev/commandflow/input/QuotedSpaceTokenizer.java +++ b/api/src/main/java/team/unnamed/commandflow/input/QuotedSpaceTokenizer.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.input; +package team.unnamed.commandflow.input; import java.util.ArrayList; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/input/StringSpaceTokenizer.java b/api/src/main/java/team/unnamed/commandflow/input/StringSpaceTokenizer.java similarity index 88% rename from api/src/main/java/me/fixeddev/commandflow/input/StringSpaceTokenizer.java rename to api/src/main/java/team/unnamed/commandflow/input/StringSpaceTokenizer.java index e848b359..1a0a0dbd 100644 --- a/api/src/main/java/me/fixeddev/commandflow/input/StringSpaceTokenizer.java +++ b/api/src/main/java/team/unnamed/commandflow/input/StringSpaceTokenizer.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.input; +package team.unnamed.commandflow.input; import java.util.ArrayList; import java.util.Arrays; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/ArgumentPart.java b/api/src/main/java/team/unnamed/commandflow/part/ArgumentPart.java similarity index 82% rename from api/src/main/java/me/fixeddev/commandflow/part/ArgumentPart.java rename to api/src/main/java/team/unnamed/commandflow/part/ArgumentPart.java index 5c261149..f9f22305 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/ArgumentPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/ArgumentPart.java @@ -1,10 +1,10 @@ -package me.fixeddev.commandflow.part; +package team.unnamed.commandflow.part; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.visitor.CommandPartVisitor; -import me.fixeddev.commandflow.stack.ArgumentStack; -import me.fixeddev.commandflow.stack.StackSnapshot; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.visitor.CommandPartVisitor; +import team.unnamed.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.stack.StackSnapshot; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/CommandPart.java b/api/src/main/java/team/unnamed/commandflow/part/CommandPart.java similarity index 76% rename from api/src/main/java/me/fixeddev/commandflow/part/CommandPart.java rename to api/src/main/java/team/unnamed/commandflow/part/CommandPart.java index f8f01bff..5fda9877 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/CommandPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/CommandPart.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.part; +package team.unnamed.commandflow.part; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.visitor.CommandPartVisitor; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.visitor.CommandPartVisitor; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/Parts.java b/api/src/main/java/team/unnamed/commandflow/part/Parts.java similarity index 93% rename from api/src/main/java/me/fixeddev/commandflow/part/Parts.java rename to api/src/main/java/team/unnamed/commandflow/part/Parts.java index 62cd1ad4..4bd4a8b9 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/Parts.java +++ b/api/src/main/java/team/unnamed/commandflow/part/Parts.java @@ -1,22 +1,22 @@ -package me.fixeddev.commandflow.part; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.part.defaults.BooleanPart; -import me.fixeddev.commandflow.part.defaults.DoublePart; -import me.fixeddev.commandflow.part.defaults.EnumPart; -import me.fixeddev.commandflow.part.defaults.FirstMatchPart; -import me.fixeddev.commandflow.part.defaults.LongPart; -import me.fixeddev.commandflow.part.defaults.SwitchPart; -import me.fixeddev.commandflow.part.defaults.FloatPart; -import me.fixeddev.commandflow.part.defaults.IntegerPart; -import me.fixeddev.commandflow.part.defaults.LimitingPart; -import me.fixeddev.commandflow.part.defaults.OptionalPart; -import me.fixeddev.commandflow.part.defaults.SequentialCommandPart; -import me.fixeddev.commandflow.part.defaults.StringPart; -import me.fixeddev.commandflow.part.defaults.SubCommandPart; -import me.fixeddev.commandflow.part.defaults.ValueFlagPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +package team.unnamed.commandflow.part; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.part.defaults.BooleanPart; +import team.unnamed.commandflow.part.defaults.DoublePart; +import team.unnamed.commandflow.part.defaults.EnumPart; +import team.unnamed.commandflow.part.defaults.FirstMatchPart; +import team.unnamed.commandflow.part.defaults.LongPart; +import team.unnamed.commandflow.part.defaults.SwitchPart; +import team.unnamed.commandflow.part.defaults.FloatPart; +import team.unnamed.commandflow.part.defaults.IntegerPart; +import team.unnamed.commandflow.part.defaults.LimitingPart; +import team.unnamed.commandflow.part.defaults.OptionalPart; +import team.unnamed.commandflow.part.defaults.SequentialCommandPart; +import team.unnamed.commandflow.part.defaults.StringPart; +import team.unnamed.commandflow.part.defaults.SubCommandPart; +import team.unnamed.commandflow.part.defaults.ValueFlagPart; +import team.unnamed.commandflow.stack.ArgumentStack; import java.util.ArrayList; import java.util.Arrays; @@ -127,7 +127,7 @@ public static CommandPart valueFlag(CommandPart part, String shortName, boolean /** - * A basic {@link CommandPart} that takes a string from the {@link me.fixeddev.commandflow.stack.ArgumentStack} + * A basic {@link CommandPart} that takes a string from the {@link ArgumentStack} * and converts it into an Enum value. * * @param name The name for this part. @@ -140,7 +140,7 @@ public static CommandPart enumPart(String name, Class> enumTyp /** - * A basic {@link CommandPart} that takes a string from the {@link me.fixeddev.commandflow.stack.ArgumentStack} + * A basic {@link CommandPart} that takes a string from the {@link ArgumentStack} * * @param name The name for this part. * @return A {@link CommandPart} with the given name that takes a {@link String} as argument. @@ -174,7 +174,7 @@ public static CommandPart longPart(String name, long min, long max) { } /** - * A basic {@link CommandPart} that takes a string from the {@link me.fixeddev.commandflow.stack.ArgumentStack} + * A basic {@link CommandPart} that takes a string from the {@link ArgumentStack} * * @param name The name for this part. * @return A {@link CommandPart} with the given name that takes a {@link Integer} as argument. @@ -184,7 +184,7 @@ public static CommandPart integer(String name) { } /** - * A basic {@link CommandPart} that takes a string from the {@link me.fixeddev.commandflow.stack.ArgumentStack} + * A basic {@link CommandPart} that takes a string from the {@link ArgumentStack} * * @param name The name for this part. * @param max The maximum number allowed by this part. @@ -196,7 +196,7 @@ public static CommandPart integer(String name, int min, int max) { } /** - * A basic {@link CommandPart} that takes a string from the {@link me.fixeddev.commandflow.stack.ArgumentStack} + * A basic {@link CommandPart} that takes a string from the {@link ArgumentStack} * * @param name The name for this part. * @return A {@link CommandPart} with the given name that takes a {@link Double} as argument. @@ -206,7 +206,7 @@ public static CommandPart doublePart(String name) { } /** - * A basic {@link CommandPart} that takes a string from the {@link me.fixeddev.commandflow.stack.ArgumentStack} + * A basic {@link CommandPart} that takes a string from the {@link ArgumentStack} * * @param name The name for this part. * @param max The maximum number allowed by this part. @@ -218,7 +218,7 @@ public static CommandPart doublePart(String name, double min, double max) { } /** - * A basic {@link CommandPart} that takes a string from the {@link me.fixeddev.commandflow.stack.ArgumentStack} + * A basic {@link CommandPart} that takes a string from the {@link ArgumentStack} * * @param name The name for this part. * @return A {@link CommandPart} with the given name that takes a {@link Float} as argument. @@ -229,7 +229,7 @@ public static CommandPart floatPart(String name) { /** - * A basic {@link CommandPart} that takes a string from the {@link me.fixeddev.commandflow.stack.ArgumentStack} + * A basic {@link CommandPart} that takes a string from the {@link ArgumentStack} * * @param name The name for this part. * @param max The maximum number allowed by this part. @@ -242,7 +242,7 @@ public static CommandPart floatPart(String name, float min, float max) { /** - * A basic {@link CommandPart} that takes a string from the {@link me.fixeddev.commandflow.stack.ArgumentStack} + * A basic {@link CommandPart} that takes a string from the {@link ArgumentStack} * * @param name The name for this part. * @return A {@link CommandPart} with the given name that takes a {@link Boolean} as argument. diff --git a/api/src/main/java/me/fixeddev/commandflow/part/PartsWrapper.java b/api/src/main/java/team/unnamed/commandflow/part/PartsWrapper.java similarity index 85% rename from api/src/main/java/me/fixeddev/commandflow/part/PartsWrapper.java rename to api/src/main/java/team/unnamed/commandflow/part/PartsWrapper.java index 18bcd23c..fcc4bbb7 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/PartsWrapper.java +++ b/api/src/main/java/team/unnamed/commandflow/part/PartsWrapper.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.part; +package team.unnamed.commandflow.part; -import me.fixeddev.commandflow.part.visitor.CommandPartVisitor; +import team.unnamed.commandflow.part.visitor.CommandPartVisitor; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/SinglePartWrapper.java b/api/src/main/java/team/unnamed/commandflow/part/SinglePartWrapper.java similarity index 84% rename from api/src/main/java/me/fixeddev/commandflow/part/SinglePartWrapper.java rename to api/src/main/java/team/unnamed/commandflow/part/SinglePartWrapper.java index 90090485..ba856ed1 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/SinglePartWrapper.java +++ b/api/src/main/java/team/unnamed/commandflow/part/SinglePartWrapper.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.part; +package team.unnamed.commandflow.part; -import me.fixeddev.commandflow.part.visitor.CommandPartVisitor; +import team.unnamed.commandflow.part.visitor.CommandPartVisitor; /** * An interface to denote the {@link CommandPart} types that are wrappers for other parts, diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentRewriterPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/ArgumentRewriterPart.java similarity index 84% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentRewriterPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/ArgumentRewriterPart.java index c49d497f..ad7f25fb 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentRewriterPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/ArgumentRewriterPart.java @@ -1,10 +1,10 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.visitor.CommandPartVisitor; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.visitor.CommandPartVisitor; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentStackPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/ArgumentStackPart.java similarity index 62% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentStackPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/ArgumentStackPart.java index 00bbe3fa..593c3dc0 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/ArgumentStackPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/ArgumentStackPart.java @@ -1,19 +1,19 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.ArgumentPart; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; -import me.fixeddev.commandflow.stack.SimpleArgumentStack; -import me.fixeddev.commandflow.stack.StackSnapshot; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.ArgumentPart; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.stack.SimpleArgumentStack; +import team.unnamed.commandflow.stack.StackSnapshot; import java.util.ArrayList; import java.util.Collections; import java.util.List; /** - * A {@linkplain me.fixeddev.commandflow.part.CommandPart} that provides direct access to the remaining {@linkplain ArgumentStack}. + * A {@linkplain CommandPart} that provides direct access to the remaining {@linkplain ArgumentStack}. *

* Actually this shouldn't be an {@linkplain ArgumentPart} since it isn't using the arguments directly, but this is the best way to represent it. */ diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/BooleanPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/BooleanPart.java similarity index 74% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/BooleanPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/BooleanPart.java index 20d02f76..19d1cee8 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/BooleanPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/BooleanPart.java @@ -1,16 +1,16 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import java.util.Arrays; import java.util.Collections; import java.util.List; /** - * A {@linkplain me.fixeddev.commandflow.part.CommandPart} that parses one argument as a boolean, with the values true or false being allowed. + * A {@linkplain CommandPart} that parses one argument as a boolean, with the values true or false being allowed. */ public class BooleanPart extends PrimitivePart { diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/ContextPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/ContextPart.java similarity index 65% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/ContextPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/ContextPart.java index 6837e642..f3fbc314 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/ContextPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/ContextPart.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; /** * A {@linkplain CommandPart} that provides direct access to the {@linkplain CommandContext}. diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/DoublePart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/DoublePart.java similarity index 77% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/DoublePart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/DoublePart.java index bc845349..73e7b1e4 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/DoublePart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/DoublePart.java @@ -1,18 +1,18 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import java.util.Collections; import java.util.List; /** - * A {@linkplain me.fixeddev.commandflow.part.CommandPart} that parses one argument as a double. + * A {@linkplain CommandPart} that parses one argument as a double. *

- * This {@linkplain me.fixeddev.commandflow.part.CommandPart} also supports having only a permitted range. + * This {@linkplain CommandPart} also supports having only a permitted range. */ public class DoublePart extends PrimitivePart { diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/EmptyPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/EmptyPart.java similarity index 62% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/EmptyPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/EmptyPart.java index 10812490..38773493 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/EmptyPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/EmptyPart.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; /** * A placeholder {@linkplain CommandPart}, it does absolutely nothing. diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/EnumPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/EnumPart.java similarity index 89% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/EnumPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/EnumPart.java index a6ea0c4d..58a8a32c 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/EnumPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/EnumPart.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import java.util.ArrayList; @@ -13,7 +13,7 @@ import java.util.Map; /** - * A {@linkplain me.fixeddev.commandflow.part.CommandPart} that allows the parsing of every enum type. + * A {@linkplain CommandPart} that allows the parsing of every enum type. *

* This implementation eagerly loads the enum values from the specified class when created, allowing for fast lookup of * enum values when parsing. diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/FirstMatchPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/FirstMatchPart.java similarity index 91% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/FirstMatchPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/FirstMatchPart.java index 49caa651..87d8d385 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/FirstMatchPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/FirstMatchPart.java @@ -1,13 +1,13 @@ -package me.fixeddev.commandflow.part.defaults; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.ContextSnapshot; -import me.fixeddev.commandflow.exception.ArgumentException; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.PartsWrapper; -import me.fixeddev.commandflow.stack.ArgumentStack; -import me.fixeddev.commandflow.stack.StackSnapshot; +package team.unnamed.commandflow.part.defaults; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.ContextSnapshot; +import team.unnamed.commandflow.exception.ArgumentException; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.PartsWrapper; +import team.unnamed.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.stack.StackSnapshot; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/FloatPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/FloatPart.java similarity index 80% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/FloatPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/FloatPart.java index 668a3f3c..1fd04119 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/FloatPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/FloatPart.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import java.util.Collections; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/IntegerPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/IntegerPart.java similarity index 80% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/IntegerPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/IntegerPart.java index 89db68cc..a00b7b8a 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/IntegerPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/IntegerPart.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import java.util.Collections; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/LimitingPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/LimitingPart.java similarity index 82% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/LimitingPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/LimitingPart.java index 480356da..217e0233 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/LimitingPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/LimitingPart.java @@ -1,10 +1,10 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.SinglePartWrapper; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.SinglePartWrapper; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/LongPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/LongPart.java similarity index 80% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/LongPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/LongPart.java index fcd2e23e..7c1eb5fd 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/LongPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/LongPart.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import java.util.Collections; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/OptionalPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/OptionalPart.java similarity index 82% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/OptionalPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/OptionalPart.java index f05c1292..360327be 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/OptionalPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/OptionalPart.java @@ -1,16 +1,16 @@ -package me.fixeddev.commandflow.part.defaults; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.ContextSnapshot; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.exception.NoMoreArgumentsException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.PartsWrapper; -import me.fixeddev.commandflow.part.SinglePartWrapper; -import me.fixeddev.commandflow.stack.ArgumentStack; -import me.fixeddev.commandflow.stack.SimpleArgumentStack; -import me.fixeddev.commandflow.stack.StackSnapshot; +package team.unnamed.commandflow.part.defaults; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.ContextSnapshot; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.exception.NoMoreArgumentsException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.PartsWrapper; +import team.unnamed.commandflow.part.SinglePartWrapper; +import team.unnamed.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.stack.SimpleArgumentStack; +import team.unnamed.commandflow.stack.StackSnapshot; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/PrimitivePart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/PrimitivePart.java similarity index 80% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/PrimitivePart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/PrimitivePart.java index 6df7bbd1..accf4041 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/PrimitivePart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/PrimitivePart.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.part.ArgumentPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.part.ArgumentPart; +import team.unnamed.commandflow.stack.ArgumentStack; import java.util.Collections; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/SequentialCommandPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/SequentialCommandPart.java similarity index 89% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/SequentialCommandPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/SequentialCommandPart.java index ec29f9f1..883fd918 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/SequentialCommandPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/SequentialCommandPart.java @@ -1,10 +1,10 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.PartsWrapper; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.PartsWrapper; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/StringPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/StringPart.java similarity index 92% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/StringPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/StringPart.java index f66e745f..703daa5a 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/StringPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/StringPart.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import java.util.ArrayList; import java.util.Collections; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/SubCommandPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/SubCommandPart.java similarity index 88% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/SubCommandPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/SubCommandPart.java index a03eb7e3..ddda2c9d 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/SubCommandPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/SubCommandPart.java @@ -1,25 +1,24 @@ -package me.fixeddev.commandflow.part.defaults; - -import me.fixeddev.commandflow.Authorizer; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.CommandManager; -import me.fixeddev.commandflow.ContextSnapshot; -import me.fixeddev.commandflow.command.modifiers.FallbackCommandModifiers; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.command.modifiers.CommandModifiers; -import me.fixeddev.commandflow.command.modifiers.ModifierPhase; -import me.fixeddev.commandflow.exception.ArgumentException; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.InvalidSubCommandException; -import me.fixeddev.commandflow.exception.NoMoreArgumentsException; -import me.fixeddev.commandflow.exception.NoPermissionsException; -import me.fixeddev.commandflow.exception.StopParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.visitor.CommandPartVisitor; -import me.fixeddev.commandflow.stack.ArgumentStack; -import me.fixeddev.commandflow.stack.StackSnapshot; +package team.unnamed.commandflow.part.defaults; + +import team.unnamed.commandflow.Authorizer; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.CommandManager; +import team.unnamed.commandflow.ContextSnapshot; +import team.unnamed.commandflow.command.modifiers.FallbackCommandModifiers; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.command.modifiers.CommandModifiers; +import team.unnamed.commandflow.command.modifiers.ModifierPhase; +import team.unnamed.commandflow.exception.ArgumentException; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.InvalidSubCommandException; +import team.unnamed.commandflow.exception.NoMoreArgumentsException; +import team.unnamed.commandflow.exception.NoPermissionsException; +import team.unnamed.commandflow.exception.StopParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.visitor.CommandPartVisitor; +import team.unnamed.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.stack.StackSnapshot; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.TextComponent; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/SuggestionsModifierPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/SuggestionsModifierPart.java similarity index 85% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/SuggestionsModifierPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/SuggestionsModifierPart.java index ce956fff..d78b8c03 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/SuggestionsModifierPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/SuggestionsModifierPart.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/SwitchPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/SwitchPart.java similarity index 89% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/SwitchPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/SwitchPart.java index 119db9e4..c74eeb66 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/SwitchPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/SwitchPart.java @@ -1,10 +1,10 @@ -package me.fixeddev.commandflow.part.defaults; +package team.unnamed.commandflow.part.defaults; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; -import me.fixeddev.commandflow.stack.StackSnapshot; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.stack.StackSnapshot; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/fixeddev/commandflow/part/defaults/ValueFlagPart.java b/api/src/main/java/team/unnamed/commandflow/part/defaults/ValueFlagPart.java similarity index 88% rename from api/src/main/java/me/fixeddev/commandflow/part/defaults/ValueFlagPart.java rename to api/src/main/java/team/unnamed/commandflow/part/defaults/ValueFlagPart.java index 2b75da8a..760831c2 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/defaults/ValueFlagPart.java +++ b/api/src/main/java/team/unnamed/commandflow/part/defaults/ValueFlagPart.java @@ -1,12 +1,12 @@ -package me.fixeddev.commandflow.part.defaults; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.ContextSnapshot; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.SinglePartWrapper; -import me.fixeddev.commandflow.stack.ArgumentStack; -import me.fixeddev.commandflow.stack.StackSnapshot; +package team.unnamed.commandflow.part.defaults; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.ContextSnapshot; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.SinglePartWrapper; +import team.unnamed.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.stack.StackSnapshot; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/team/unnamed/commandflow/part/visitor/CommandPartVisitor.java b/api/src/main/java/team/unnamed/commandflow/part/visitor/CommandPartVisitor.java new file mode 100644 index 00000000..3063d340 --- /dev/null +++ b/api/src/main/java/team/unnamed/commandflow/part/visitor/CommandPartVisitor.java @@ -0,0 +1,21 @@ +package team.unnamed.commandflow.part.visitor; + +import team.unnamed.commandflow.part.ArgumentPart; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.PartsWrapper; +import team.unnamed.commandflow.part.SinglePartWrapper; +import team.unnamed.commandflow.part.defaults.SubCommandPart; + +public interface CommandPartVisitor { + + R visit(CommandPart part); + + R visit(ArgumentPart argumentPart); + + R visit(PartsWrapper partsWrapper); + + R visit(SinglePartWrapper singlePartWrapper); + + R visit(SubCommandPart subCommandPart); + +} diff --git a/api/src/main/java/me/fixeddev/commandflow/part/visitor/UnwrappedCommandPartVisitor.java b/api/src/main/java/team/unnamed/commandflow/part/visitor/UnwrappedCommandPartVisitor.java similarity index 73% rename from api/src/main/java/me/fixeddev/commandflow/part/visitor/UnwrappedCommandPartVisitor.java rename to api/src/main/java/team/unnamed/commandflow/part/visitor/UnwrappedCommandPartVisitor.java index 7c4a5818..f4253394 100644 --- a/api/src/main/java/me/fixeddev/commandflow/part/visitor/UnwrappedCommandPartVisitor.java +++ b/api/src/main/java/team/unnamed/commandflow/part/visitor/UnwrappedCommandPartVisitor.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.part.visitor; +package team.unnamed.commandflow.part.visitor; -import me.fixeddev.commandflow.part.PartsWrapper; -import me.fixeddev.commandflow.part.defaults.FirstMatchPart; -import me.fixeddev.commandflow.part.defaults.SequentialCommandPart; +import team.unnamed.commandflow.part.PartsWrapper; +import team.unnamed.commandflow.part.defaults.FirstMatchPart; +import team.unnamed.commandflow.part.defaults.SequentialCommandPart; public interface UnwrappedCommandPartVisitor extends CommandPartVisitor { diff --git a/api/src/main/java/me/fixeddev/commandflow/stack/ArgumentStack.java b/api/src/main/java/team/unnamed/commandflow/stack/ArgumentStack.java similarity index 88% rename from api/src/main/java/me/fixeddev/commandflow/stack/ArgumentStack.java rename to api/src/main/java/team/unnamed/commandflow/stack/ArgumentStack.java index 98f2f4dd..9e2ecd91 100644 --- a/api/src/main/java/me/fixeddev/commandflow/stack/ArgumentStack.java +++ b/api/src/main/java/team/unnamed/commandflow/stack/ArgumentStack.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow.stack; +package team.unnamed.commandflow.stack; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.NoMoreArgumentsException; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.NoMoreArgumentsException; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/stack/SimpleArgumentStack.java b/api/src/main/java/team/unnamed/commandflow/stack/SimpleArgumentStack.java similarity index 97% rename from api/src/main/java/me/fixeddev/commandflow/stack/SimpleArgumentStack.java rename to api/src/main/java/team/unnamed/commandflow/stack/SimpleArgumentStack.java index 740af216..15449196 100644 --- a/api/src/main/java/me/fixeddev/commandflow/stack/SimpleArgumentStack.java +++ b/api/src/main/java/team/unnamed/commandflow/stack/SimpleArgumentStack.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow.stack; +package team.unnamed.commandflow.stack; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.NoMoreArgumentsException; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.NoMoreArgumentsException; import net.kyori.adventure.text.Component; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/stack/StackSnapshot.java b/api/src/main/java/team/unnamed/commandflow/stack/StackSnapshot.java similarity index 96% rename from api/src/main/java/me/fixeddev/commandflow/stack/StackSnapshot.java rename to api/src/main/java/team/unnamed/commandflow/stack/StackSnapshot.java index ba2d18f7..fb36e939 100644 --- a/api/src/main/java/me/fixeddev/commandflow/stack/StackSnapshot.java +++ b/api/src/main/java/team/unnamed/commandflow/stack/StackSnapshot.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.stack; +package team.unnamed.commandflow.stack; import java.util.ArrayList; import java.util.List; diff --git a/api/src/main/java/me/fixeddev/commandflow/translator/ComponentRendererTranslator.java b/api/src/main/java/team/unnamed/commandflow/translator/ComponentRendererTranslator.java similarity index 92% rename from api/src/main/java/me/fixeddev/commandflow/translator/ComponentRendererTranslator.java rename to api/src/main/java/team/unnamed/commandflow/translator/ComponentRendererTranslator.java index b871264d..1c2e16ce 100644 --- a/api/src/main/java/me/fixeddev/commandflow/translator/ComponentRendererTranslator.java +++ b/api/src/main/java/team/unnamed/commandflow/translator/ComponentRendererTranslator.java @@ -1,8 +1,7 @@ -package me.fixeddev.commandflow.translator; +package team.unnamed.commandflow.translator; -import me.fixeddev.commandflow.Namespace; +import team.unnamed.commandflow.Namespace; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.renderer.ComponentRenderer; import net.kyori.adventure.text.renderer.TranslatableComponentRenderer; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/me/fixeddev/commandflow/translator/DefaultMapTranslationProvider.java b/api/src/main/java/team/unnamed/commandflow/translator/DefaultMapTranslationProvider.java similarity index 94% rename from api/src/main/java/me/fixeddev/commandflow/translator/DefaultMapTranslationProvider.java rename to api/src/main/java/team/unnamed/commandflow/translator/DefaultMapTranslationProvider.java index 147e3d75..a80ee159 100644 --- a/api/src/main/java/me/fixeddev/commandflow/translator/DefaultMapTranslationProvider.java +++ b/api/src/main/java/team/unnamed/commandflow/translator/DefaultMapTranslationProvider.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.translator; +package team.unnamed.commandflow.translator; -import me.fixeddev.commandflow.Namespace; +import team.unnamed.commandflow.Namespace; import java.util.HashMap; import java.util.Map; diff --git a/api/src/main/java/me/fixeddev/commandflow/translator/DefaultTranslator.java b/api/src/main/java/team/unnamed/commandflow/translator/DefaultTranslator.java similarity index 97% rename from api/src/main/java/me/fixeddev/commandflow/translator/DefaultTranslator.java rename to api/src/main/java/team/unnamed/commandflow/translator/DefaultTranslator.java index 3232f7bd..c2df6207 100644 --- a/api/src/main/java/me/fixeddev/commandflow/translator/DefaultTranslator.java +++ b/api/src/main/java/team/unnamed/commandflow/translator/DefaultTranslator.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.translator; +package team.unnamed.commandflow.translator; -import me.fixeddev.commandflow.Namespace; +import team.unnamed.commandflow.Namespace; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TranslatableComponent; diff --git a/api/src/main/java/me/fixeddev/commandflow/translator/TranslationProvider.java b/api/src/main/java/team/unnamed/commandflow/translator/TranslationProvider.java similarity index 54% rename from api/src/main/java/me/fixeddev/commandflow/translator/TranslationProvider.java rename to api/src/main/java/team/unnamed/commandflow/translator/TranslationProvider.java index e18d4d9f..f2c8e363 100644 --- a/api/src/main/java/me/fixeddev/commandflow/translator/TranslationProvider.java +++ b/api/src/main/java/team/unnamed/commandflow/translator/TranslationProvider.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.translator; +package team.unnamed.commandflow.translator; -import me.fixeddev.commandflow.Namespace; +import team.unnamed.commandflow.Namespace; public interface TranslationProvider { diff --git a/api/src/main/java/me/fixeddev/commandflow/translator/Translator.java b/api/src/main/java/team/unnamed/commandflow/translator/Translator.java similarity index 94% rename from api/src/main/java/me/fixeddev/commandflow/translator/Translator.java rename to api/src/main/java/team/unnamed/commandflow/translator/Translator.java index 58dc1c80..80cbd0f6 100644 --- a/api/src/main/java/me/fixeddev/commandflow/translator/Translator.java +++ b/api/src/main/java/team/unnamed/commandflow/translator/Translator.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.translator; +package team.unnamed.commandflow.translator; -import me.fixeddev.commandflow.Namespace; +import team.unnamed.commandflow.Namespace; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; diff --git a/api/src/main/java/me/fixeddev/commandflow/usage/DefaultUsageBuilder.java b/api/src/main/java/team/unnamed/commandflow/usage/DefaultUsageBuilder.java similarity index 85% rename from api/src/main/java/me/fixeddev/commandflow/usage/DefaultUsageBuilder.java rename to api/src/main/java/team/unnamed/commandflow/usage/DefaultUsageBuilder.java index 54b7f07a..902dd65a 100644 --- a/api/src/main/java/me/fixeddev/commandflow/usage/DefaultUsageBuilder.java +++ b/api/src/main/java/team/unnamed/commandflow/usage/DefaultUsageBuilder.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow.usage; +package team.unnamed.commandflow.usage; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.command.Command; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.command.Command; import net.kyori.adventure.text.Component; public class DefaultUsageBuilder implements UsageBuilder { diff --git a/api/src/main/java/me/fixeddev/commandflow/usage/UsageBuilder.java b/api/src/main/java/team/unnamed/commandflow/usage/UsageBuilder.java similarity index 73% rename from api/src/main/java/me/fixeddev/commandflow/usage/UsageBuilder.java rename to api/src/main/java/team/unnamed/commandflow/usage/UsageBuilder.java index 199b97ef..5d50575f 100644 --- a/api/src/main/java/me/fixeddev/commandflow/usage/UsageBuilder.java +++ b/api/src/main/java/team/unnamed/commandflow/usage/UsageBuilder.java @@ -1,7 +1,8 @@ -package me.fixeddev.commandflow.usage; +package team.unnamed.commandflow.usage; -import me.fixeddev.commandflow.CommandContext; +import team.unnamed.commandflow.CommandContext; import net.kyori.adventure.text.Component; +import team.unnamed.commandflow.translator.Translator; /** * Creates a usage based on the CommandContext that you give to this class. @@ -14,7 +15,7 @@ public interface UsageBuilder { * * @param commandContext The {@link CommandContext} used to create a usage. * @return A {@link Component} containing the usage for this command, shouldn't be sent directly to the - * any executor without being translated first by a {@link me.fixeddev.commandflow.translator.Translator}. + * any executor without being translated first by a {@link Translator}. */ Component getUsage(CommandContext commandContext); diff --git a/api/src/test/java/me/fixeddev/commandflow/InputTokenizerTest.java b/api/src/test/java/team/unnamed/commandflow/InputTokenizerTest.java similarity index 86% rename from api/src/test/java/me/fixeddev/commandflow/InputTokenizerTest.java rename to api/src/test/java/team/unnamed/commandflow/InputTokenizerTest.java index 0d93d41e..1434d8e8 100644 --- a/api/src/test/java/me/fixeddev/commandflow/InputTokenizerTest.java +++ b/api/src/test/java/team/unnamed/commandflow/InputTokenizerTest.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow; +package team.unnamed.commandflow; -import me.fixeddev.commandflow.input.InputTokenizer; -import me.fixeddev.commandflow.input.QuotedSpaceTokenizer; +import team.unnamed.commandflow.input.InputTokenizer; +import team.unnamed.commandflow.input.QuotedSpaceTokenizer; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/api/src/test/java/me/fixeddev/commandflow/ParameterizedPartTest.java b/api/src/test/java/team/unnamed/commandflow/ParameterizedPartTest.java similarity index 78% rename from api/src/test/java/me/fixeddev/commandflow/ParameterizedPartTest.java rename to api/src/test/java/team/unnamed/commandflow/ParameterizedPartTest.java index d35f440f..e0eb2d43 100644 --- a/api/src/test/java/me/fixeddev/commandflow/ParameterizedPartTest.java +++ b/api/src/test/java/team/unnamed/commandflow/ParameterizedPartTest.java @@ -1,15 +1,14 @@ -package me.fixeddev.commandflow; - -import me.fixeddev.commandflow.annotated.AnnotatedCommandTreeBuilder; -import me.fixeddev.commandflow.annotated.CommandClass; -import me.fixeddev.commandflow.annotated.annotation.Command; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.annotated.part.PartInjector; -import me.fixeddev.commandflow.annotated.part.defaults.DefaultsModule; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.ArgumentPart; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +package team.unnamed.commandflow; + +import team.unnamed.commandflow.annotated.AnnotatedCommandTreeBuilder; +import team.unnamed.commandflow.annotated.CommandClass; +import team.unnamed.commandflow.annotated.annotation.Command; +import team.unnamed.commandflow.annotated.part.PartInjector; +import team.unnamed.commandflow.annotated.part.defaults.DefaultsModule; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.ArgumentPart; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/api/src/test/java/me/fixeddev/commandflow/annotated/CustomComponentParserTest.java b/api/src/test/java/team/unnamed/commandflow/annotated/CustomComponentParserTest.java similarity index 76% rename from api/src/test/java/me/fixeddev/commandflow/annotated/CustomComponentParserTest.java rename to api/src/test/java/team/unnamed/commandflow/annotated/CustomComponentParserTest.java index 24c098e9..92f33089 100644 --- a/api/src/test/java/me/fixeddev/commandflow/annotated/CustomComponentParserTest.java +++ b/api/src/test/java/team/unnamed/commandflow/annotated/CustomComponentParserTest.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.annotated; +package team.unnamed.commandflow.annotated; -import me.fixeddev.commandflow.annotated.annotation.Command; -import me.fixeddev.commandflow.annotated.annotation.Usage; -import me.fixeddev.commandflow.annotated.part.PartInjector; +import team.unnamed.commandflow.annotated.annotation.Command; +import team.unnamed.commandflow.annotated.annotation.Usage; +import team.unnamed.commandflow.annotated.part.PartInjector; import net.kyori.adventure.text.Component; import org.junit.jupiter.api.Test; @@ -20,9 +20,9 @@ void test() { // a component parser that always creates plain text components with "Hello " as the prefix builder.setComponentParser(string -> Component.text("Hello, " + string.toLowerCase(Locale.ROOT))); - List commands = builder.fromClass(new TestCommand()); + List commands = builder.fromClass(new TestCommand()); assertEquals(1, commands.size(), "Expected one command only"); - me.fixeddev.commandflow.command.Command command = commands.get(0); + team.unnamed.commandflow.command.Command command = commands.get(0); assertEquals("test", command.getName()); assertEquals("admin", command.getPermission()); assertEquals(Component.text("Hello, you don't have permission to do this!"), command.getPermissionMessage()); diff --git a/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandManager.java b/brigadier/src/main/java/team/unnamed/commandflow/brigadier/BrigadierCommandManager.java similarity index 93% rename from brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandManager.java rename to brigadier/src/main/java/team/unnamed/commandflow/brigadier/BrigadierCommandManager.java index 67d5fad4..0e883b3f 100644 --- a/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandManager.java +++ b/brigadier/src/main/java/team/unnamed/commandflow/brigadier/BrigadierCommandManager.java @@ -1,21 +1,20 @@ -package me.fixeddev.commandflow.brigadier; +package team.unnamed.commandflow.brigadier; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.tree.LiteralCommandNode; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.CommandManager; -import me.fixeddev.commandflow.Namespace; -import me.fixeddev.commandflow.ParseResult; -import me.fixeddev.commandflow.bukkit.BukkitCommandManager; -import me.fixeddev.commandflow.bukkit.MessageUtils; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.exception.CommandUsage; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.CommandManager; +import team.unnamed.commandflow.Namespace; +import team.unnamed.commandflow.ParseResult; +import team.unnamed.commandflow.bukkit.BukkitCommandManager; +import team.unnamed.commandflow.bukkit.MessageUtils; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.exception.CommandUsage; import me.lucko.commodore.Commodore; import me.lucko.commodore.CommodoreProvider; import net.kyori.adventure.text.Component; import net.md_5.bungee.api.chat.BaseComponent; -import net.md_5.bungee.api.chat.TranslatableComponent; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Entity; diff --git a/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandWrapper.java b/brigadier/src/main/java/team/unnamed/commandflow/brigadier/BrigadierCommandWrapper.java similarity index 67% rename from brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandWrapper.java rename to brigadier/src/main/java/team/unnamed/commandflow/brigadier/BrigadierCommandWrapper.java index 54e390c6..0586732d 100644 --- a/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierCommandWrapper.java +++ b/brigadier/src/main/java/team/unnamed/commandflow/brigadier/BrigadierCommandWrapper.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.brigadier; +package team.unnamed.commandflow.brigadier; -import me.fixeddev.commandflow.CommandManager; -import me.fixeddev.commandflow.bukkit.BukkitCommandWrapper; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.translator.Translator; +import team.unnamed.commandflow.CommandManager; +import team.unnamed.commandflow.bukkit.BukkitCommandWrapper; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.translator.Translator; import net.kyori.adventure.text.Component; public class BrigadierCommandWrapper extends BukkitCommandWrapper { diff --git a/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierDefaultTranslationProvider.java b/brigadier/src/main/java/team/unnamed/commandflow/brigadier/BrigadierDefaultTranslationProvider.java similarity index 76% rename from brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierDefaultTranslationProvider.java rename to brigadier/src/main/java/team/unnamed/commandflow/brigadier/BrigadierDefaultTranslationProvider.java index 08c6c0ae..e360053f 100644 --- a/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/BrigadierDefaultTranslationProvider.java +++ b/brigadier/src/main/java/team/unnamed/commandflow/brigadier/BrigadierDefaultTranslationProvider.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.brigadier; +package team.unnamed.commandflow.brigadier; -import me.fixeddev.commandflow.bukkit.BukkitDefaultTranslationProvider; +import team.unnamed.commandflow.bukkit.BukkitDefaultTranslationProvider; public class BrigadierDefaultTranslationProvider extends BukkitDefaultTranslationProvider { diff --git a/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/CommandBrigadierConverter.java b/brigadier/src/main/java/team/unnamed/commandflow/brigadier/CommandBrigadierConverter.java similarity index 93% rename from brigadier/src/main/java/me/fixeddev/commandflow/brigadier/CommandBrigadierConverter.java rename to brigadier/src/main/java/team/unnamed/commandflow/brigadier/CommandBrigadierConverter.java index 43e5a36f..154df04b 100644 --- a/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/CommandBrigadierConverter.java +++ b/brigadier/src/main/java/team/unnamed/commandflow/brigadier/CommandBrigadierConverter.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.brigadier; +package team.unnamed.commandflow.brigadier; import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.arguments.BoolArgumentType; @@ -11,30 +11,30 @@ import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.tree.CommandNode; import com.mojang.brigadier.tree.LiteralCommandNode; -import me.fixeddev.commandflow.Authorizer; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.Namespace; -import me.fixeddev.commandflow.SimpleCommandContext; -import me.fixeddev.commandflow.bukkit.BukkitCommandManager; -import me.fixeddev.commandflow.bukkit.part.OfflinePlayerPart; -import me.fixeddev.commandflow.bukkit.part.PlayerPart; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.part.ArgumentPart; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.part.PartsWrapper; -import me.fixeddev.commandflow.part.SinglePartWrapper; -import me.fixeddev.commandflow.part.defaults.BooleanPart; -import me.fixeddev.commandflow.part.defaults.DoublePart; -import me.fixeddev.commandflow.part.defaults.FirstMatchPart; -import me.fixeddev.commandflow.part.defaults.IntegerPart; -import me.fixeddev.commandflow.part.defaults.LongPart; -import me.fixeddev.commandflow.part.defaults.OptionalPart; -import me.fixeddev.commandflow.part.defaults.StringPart; -import me.fixeddev.commandflow.part.defaults.SubCommandPart; -import me.fixeddev.commandflow.part.defaults.SwitchPart; -import me.fixeddev.commandflow.part.defaults.ValueFlagPart; -import me.fixeddev.commandflow.part.visitor.CommandPartVisitor; -import me.fixeddev.commandflow.stack.SimpleArgumentStack; +import team.unnamed.commandflow.Authorizer; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.Namespace; +import team.unnamed.commandflow.SimpleCommandContext; +import team.unnamed.commandflow.bukkit.BukkitCommandManager; +import team.unnamed.commandflow.bukkit.part.OfflinePlayerPart; +import team.unnamed.commandflow.bukkit.part.PlayerPart; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.part.ArgumentPart; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.PartsWrapper; +import team.unnamed.commandflow.part.SinglePartWrapper; +import team.unnamed.commandflow.part.defaults.BooleanPart; +import team.unnamed.commandflow.part.defaults.DoublePart; +import team.unnamed.commandflow.part.defaults.FirstMatchPart; +import team.unnamed.commandflow.part.defaults.IntegerPart; +import team.unnamed.commandflow.part.defaults.LongPart; +import team.unnamed.commandflow.part.defaults.OptionalPart; +import team.unnamed.commandflow.part.defaults.StringPart; +import team.unnamed.commandflow.part.defaults.SubCommandPart; +import team.unnamed.commandflow.part.defaults.SwitchPart; +import team.unnamed.commandflow.part.defaults.ValueFlagPart; +import team.unnamed.commandflow.part.visitor.CommandPartVisitor; +import team.unnamed.commandflow.stack.SimpleArgumentStack; import me.lucko.commodore.Commodore; import me.lucko.commodore.MinecraftArgumentTypes; import org.bukkit.Bukkit; diff --git a/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNode.java b/brigadier/src/main/java/team/unnamed/commandflow/brigadier/MultipleHeadNode.java similarity index 99% rename from brigadier/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNode.java rename to brigadier/src/main/java/team/unnamed/commandflow/brigadier/MultipleHeadNode.java index 3f6f1b5f..98c0c670 100644 --- a/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNode.java +++ b/brigadier/src/main/java/team/unnamed/commandflow/brigadier/MultipleHeadNode.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.brigadier; +package team.unnamed.commandflow.brigadier; import com.mojang.brigadier.builder.ArgumentBuilder; import com.mojang.brigadier.builder.LiteralArgumentBuilder; diff --git a/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNodeBuilder.java b/brigadier/src/main/java/team/unnamed/commandflow/brigadier/MultipleHeadNodeBuilder.java similarity index 99% rename from brigadier/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNodeBuilder.java rename to brigadier/src/main/java/team/unnamed/commandflow/brigadier/MultipleHeadNodeBuilder.java index 69c1b9b0..5cb93c01 100644 --- a/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/MultipleHeadNodeBuilder.java +++ b/brigadier/src/main/java/team/unnamed/commandflow/brigadier/MultipleHeadNodeBuilder.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.brigadier; +package team.unnamed.commandflow.brigadier; import com.mojang.brigadier.Command; import com.mojang.brigadier.RedirectModifier; diff --git a/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/PermissionRequirement.java b/brigadier/src/main/java/team/unnamed/commandflow/brigadier/PermissionRequirement.java similarity index 81% rename from brigadier/src/main/java/me/fixeddev/commandflow/brigadier/PermissionRequirement.java rename to brigadier/src/main/java/team/unnamed/commandflow/brigadier/PermissionRequirement.java index 63edbb82..21fb4687 100644 --- a/brigadier/src/main/java/me/fixeddev/commandflow/brigadier/PermissionRequirement.java +++ b/brigadier/src/main/java/team/unnamed/commandflow/brigadier/PermissionRequirement.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.brigadier; +package team.unnamed.commandflow.brigadier; -import me.fixeddev.commandflow.Authorizer; -import me.fixeddev.commandflow.Namespace; -import me.fixeddev.commandflow.bukkit.BukkitCommandManager; +import team.unnamed.commandflow.Authorizer; +import team.unnamed.commandflow.Namespace; +import team.unnamed.commandflow.bukkit.BukkitCommandManager; import me.lucko.commodore.Commodore; import org.bukkit.command.CommandSender; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitAuthorizer.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/BukkitAuthorizer.java similarity index 77% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitAuthorizer.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/BukkitAuthorizer.java index e6ed4af5..cd58a50e 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitAuthorizer.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/BukkitAuthorizer.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow.bukkit; +package team.unnamed.commandflow.bukkit; -import me.fixeddev.commandflow.Authorizer; -import me.fixeddev.commandflow.Namespace; +import team.unnamed.commandflow.Authorizer; +import team.unnamed.commandflow.Namespace; import org.bukkit.command.CommandSender; public class BukkitAuthorizer implements Authorizer { diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandManager.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/BukkitCommandManager.java similarity index 87% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandManager.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/BukkitCommandManager.java index 011976c1..b5937caf 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandManager.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/BukkitCommandManager.java @@ -1,25 +1,25 @@ -package me.fixeddev.commandflow.bukkit; - -import me.fixeddev.commandflow.Authorizer; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.CommandManager; -import me.fixeddev.commandflow.ErrorHandler; -import me.fixeddev.commandflow.Namespace; -import me.fixeddev.commandflow.ParseResult; -import me.fixeddev.commandflow.SimpleCommandManager; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.command.modifiers.FallbackCommandModifiers; -import me.fixeddev.commandflow.exception.ArgumentException; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.exception.CommandUsage; -import me.fixeddev.commandflow.exception.InvalidSubCommandException; -import me.fixeddev.commandflow.exception.NoMoreArgumentsException; -import me.fixeddev.commandflow.exception.NoPermissionsException; -import me.fixeddev.commandflow.executor.Executor; -import me.fixeddev.commandflow.input.InputTokenizer; -import me.fixeddev.commandflow.translator.Translator; -import me.fixeddev.commandflow.usage.UsageBuilder; +package team.unnamed.commandflow.bukkit; + +import team.unnamed.commandflow.Authorizer; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.CommandManager; +import team.unnamed.commandflow.ErrorHandler; +import team.unnamed.commandflow.Namespace; +import team.unnamed.commandflow.ParseResult; +import team.unnamed.commandflow.SimpleCommandManager; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.command.modifiers.FallbackCommandModifiers; +import team.unnamed.commandflow.exception.ArgumentException; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.exception.CommandUsage; +import team.unnamed.commandflow.exception.InvalidSubCommandException; +import team.unnamed.commandflow.exception.NoMoreArgumentsException; +import team.unnamed.commandflow.exception.NoPermissionsException; +import team.unnamed.commandflow.executor.Executor; +import team.unnamed.commandflow.input.InputTokenizer; +import team.unnamed.commandflow.translator.Translator; +import team.unnamed.commandflow.usage.UsageBuilder; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import org.bukkit.Bukkit; import org.bukkit.command.CommandMap; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandWrapper.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/BukkitCommandWrapper.java similarity index 91% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandWrapper.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/BukkitCommandWrapper.java index 2f56cd91..9067b734 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitCommandWrapper.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/BukkitCommandWrapper.java @@ -1,13 +1,13 @@ -package me.fixeddev.commandflow.bukkit; +package team.unnamed.commandflow.bukkit; -import me.fixeddev.commandflow.Authorizer; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.CommandManager; -import me.fixeddev.commandflow.Namespace; -import me.fixeddev.commandflow.SimpleCommandContext; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.translator.Translator; +import team.unnamed.commandflow.Authorizer; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.CommandManager; +import team.unnamed.commandflow.Namespace; +import team.unnamed.commandflow.SimpleCommandContext; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.translator.Translator; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.md_5.bungee.api.chat.BaseComponent; @@ -24,7 +24,7 @@ public class BukkitCommandWrapper extends Command { protected final Component permissionMessage; protected final Translator translator; - public BukkitCommandWrapper(me.fixeddev.commandflow.command.Command command, + public BukkitCommandWrapper(team.unnamed.commandflow.command.Command command, CommandManager dispatcher, Translator translator) { super(command.getName()); diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitDefaultTranslationProvider.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/BukkitDefaultTranslationProvider.java similarity index 80% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitDefaultTranslationProvider.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/BukkitDefaultTranslationProvider.java index 323d4320..c2930765 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/BukkitDefaultTranslationProvider.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/BukkitDefaultTranslationProvider.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.bukkit; +package team.unnamed.commandflow.bukkit; -import me.fixeddev.commandflow.translator.DefaultMapTranslationProvider; +import team.unnamed.commandflow.translator.DefaultMapTranslationProvider; public class BukkitDefaultTranslationProvider extends DefaultMapTranslationProvider { diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/MessageUtils.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/MessageUtils.java similarity index 96% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/MessageUtils.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/MessageUtils.java index ee19e212..8010ea5d 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/MessageUtils.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/MessageUtils.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.bukkit; +package team.unnamed.commandflow.bukkit; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Exact.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/annotation/Exact.java similarity index 83% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Exact.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/annotation/Exact.java index ca110742..e73924ee 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Exact.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/annotation/Exact.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.bukkit.annotation; +package team.unnamed.commandflow.bukkit.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/PlayerOrSource.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/annotation/PlayerOrSource.java similarity index 83% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/PlayerOrSource.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/annotation/PlayerOrSource.java index d5ac64c8..942d93de 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/PlayerOrSource.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/annotation/PlayerOrSource.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.bukkit.annotation; +package team.unnamed.commandflow.bukkit.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/annotation/Sender.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/annotation/Sender.java similarity index 83% rename from discord/src/main/java/me/fixeddev/commandflow/discord/annotation/Sender.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/annotation/Sender.java index e9237974..a2809866 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/annotation/Sender.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/annotation/Sender.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.discord.annotation; +package team.unnamed.commandflow.bukkit.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/BukkitModule.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/BukkitModule.java similarity index 75% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/BukkitModule.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/BukkitModule.java index d8c6bc5e..4e78e19b 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/BukkitModule.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/BukkitModule.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.bukkit.factory; +package team.unnamed.commandflow.bukkit.factory; -import me.fixeddev.commandflow.annotated.part.AbstractModule; -import me.fixeddev.commandflow.annotated.part.Key; -import me.fixeddev.commandflow.bukkit.annotation.Sender; +import team.unnamed.commandflow.annotated.part.AbstractModule; +import team.unnamed.commandflow.annotated.part.Key; +import team.unnamed.commandflow.bukkit.annotation.Sender; import org.bukkit.GameMode; import org.bukkit.OfflinePlayer; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/CommandSenderFactory.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/CommandSenderFactory.java similarity index 55% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/CommandSenderFactory.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/CommandSenderFactory.java index 5f5121e5..d76bba0e 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/CommandSenderFactory.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/CommandSenderFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.bukkit.factory; +package team.unnamed.commandflow.bukkit.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.bukkit.part.CommandSenderPart; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.bukkit.part.CommandSenderPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/GameModeFactory.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/GameModeFactory.java similarity index 55% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/GameModeFactory.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/GameModeFactory.java index 7cf67d6d..1c937ee6 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/GameModeFactory.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/GameModeFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.bukkit.factory; +package team.unnamed.commandflow.bukkit.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.bukkit.part.GameModePart; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.bukkit.part.GameModePart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/OfflinePlayerPartFactory.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/OfflinePlayerPartFactory.java similarity index 56% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/OfflinePlayerPartFactory.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/OfflinePlayerPartFactory.java index da422445..db9a76c7 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/OfflinePlayerPartFactory.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/OfflinePlayerPartFactory.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.bukkit.factory; +package team.unnamed.commandflow.bukkit.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.bukkit.annotation.PlayerOrSource; -import me.fixeddev.commandflow.bukkit.part.OfflinePlayerPart; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.bukkit.annotation.PlayerOrSource; +import team.unnamed.commandflow.bukkit.part.OfflinePlayerPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerPartFactory.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/PlayerPartFactory.java similarity index 56% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerPartFactory.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/PlayerPartFactory.java index 89f0cfe2..8bbbbbea 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerPartFactory.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/PlayerPartFactory.java @@ -1,10 +1,10 @@ -package me.fixeddev.commandflow.bukkit.factory; +package team.unnamed.commandflow.bukkit.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.bukkit.annotation.Exact; -import me.fixeddev.commandflow.bukkit.annotation.PlayerOrSource; -import me.fixeddev.commandflow.bukkit.part.PlayerPart; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.bukkit.annotation.Exact; +import team.unnamed.commandflow.bukkit.annotation.PlayerOrSource; +import team.unnamed.commandflow.bukkit.part.PlayerPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerSenderFactory.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/PlayerSenderFactory.java similarity index 55% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerSenderFactory.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/PlayerSenderFactory.java index 9a2cf991..e92430c1 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/PlayerSenderFactory.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/PlayerSenderFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.bukkit.factory; +package team.unnamed.commandflow.bukkit.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.bukkit.part.PlayerSenderPart; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.bukkit.part.PlayerSenderPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/WorldFactory.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/WorldFactory.java similarity index 55% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/WorldFactory.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/WorldFactory.java index 517ef383..6b47acbb 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/factory/WorldFactory.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/factory/WorldFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.bukkit.factory; +package team.unnamed.commandflow.bukkit.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.bukkit.part.WorldPart; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.bukkit.part.WorldPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/BukkitParts.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/BukkitParts.java similarity index 67% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/BukkitParts.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/BukkitParts.java index f2a92f2b..577984c1 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/BukkitParts.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/BukkitParts.java @@ -1,25 +1,27 @@ -package me.fixeddev.commandflow.bukkit.part; +package team.unnamed.commandflow.bukkit.part; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.part.ArgumentPart; +import team.unnamed.commandflow.stack.ArgumentStack; /** - * An utility class to ease the use of some {@link me.fixeddev.commandflow.part.CommandPart} specific instances for bukkit. + * An utility class to ease the use of some {@link CommandPart} specific instances for bukkit. */ public final class BukkitParts { /** - * A basic {@link me.fixeddev.commandflow.part.CommandPart} that provides the {@link org.bukkit.command.CommandSender} of the command from + * A basic {@link CommandPart} that provides the {@link org.bukkit.command.CommandSender} of the command from * the namespace. * * @param name The name for this part. - * @return A {@link me.fixeddev.commandflow.part.CommandPart} with a given name that returns the {@link org.bukkit.command.CommandSender} as argument. + * @return A {@link CommandPart} with a given name that returns the {@link org.bukkit.command.CommandSender} as argument. */ public static CommandSenderPart commandSender(String name) { return new CommandSenderPart(name); } /** - * A basic {@link me.fixeddev.commandflow.part.ArgumentPart} that takes a string from the {@link me.fixeddev.commandflow.stack.ArgumentStack} and parses it into + * A basic {@link ArgumentPart} that takes a string from the {@link ArgumentStack} and parses it into * a bukkit's {@link org.bukkit.GameMode} * * @param name The name for this part. @@ -30,7 +32,7 @@ public static GameModePart gameMode(String name) { } /** - * A basic {@link me.fixeddev.commandflow.part.ArgumentPart} that takes a string from the {@link me.fixeddev.commandflow.stack.ArgumentStack} and parses it into + * A basic {@link ArgumentPart} that takes a string from the {@link ArgumentStack} and parses it into * a bukkit's {@link org.bukkit.OfflinePlayer} * * @param name The name for this part. @@ -41,7 +43,7 @@ public static OfflinePlayerPart offlinePlayer(String name) { } /** - * A {@link me.fixeddev.commandflow.part.ArgumentPart} that takes a string from the {@link me.fixeddev.commandflow.stack.ArgumentStack} + * A {@link ArgumentPart} that takes a string from the {@link ArgumentStack} * and tries to parse it into an {@link org.bukkit.OfflinePlayer}, if it is not available or the parsed player isn't * valid, then tries to parse the CommandSender as an OfflinePlayer. * @@ -54,7 +56,7 @@ public static OfflinePlayerPart offlinePlayerOrSource(String name) { } /** - * A basic {@link me.fixeddev.commandflow.part.ArgumentPart} that takes a string as nick or uuid from the {@link me.fixeddev.commandflow.stack.ArgumentStack} and parses it into + * A basic {@link ArgumentPart} that takes a string as nick or uuid from the {@link ArgumentStack} and parses it into * a bukkit's {@link org.bukkit.entity.Player} using the method {@link org.bukkit.Bukkit#getPlayer(String)} * * @param name The name for this part. @@ -65,7 +67,7 @@ public static PlayerPart player(String name) { } /** - * A basic {@link me.fixeddev.commandflow.part.ArgumentPart} that takes a string as nick from the {@link me.fixeddev.commandflow.stack.ArgumentStack} and parses it into + * A basic {@link ArgumentPart} that takes a string as nick from the {@link ArgumentStack} and parses it into * a bukkit's {@link org.bukkit.entity.Player} using the method {@link org.bukkit.Bukkit#getPlayerExact(String)} * * @param name The name for this part. @@ -76,7 +78,7 @@ public static PlayerPart exactPlayer(String name) { } /** - * A {@link me.fixeddev.commandflow.part.ArgumentPart} that takes a string as nick or as uuid from the {@link me.fixeddev.commandflow.stack.ArgumentStack} + * A {@link ArgumentPart} that takes a string as nick or as uuid from the {@link ArgumentStack} * and tries to parse it into an {@link org.bukkit.entity.Player}, if it is not available or the parsed player isn't * valid, then tries to parse the CommandSender as an Player. * @@ -89,8 +91,8 @@ public static PlayerPart playerOrSource(String name) { } /** - * A {@link me.fixeddev.commandflow.part.ArgumentPart} that takes a string as nick or as uuid (if exact mode is not enabled) - * from the {@link me.fixeddev.commandflow.stack.ArgumentStack} and tries to parse it into an {@link org.bukkit.entity.Player}. + * A {@link ArgumentPart} that takes a string as nick or as uuid (if exact mode is not enabled) + * from the {@link ArgumentStack} and tries to parse it into an {@link org.bukkit.entity.Player}. * * @param name The name for this part. * @param exact If we should use {@link org.bukkit.Bukkit#getPlayerExact(String)} instead of {@link org.bukkit.Bukkit#getPlayer(String)} @@ -102,7 +104,7 @@ public static PlayerPart player(String name, boolean exact, boolean orSource) { } /** - * A {@link me.fixeddev.commandflow.part.CommandPart} that tries parsing the CommandSender as a {@link org.bukkit.entity.Player}. + * A {@link CommandPart} that tries parsing the CommandSender as a {@link org.bukkit.entity.Player}. * * @param name The name for this part. * @return a {@link CommandPart} with the given name that tries to parse the command sender as a {@link org.bukkit.entity.Player}. @@ -112,7 +114,7 @@ public static PlayerSenderPart playerAsSender(String name) { } /** - * A {@link me.fixeddev.commandflow.part.ArgumentPart} that takes a string as world name and tries to parse it into a + * A {@link ArgumentPart} that takes a string as world name and tries to parse it into a * bukkit's {@link org.bukkit.World}. * * @param name The name for this part. diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/CommandSenderPart.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/CommandSenderPart.java similarity index 74% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/CommandSenderPart.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/CommandSenderPart.java index debd36e9..2d64ee8b 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/CommandSenderPart.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/CommandSenderPart.java @@ -1,11 +1,11 @@ -package me.fixeddev.commandflow.bukkit.part; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.bukkit.BukkitCommandManager; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +package team.unnamed.commandflow.bukkit.part; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.bukkit.BukkitCommandManager; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/GameModePart.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/GameModePart.java similarity index 87% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/GameModePart.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/GameModePart.java index ac0e08f4..39b97830 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/GameModePart.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/GameModePart.java @@ -1,10 +1,10 @@ -package me.fixeddev.commandflow.bukkit.part; +package team.unnamed.commandflow.bukkit.part; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.ArgumentPart; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.ArgumentPart; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/OfflinePlayerPart.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/OfflinePlayerPart.java similarity index 88% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/OfflinePlayerPart.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/OfflinePlayerPart.java index 9f29b765..e5eea592 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/OfflinePlayerPart.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/OfflinePlayerPart.java @@ -1,11 +1,11 @@ -package me.fixeddev.commandflow.bukkit.part; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.bukkit.BukkitCommandManager; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.ArgumentPart; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +package team.unnamed.commandflow.bukkit.part; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.bukkit.BukkitCommandManager; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.ArgumentPart; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerPart.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/PlayerPart.java similarity index 86% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerPart.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/PlayerPart.java index d7667ee9..40b7bf44 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerPart.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/PlayerPart.java @@ -1,11 +1,11 @@ -package me.fixeddev.commandflow.bukkit.part; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.bukkit.BukkitCommandManager; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.ArgumentPart; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +package team.unnamed.commandflow.bukkit.part; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.bukkit.BukkitCommandManager; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.ArgumentPart; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.UUID; -import static me.fixeddev.commandflow.bukkit.part.OfflinePlayerPart.getStrings; +import static team.unnamed.commandflow.bukkit.part.OfflinePlayerPart.getStrings; public class PlayerPart implements ArgumentPart { diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerSenderPart.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/PlayerSenderPart.java similarity index 77% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerSenderPart.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/PlayerSenderPart.java index 7996d114..7483d25e 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerSenderPart.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/PlayerSenderPart.java @@ -1,11 +1,11 @@ -package me.fixeddev.commandflow.bukkit.part; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.bukkit.BukkitCommandManager; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +package team.unnamed.commandflow.bukkit.part; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.bukkit.BukkitCommandManager; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/WorldPart.java b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/WorldPart.java similarity index 82% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/WorldPart.java rename to bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/WorldPart.java index 52bf0db3..7bc16b13 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/WorldPart.java +++ b/bukkit/src/main/java/team/unnamed/commandflow/bukkit/part/WorldPart.java @@ -1,10 +1,10 @@ -package me.fixeddev.commandflow.bukkit.part; +package team.unnamed.commandflow.bukkit.part; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.ArgumentPart; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.ArgumentPart; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import org.bukkit.Bukkit; import org.bukkit.World; diff --git a/bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeAuthorizer.java b/bungee/src/main/java/team/unnamed/commandflow/bungee/BungeeAuthorizer.java similarity index 77% rename from bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeAuthorizer.java rename to bungee/src/main/java/team/unnamed/commandflow/bungee/BungeeAuthorizer.java index f4f3c71c..f1397a83 100644 --- a/bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeAuthorizer.java +++ b/bungee/src/main/java/team/unnamed/commandflow/bungee/BungeeAuthorizer.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow.bungee; +package team.unnamed.commandflow.bungee; -import me.fixeddev.commandflow.Authorizer; -import me.fixeddev.commandflow.Namespace; +import team.unnamed.commandflow.Authorizer; +import team.unnamed.commandflow.Namespace; import net.md_5.bungee.api.CommandSender; public class BungeeAuthorizer implements Authorizer { diff --git a/bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandManager.java b/bungee/src/main/java/team/unnamed/commandflow/bungee/BungeeCommandManager.java similarity index 87% rename from bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandManager.java rename to bungee/src/main/java/team/unnamed/commandflow/bungee/BungeeCommandManager.java index c9d4139e..c90a6125 100644 --- a/bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandManager.java +++ b/bungee/src/main/java/team/unnamed/commandflow/bungee/BungeeCommandManager.java @@ -1,24 +1,24 @@ -package me.fixeddev.commandflow.bungee; - -import me.fixeddev.commandflow.Authorizer; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.CommandManager; -import me.fixeddev.commandflow.ErrorHandler; -import me.fixeddev.commandflow.Namespace; -import me.fixeddev.commandflow.ParseResult; -import me.fixeddev.commandflow.SimpleCommandManager; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.command.modifiers.FallbackCommandModifiers; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.exception.CommandUsage; -import me.fixeddev.commandflow.exception.InvalidSubCommandException; -import me.fixeddev.commandflow.exception.NoMoreArgumentsException; -import me.fixeddev.commandflow.exception.NoPermissionsException; -import me.fixeddev.commandflow.executor.Executor; -import me.fixeddev.commandflow.input.InputTokenizer; -import me.fixeddev.commandflow.translator.Translator; -import me.fixeddev.commandflow.usage.UsageBuilder; +package team.unnamed.commandflow.bungee; + +import team.unnamed.commandflow.Authorizer; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.CommandManager; +import team.unnamed.commandflow.ErrorHandler; +import team.unnamed.commandflow.Namespace; +import team.unnamed.commandflow.ParseResult; +import team.unnamed.commandflow.SimpleCommandManager; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.command.modifiers.FallbackCommandModifiers; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.exception.CommandUsage; +import team.unnamed.commandflow.exception.InvalidSubCommandException; +import team.unnamed.commandflow.exception.NoMoreArgumentsException; +import team.unnamed.commandflow.exception.NoPermissionsException; +import team.unnamed.commandflow.executor.Executor; +import team.unnamed.commandflow.input.InputTokenizer; +import team.unnamed.commandflow.translator.Translator; +import team.unnamed.commandflow.usage.UsageBuilder; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.md_5.bungee.api.plugin.Plugin; diff --git a/bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandWrapper.java b/bungee/src/main/java/team/unnamed/commandflow/bungee/BungeeCommandWrapper.java similarity index 89% rename from bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandWrapper.java rename to bungee/src/main/java/team/unnamed/commandflow/bungee/BungeeCommandWrapper.java index 6384aa19..4af1d693 100644 --- a/bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandWrapper.java +++ b/bungee/src/main/java/team/unnamed/commandflow/bungee/BungeeCommandWrapper.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.bungee; +package team.unnamed.commandflow.bungee; -import me.fixeddev.commandflow.CommandManager; -import me.fixeddev.commandflow.Namespace; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.translator.Translator; +import team.unnamed.commandflow.CommandManager; +import team.unnamed.commandflow.Namespace; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.translator.Translator; import net.kyori.adventure.text.Component; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.chat.BaseComponent; @@ -22,7 +22,7 @@ public class BungeeCommandWrapper extends Command implements TabExecutor { protected final String[] aliases; protected final String permission; - public BungeeCommandWrapper(me.fixeddev.commandflow.command.Command command, CommandManager commandManager, + public BungeeCommandWrapper(team.unnamed.commandflow.command.Command command, CommandManager commandManager, Translator translator) { super(command.getName()); diff --git a/bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeDefaultTranslationProvider.java b/bungee/src/main/java/team/unnamed/commandflow/bungee/BungeeDefaultTranslationProvider.java similarity index 77% rename from bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeDefaultTranslationProvider.java rename to bungee/src/main/java/team/unnamed/commandflow/bungee/BungeeDefaultTranslationProvider.java index 5361134d..4ce0bb32 100644 --- a/bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeDefaultTranslationProvider.java +++ b/bungee/src/main/java/team/unnamed/commandflow/bungee/BungeeDefaultTranslationProvider.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.bungee; +package team.unnamed.commandflow.bungee; -import me.fixeddev.commandflow.translator.DefaultMapTranslationProvider; +import team.unnamed.commandflow.translator.DefaultMapTranslationProvider; public class BungeeDefaultTranslationProvider extends DefaultMapTranslationProvider { diff --git a/bungee/src/main/java/me/fixeddev/commandflow/bungee/MessageUtils.java b/bungee/src/main/java/team/unnamed/commandflow/bungee/MessageUtils.java similarity index 93% rename from bungee/src/main/java/me/fixeddev/commandflow/bungee/MessageUtils.java rename to bungee/src/main/java/team/unnamed/commandflow/bungee/MessageUtils.java index 7b617541..93538150 100644 --- a/bungee/src/main/java/me/fixeddev/commandflow/bungee/MessageUtils.java +++ b/bungee/src/main/java/team/unnamed/commandflow/bungee/MessageUtils.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.bungee; +package team.unnamed.commandflow.bungee; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; diff --git a/bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/ProxiedPlayerOrSource.java b/bungee/src/main/java/team/unnamed/commandflow/bungee/annotation/ProxiedPlayerOrSource.java similarity index 84% rename from bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/ProxiedPlayerOrSource.java rename to bungee/src/main/java/team/unnamed/commandflow/bungee/annotation/ProxiedPlayerOrSource.java index 4e15f2d7..aae483fc 100644 --- a/bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/ProxiedPlayerOrSource.java +++ b/bungee/src/main/java/team/unnamed/commandflow/bungee/annotation/ProxiedPlayerOrSource.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.bungee.annotation; +package team.unnamed.commandflow.bungee.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Sender.java b/bungee/src/main/java/team/unnamed/commandflow/bungee/annotation/Sender.java similarity index 83% rename from bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Sender.java rename to bungee/src/main/java/team/unnamed/commandflow/bungee/annotation/Sender.java index b6328efb..bd970f9d 100644 --- a/bukkit/src/main/java/me/fixeddev/commandflow/bukkit/annotation/Sender.java +++ b/bungee/src/main/java/team/unnamed/commandflow/bungee/annotation/Sender.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.bukkit.annotation; +package team.unnamed.commandflow.bungee.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/BungeeModule.java b/bungee/src/main/java/team/unnamed/commandflow/bungee/factory/BungeeModule.java similarity index 67% rename from bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/BungeeModule.java rename to bungee/src/main/java/team/unnamed/commandflow/bungee/factory/BungeeModule.java index fae33a33..712a8cd6 100644 --- a/bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/BungeeModule.java +++ b/bungee/src/main/java/team/unnamed/commandflow/bungee/factory/BungeeModule.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.bungee.factory; +package team.unnamed.commandflow.bungee.factory; -import me.fixeddev.commandflow.annotated.part.AbstractModule; -import me.fixeddev.commandflow.annotated.part.Key; -import me.fixeddev.commandflow.bungee.annotation.Sender; +import team.unnamed.commandflow.annotated.part.AbstractModule; +import team.unnamed.commandflow.annotated.part.Key; +import team.unnamed.commandflow.bungee.annotation.Sender; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/CommandSenderPartFactory.java b/bungee/src/main/java/team/unnamed/commandflow/bungee/factory/CommandSenderPartFactory.java similarity index 56% rename from bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/CommandSenderPartFactory.java rename to bungee/src/main/java/team/unnamed/commandflow/bungee/factory/CommandSenderPartFactory.java index d27cef6d..a6b3c831 100644 --- a/bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/CommandSenderPartFactory.java +++ b/bungee/src/main/java/team/unnamed/commandflow/bungee/factory/CommandSenderPartFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.bungee.factory; +package team.unnamed.commandflow.bungee.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.bungee.part.CommandSenderPart; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.bungee.part.CommandSenderPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerPartFactory.java b/bungee/src/main/java/team/unnamed/commandflow/bungee/factory/ProxiedPlayerPartFactory.java similarity index 56% rename from bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerPartFactory.java rename to bungee/src/main/java/team/unnamed/commandflow/bungee/factory/ProxiedPlayerPartFactory.java index a0523717..1fc9f557 100644 --- a/bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerPartFactory.java +++ b/bungee/src/main/java/team/unnamed/commandflow/bungee/factory/ProxiedPlayerPartFactory.java @@ -1,9 +1,9 @@ -package me.fixeddev.commandflow.bungee.factory; +package team.unnamed.commandflow.bungee.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.bungee.annotation.ProxiedPlayerOrSource; -import me.fixeddev.commandflow.bungee.part.ProxiedPlayerPart; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.bungee.annotation.ProxiedPlayerOrSource; +import team.unnamed.commandflow.bungee.part.ProxiedPlayerPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerSenderPartFactory.java b/bungee/src/main/java/team/unnamed/commandflow/bungee/factory/ProxiedPlayerSenderPartFactory.java similarity index 56% rename from bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerSenderPartFactory.java rename to bungee/src/main/java/team/unnamed/commandflow/bungee/factory/ProxiedPlayerSenderPartFactory.java index e607a1d3..1bf40125 100644 --- a/bungee/src/main/java/me/fixeddev/commandflow/bungee/factory/ProxiedPlayerSenderPartFactory.java +++ b/bungee/src/main/java/team/unnamed/commandflow/bungee/factory/ProxiedPlayerSenderPartFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.bungee.factory; +package team.unnamed.commandflow.bungee.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.bungee.part.ProxiedPlayerSenderPart; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.bungee.part.ProxiedPlayerSenderPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/bungee/src/main/java/me/fixeddev/commandflow/bungee/part/CommandSenderPart.java b/bungee/src/main/java/team/unnamed/commandflow/bungee/part/CommandSenderPart.java similarity index 74% rename from bungee/src/main/java/me/fixeddev/commandflow/bungee/part/CommandSenderPart.java rename to bungee/src/main/java/team/unnamed/commandflow/bungee/part/CommandSenderPart.java index 6c19b727..fbfcbaad 100644 --- a/bungee/src/main/java/me/fixeddev/commandflow/bungee/part/CommandSenderPart.java +++ b/bungee/src/main/java/team/unnamed/commandflow/bungee/part/CommandSenderPart.java @@ -1,11 +1,11 @@ -package me.fixeddev.commandflow.bungee.part; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.bungee.BungeeCommandManager; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +package team.unnamed.commandflow.bungee.part; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.bungee.BungeeCommandManager; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import net.md_5.bungee.api.CommandSender; diff --git a/bungee/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerPart.java b/bungee/src/main/java/team/unnamed/commandflow/bungee/part/ProxiedPlayerPart.java similarity index 88% rename from bungee/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerPart.java rename to bungee/src/main/java/team/unnamed/commandflow/bungee/part/ProxiedPlayerPart.java index 56feca71..1ba83dc8 100644 --- a/bungee/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerPart.java +++ b/bungee/src/main/java/team/unnamed/commandflow/bungee/part/ProxiedPlayerPart.java @@ -1,11 +1,11 @@ -package me.fixeddev.commandflow.bungee.part; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.bungee.BungeeCommandManager; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.ArgumentPart; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +package team.unnamed.commandflow.bungee.part; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.bungee.BungeeCommandManager; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.ArgumentPart; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer; diff --git a/bungee/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerSenderPart.java b/bungee/src/main/java/team/unnamed/commandflow/bungee/part/ProxiedPlayerSenderPart.java similarity index 78% rename from bungee/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerSenderPart.java rename to bungee/src/main/java/team/unnamed/commandflow/bungee/part/ProxiedPlayerSenderPart.java index 4014f594..d8b9f0c4 100644 --- a/bungee/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerSenderPart.java +++ b/bungee/src/main/java/team/unnamed/commandflow/bungee/part/ProxiedPlayerSenderPart.java @@ -1,11 +1,11 @@ -package me.fixeddev.commandflow.bungee.part; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.bungee.BungeeCommandManager; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +package team.unnamed.commandflow.bungee.part; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.bungee.BungeeCommandManager; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.kyori.adventure.text.Component; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/DiscordAuthorizer.java b/discord/src/main/java/team/unnamed/commandflow/discord/DiscordAuthorizer.java similarity index 89% rename from discord/src/main/java/me/fixeddev/commandflow/discord/DiscordAuthorizer.java rename to discord/src/main/java/team/unnamed/commandflow/discord/DiscordAuthorizer.java index f359eb77..47aa732e 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/DiscordAuthorizer.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/DiscordAuthorizer.java @@ -1,7 +1,7 @@ -package me.fixeddev.commandflow.discord; +package team.unnamed.commandflow.discord; -import me.fixeddev.commandflow.Authorizer; -import me.fixeddev.commandflow.Namespace; +import team.unnamed.commandflow.Authorizer; +import team.unnamed.commandflow.Namespace; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.GuildChannel; import net.dv8tion.jda.api.entities.Member; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/DiscordCommandManager.java b/discord/src/main/java/team/unnamed/commandflow/discord/DiscordCommandManager.java similarity index 85% rename from discord/src/main/java/me/fixeddev/commandflow/discord/DiscordCommandManager.java rename to discord/src/main/java/team/unnamed/commandflow/discord/DiscordCommandManager.java index b0067033..d4f29d87 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/DiscordCommandManager.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/DiscordCommandManager.java @@ -1,27 +1,26 @@ -package me.fixeddev.commandflow.discord; - -import me.fixeddev.commandflow.Authorizer; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.CommandManager; -import me.fixeddev.commandflow.ErrorHandler; -import me.fixeddev.commandflow.Namespace; -import me.fixeddev.commandflow.ParseResult; -import me.fixeddev.commandflow.SimpleCommandManager; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.command.modifiers.FallbackCommandModifiers; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.exception.CommandUsage; -import me.fixeddev.commandflow.exception.InvalidSubCommandException; -import me.fixeddev.commandflow.exception.NoMoreArgumentsException; -import me.fixeddev.commandflow.exception.NoPermissionsException; -import me.fixeddev.commandflow.executor.Executor; -import me.fixeddev.commandflow.input.InputTokenizer; -import me.fixeddev.commandflow.translator.Translator; -import me.fixeddev.commandflow.usage.UsageBuilder; +package team.unnamed.commandflow.discord; + +import team.unnamed.commandflow.Authorizer; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.CommandManager; +import team.unnamed.commandflow.ErrorHandler; +import team.unnamed.commandflow.Namespace; +import team.unnamed.commandflow.ParseResult; +import team.unnamed.commandflow.SimpleCommandManager; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.command.modifiers.FallbackCommandModifiers; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.exception.CommandUsage; +import team.unnamed.commandflow.exception.InvalidSubCommandException; +import team.unnamed.commandflow.exception.NoMoreArgumentsException; +import team.unnamed.commandflow.exception.NoPermissionsException; +import team.unnamed.commandflow.executor.Executor; +import team.unnamed.commandflow.input.InputTokenizer; +import team.unnamed.commandflow.translator.Translator; +import team.unnamed.commandflow.usage.UsageBuilder; import net.dv8tion.jda.api.JDA; -import java.security.MessageDigest; import java.util.List; import java.util.Optional; import java.util.Set; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/DiscordDefaultTranslationProvider.java b/discord/src/main/java/team/unnamed/commandflow/discord/DiscordDefaultTranslationProvider.java similarity index 75% rename from discord/src/main/java/me/fixeddev/commandflow/discord/DiscordDefaultTranslationProvider.java rename to discord/src/main/java/team/unnamed/commandflow/discord/DiscordDefaultTranslationProvider.java index 13f8a72a..31c33b31 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/DiscordDefaultTranslationProvider.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/DiscordDefaultTranslationProvider.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.discord; +package team.unnamed.commandflow.discord; -import me.fixeddev.commandflow.translator.DefaultMapTranslationProvider; +import team.unnamed.commandflow.translator.DefaultMapTranslationProvider; public class DiscordDefaultTranslationProvider extends DefaultMapTranslationProvider { diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/MessageListener.java b/discord/src/main/java/team/unnamed/commandflow/discord/MessageListener.java similarity index 83% rename from discord/src/main/java/me/fixeddev/commandflow/discord/MessageListener.java rename to discord/src/main/java/team/unnamed/commandflow/discord/MessageListener.java index 3c67bec0..ad4d6d7b 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/MessageListener.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/MessageListener.java @@ -1,14 +1,9 @@ -package me.fixeddev.commandflow.discord; - -import me.fixeddev.commandflow.CommandManager; -import me.fixeddev.commandflow.Namespace; -import me.fixeddev.commandflow.discord.utils.MessageUtils; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.exception.CommandUsage; -import me.fixeddev.commandflow.exception.InvalidSubCommandException; -import me.fixeddev.commandflow.exception.NoMoreArgumentsException; -import me.fixeddev.commandflow.exception.NoPermissionsException; +package team.unnamed.commandflow.discord; + +import team.unnamed.commandflow.CommandManager; +import team.unnamed.commandflow.Namespace; +import team.unnamed.commandflow.discord.utils.MessageUtils; +import team.unnamed.commandflow.exception.CommandException; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.TextChannel; diff --git a/velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/Sender.java b/discord/src/main/java/team/unnamed/commandflow/discord/annotation/Sender.java similarity index 83% rename from velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/Sender.java rename to discord/src/main/java/team/unnamed/commandflow/discord/annotation/Sender.java index 9c5b0574..3a26dd56 100644 --- a/velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/Sender.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/annotation/Sender.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.velocity.annotation; +package team.unnamed.commandflow.discord.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/factory/DiscordModule.java b/discord/src/main/java/team/unnamed/commandflow/discord/factory/DiscordModule.java similarity index 75% rename from discord/src/main/java/me/fixeddev/commandflow/discord/factory/DiscordModule.java rename to discord/src/main/java/team/unnamed/commandflow/discord/factory/DiscordModule.java index 32a7012c..7bdb80ba 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/factory/DiscordModule.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/factory/DiscordModule.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.discord.factory; +package team.unnamed.commandflow.discord.factory; -import me.fixeddev.commandflow.annotated.part.AbstractModule; -import me.fixeddev.commandflow.annotated.part.Key; -import me.fixeddev.commandflow.discord.annotation.Sender; +import team.unnamed.commandflow.annotated.part.AbstractModule; +import team.unnamed.commandflow.annotated.part.Key; +import team.unnamed.commandflow.discord.annotation.Sender; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.TextChannel; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/factory/MemberPartFactory.java b/discord/src/main/java/team/unnamed/commandflow/discord/factory/MemberPartFactory.java similarity index 55% rename from discord/src/main/java/me/fixeddev/commandflow/discord/factory/MemberPartFactory.java rename to discord/src/main/java/team/unnamed/commandflow/discord/factory/MemberPartFactory.java index 918dd3e6..5e827bf8 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/factory/MemberPartFactory.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/factory/MemberPartFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.discord.factory; +package team.unnamed.commandflow.discord.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.discord.part.MemberPart; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.discord.part.MemberPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/factory/MemberSenderPartFactory.java b/discord/src/main/java/team/unnamed/commandflow/discord/factory/MemberSenderPartFactory.java similarity index 55% rename from discord/src/main/java/me/fixeddev/commandflow/discord/factory/MemberSenderPartFactory.java rename to discord/src/main/java/team/unnamed/commandflow/discord/factory/MemberSenderPartFactory.java index f302c1f2..71c09b7c 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/factory/MemberSenderPartFactory.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/factory/MemberSenderPartFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.discord.factory; +package team.unnamed.commandflow.discord.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.discord.part.MemberSenderPart; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.discord.part.MemberSenderPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/factory/MessagePartFactory.java b/discord/src/main/java/team/unnamed/commandflow/discord/factory/MessagePartFactory.java similarity index 55% rename from discord/src/main/java/me/fixeddev/commandflow/discord/factory/MessagePartFactory.java rename to discord/src/main/java/team/unnamed/commandflow/discord/factory/MessagePartFactory.java index c6de5af3..9673c10b 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/factory/MessagePartFactory.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/factory/MessagePartFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.discord.factory; +package team.unnamed.commandflow.discord.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.discord.part.MessagePart; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.discord.part.MessagePart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/factory/TextChannelPartFactory.java b/discord/src/main/java/team/unnamed/commandflow/discord/factory/TextChannelPartFactory.java similarity index 55% rename from discord/src/main/java/me/fixeddev/commandflow/discord/factory/TextChannelPartFactory.java rename to discord/src/main/java/team/unnamed/commandflow/discord/factory/TextChannelPartFactory.java index 741141e1..0d4b94b2 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/factory/TextChannelPartFactory.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/factory/TextChannelPartFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.discord.factory; +package team.unnamed.commandflow.discord.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.discord.part.TextChannelPart; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.discord.part.TextChannelPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/factory/UserPartFactory.java b/discord/src/main/java/team/unnamed/commandflow/discord/factory/UserPartFactory.java similarity index 55% rename from discord/src/main/java/me/fixeddev/commandflow/discord/factory/UserPartFactory.java rename to discord/src/main/java/team/unnamed/commandflow/discord/factory/UserPartFactory.java index e4098a7e..6245b5fc 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/factory/UserPartFactory.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/factory/UserPartFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.discord.factory; +package team.unnamed.commandflow.discord.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.discord.part.UserPart; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.discord.part.UserPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/factory/UserSenderPartFactory.java b/discord/src/main/java/team/unnamed/commandflow/discord/factory/UserSenderPartFactory.java similarity index 55% rename from discord/src/main/java/me/fixeddev/commandflow/discord/factory/UserSenderPartFactory.java rename to discord/src/main/java/team/unnamed/commandflow/discord/factory/UserSenderPartFactory.java index c7a5bcb5..ffb5bcb4 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/factory/UserSenderPartFactory.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/factory/UserSenderPartFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.discord.factory; +package team.unnamed.commandflow.discord.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.discord.part.UserSenderPart; -import me.fixeddev.commandflow.part.CommandPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.discord.part.UserSenderPart; +import team.unnamed.commandflow.part.CommandPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/part/MemberPart.java b/discord/src/main/java/team/unnamed/commandflow/discord/part/MemberPart.java similarity index 80% rename from discord/src/main/java/me/fixeddev/commandflow/discord/part/MemberPart.java rename to discord/src/main/java/team/unnamed/commandflow/discord/part/MemberPart.java index e15a104b..c7a54675 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/part/MemberPart.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/part/MemberPart.java @@ -1,12 +1,12 @@ -package me.fixeddev.commandflow.discord.part; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.discord.DiscordCommandManager; -import me.fixeddev.commandflow.discord.utils.ArgumentsUtils; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.ArgumentPart; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +package team.unnamed.commandflow.discord.part; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.discord.DiscordCommandManager; +import team.unnamed.commandflow.discord.utils.ArgumentsUtils; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.ArgumentPart; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/part/MemberSenderPart.java b/discord/src/main/java/team/unnamed/commandflow/discord/part/MemberSenderPart.java similarity index 74% rename from discord/src/main/java/me/fixeddev/commandflow/discord/part/MemberSenderPart.java rename to discord/src/main/java/team/unnamed/commandflow/discord/part/MemberSenderPart.java index b1f36cbb..1b15fc91 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/part/MemberSenderPart.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/part/MemberSenderPart.java @@ -1,11 +1,11 @@ -package me.fixeddev.commandflow.discord.part; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.discord.DiscordCommandManager; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +package team.unnamed.commandflow.discord.part; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.discord.DiscordCommandManager; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.dv8tion.jda.api.entities.Member; import net.kyori.adventure.text.Component; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/part/MessagePart.java b/discord/src/main/java/team/unnamed/commandflow/discord/part/MessagePart.java similarity index 73% rename from discord/src/main/java/me/fixeddev/commandflow/discord/part/MessagePart.java rename to discord/src/main/java/team/unnamed/commandflow/discord/part/MessagePart.java index 020b77b1..e7fcea19 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/part/MessagePart.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/part/MessagePart.java @@ -1,10 +1,10 @@ -package me.fixeddev.commandflow.discord.part; +package team.unnamed.commandflow.discord.part; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.discord.DiscordCommandManager; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.discord.DiscordCommandManager; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.dv8tion.jda.api.entities.Message; import java.util.Objects; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/part/TextChannelPart.java b/discord/src/main/java/team/unnamed/commandflow/discord/part/TextChannelPart.java similarity index 79% rename from discord/src/main/java/me/fixeddev/commandflow/discord/part/TextChannelPart.java rename to discord/src/main/java/team/unnamed/commandflow/discord/part/TextChannelPart.java index bdb096d5..1275c4bf 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/part/TextChannelPart.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/part/TextChannelPart.java @@ -1,12 +1,12 @@ -package me.fixeddev.commandflow.discord.part; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.discord.DiscordCommandManager; -import me.fixeddev.commandflow.discord.utils.ArgumentsUtils; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.ArgumentPart; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +package team.unnamed.commandflow.discord.part; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.discord.DiscordCommandManager; +import team.unnamed.commandflow.discord.utils.ArgumentsUtils; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.ArgumentPart; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.TextChannel; import net.kyori.adventure.text.Component; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/part/UserPart.java b/discord/src/main/java/team/unnamed/commandflow/discord/part/UserPart.java similarity index 77% rename from discord/src/main/java/me/fixeddev/commandflow/discord/part/UserPart.java rename to discord/src/main/java/team/unnamed/commandflow/discord/part/UserPart.java index 0b7f84cb..0ed644cb 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/part/UserPart.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/part/UserPart.java @@ -1,12 +1,12 @@ -package me.fixeddev.commandflow.discord.part; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.discord.DiscordCommandManager; -import me.fixeddev.commandflow.discord.utils.ArgumentsUtils; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.ArgumentPart; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +package team.unnamed.commandflow.discord.part; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.discord.DiscordCommandManager; +import team.unnamed.commandflow.discord.utils.ArgumentsUtils; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.ArgumentPart; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.User; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/part/UserSenderPart.java b/discord/src/main/java/team/unnamed/commandflow/discord/part/UserSenderPart.java similarity index 65% rename from discord/src/main/java/me/fixeddev/commandflow/discord/part/UserSenderPart.java rename to discord/src/main/java/team/unnamed/commandflow/discord/part/UserSenderPart.java index e151e34f..8645b852 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/part/UserSenderPart.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/part/UserSenderPart.java @@ -1,11 +1,11 @@ -package me.fixeddev.commandflow.discord.part; - -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.discord.DiscordCommandManager; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; +package team.unnamed.commandflow.discord.part; + +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.discord.DiscordCommandManager; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; import net.dv8tion.jda.api.entities.User; import net.kyori.adventure.text.Component; diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/utils/ArgumentsUtils.java b/discord/src/main/java/team/unnamed/commandflow/discord/utils/ArgumentsUtils.java similarity index 96% rename from discord/src/main/java/me/fixeddev/commandflow/discord/utils/ArgumentsUtils.java rename to discord/src/main/java/team/unnamed/commandflow/discord/utils/ArgumentsUtils.java index 47a0f0d5..eac6e2db 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/utils/ArgumentsUtils.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/utils/ArgumentsUtils.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.discord.utils; +package team.unnamed.commandflow.discord.utils; public final class ArgumentsUtils { diff --git a/discord/src/main/java/me/fixeddev/commandflow/discord/utils/MessageUtils.java b/discord/src/main/java/team/unnamed/commandflow/discord/utils/MessageUtils.java similarity index 88% rename from discord/src/main/java/me/fixeddev/commandflow/discord/utils/MessageUtils.java rename to discord/src/main/java/team/unnamed/commandflow/discord/utils/MessageUtils.java index 9280b82b..f76be656 100644 --- a/discord/src/main/java/me/fixeddev/commandflow/discord/utils/MessageUtils.java +++ b/discord/src/main/java/team/unnamed/commandflow/discord/utils/MessageUtils.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.discord.utils; +package team.unnamed.commandflow.discord.utils; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; diff --git a/docs/imperatively/argument.md b/docs/imperatively/argument.md index 81fa8941..066aba11 100644 --- a/docs/imperatively/argument.md +++ b/docs/imperatively/argument.md @@ -4,7 +4,7 @@ Check this command example with a single argument: ```java -import static me.fixeddev.commandflow.part.Parts.*; + //... diff --git a/velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityAuthorizer.java b/velocity/src/main/java/team/unnamed/commandflow/velocity/VelocityAuthorizer.java similarity index 77% rename from velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityAuthorizer.java rename to velocity/src/main/java/team/unnamed/commandflow/velocity/VelocityAuthorizer.java index d19f4f5a..c2ea6783 100644 --- a/velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityAuthorizer.java +++ b/velocity/src/main/java/team/unnamed/commandflow/velocity/VelocityAuthorizer.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.velocity; +package team.unnamed.commandflow.velocity; import com.velocitypowered.api.command.CommandSource; -import me.fixeddev.commandflow.Authorizer; -import me.fixeddev.commandflow.Namespace; +import team.unnamed.commandflow.Authorizer; +import team.unnamed.commandflow.Namespace; public class VelocityAuthorizer implements Authorizer { diff --git a/velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandManager.java b/velocity/src/main/java/team/unnamed/commandflow/velocity/VelocityCommandManager.java similarity index 87% rename from velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandManager.java rename to velocity/src/main/java/team/unnamed/commandflow/velocity/VelocityCommandManager.java index 67f1242b..bad9e191 100644 --- a/velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandManager.java +++ b/velocity/src/main/java/team/unnamed/commandflow/velocity/VelocityCommandManager.java @@ -1,26 +1,26 @@ -package me.fixeddev.commandflow.velocity; +package team.unnamed.commandflow.velocity; import com.velocitypowered.api.command.CommandMeta; import com.velocitypowered.api.proxy.ProxyServer; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.CommandManager; -import me.fixeddev.commandflow.ErrorHandler; -import me.fixeddev.commandflow.Namespace; -import me.fixeddev.commandflow.SimpleCommandManager; -import me.fixeddev.commandflow.Authorizer; -import me.fixeddev.commandflow.ParseResult; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.command.modifiers.FallbackCommandModifiers; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.exception.CommandUsage; -import me.fixeddev.commandflow.exception.InvalidSubCommandException; -import me.fixeddev.commandflow.exception.NoMoreArgumentsException; -import me.fixeddev.commandflow.exception.NoPermissionsException; -import me.fixeddev.commandflow.executor.Executor; -import me.fixeddev.commandflow.input.InputTokenizer; -import me.fixeddev.commandflow.translator.Translator; -import me.fixeddev.commandflow.usage.UsageBuilder; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.CommandManager; +import team.unnamed.commandflow.ErrorHandler; +import team.unnamed.commandflow.Namespace; +import team.unnamed.commandflow.SimpleCommandManager; +import team.unnamed.commandflow.Authorizer; +import team.unnamed.commandflow.ParseResult; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.command.modifiers.FallbackCommandModifiers; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.exception.CommandUsage; +import team.unnamed.commandflow.exception.InvalidSubCommandException; +import team.unnamed.commandflow.exception.NoMoreArgumentsException; +import team.unnamed.commandflow.exception.NoPermissionsException; +import team.unnamed.commandflow.executor.Executor; +import team.unnamed.commandflow.input.InputTokenizer; +import team.unnamed.commandflow.translator.Translator; +import team.unnamed.commandflow.usage.UsageBuilder; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import java.util.*; diff --git a/velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandWrapper.java b/velocity/src/main/java/team/unnamed/commandflow/velocity/VelocityCommandWrapper.java similarity index 91% rename from velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandWrapper.java rename to velocity/src/main/java/team/unnamed/commandflow/velocity/VelocityCommandWrapper.java index b8bd7b23..1bad017f 100644 --- a/velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityCommandWrapper.java +++ b/velocity/src/main/java/team/unnamed/commandflow/velocity/VelocityCommandWrapper.java @@ -1,12 +1,12 @@ -package me.fixeddev.commandflow.velocity; +package team.unnamed.commandflow.velocity; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.RawCommand; -import me.fixeddev.commandflow.CommandManager; -import me.fixeddev.commandflow.Namespace; -import me.fixeddev.commandflow.command.Command; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.translator.Translator; +import team.unnamed.commandflow.CommandManager; +import team.unnamed.commandflow.Namespace; +import team.unnamed.commandflow.command.Command; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.translator.Translator; import net.kyori.adventure.text.Component; import java.util.List; diff --git a/velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityDefaultTranslationProvider.java b/velocity/src/main/java/team/unnamed/commandflow/velocity/VelocityDefaultTranslationProvider.java similarity index 77% rename from velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityDefaultTranslationProvider.java rename to velocity/src/main/java/team/unnamed/commandflow/velocity/VelocityDefaultTranslationProvider.java index bac51eb0..b1ed86f8 100644 --- a/velocity/src/main/java/me/fixeddev/commandflow/velocity/VelocityDefaultTranslationProvider.java +++ b/velocity/src/main/java/team/unnamed/commandflow/velocity/VelocityDefaultTranslationProvider.java @@ -1,6 +1,6 @@ -package me.fixeddev.commandflow.velocity; +package team.unnamed.commandflow.velocity; -import me.fixeddev.commandflow.translator.DefaultMapTranslationProvider; +import team.unnamed.commandflow.translator.DefaultMapTranslationProvider; public class VelocityDefaultTranslationProvider extends DefaultMapTranslationProvider { diff --git a/velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/PlayerOrSource.java b/velocity/src/main/java/team/unnamed/commandflow/velocity/annotation/PlayerOrSource.java similarity index 83% rename from velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/PlayerOrSource.java rename to velocity/src/main/java/team/unnamed/commandflow/velocity/annotation/PlayerOrSource.java index 393c641b..7fcd5df3 100644 --- a/velocity/src/main/java/me/fixeddev/commandflow/velocity/annotation/PlayerOrSource.java +++ b/velocity/src/main/java/team/unnamed/commandflow/velocity/annotation/PlayerOrSource.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.velocity.annotation; +package team.unnamed.commandflow.velocity.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/Sender.java b/velocity/src/main/java/team/unnamed/commandflow/velocity/annotation/Sender.java similarity index 82% rename from bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/Sender.java rename to velocity/src/main/java/team/unnamed/commandflow/velocity/annotation/Sender.java index 6a0fd7ee..3c23a271 100644 --- a/bungee/src/main/java/me/fixeddev/commandflow/bungee/annotation/Sender.java +++ b/velocity/src/main/java/team/unnamed/commandflow/velocity/annotation/Sender.java @@ -1,4 +1,4 @@ -package me.fixeddev.commandflow.bungee.annotation; +package team.unnamed.commandflow.velocity.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/CommandSourcePartFactory.java b/velocity/src/main/java/team/unnamed/commandflow/velocity/factory/CommandSourcePartFactory.java similarity index 55% rename from velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/CommandSourcePartFactory.java rename to velocity/src/main/java/team/unnamed/commandflow/velocity/factory/CommandSourcePartFactory.java index 8a7d88da..cbf06c96 100644 --- a/velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/CommandSourcePartFactory.java +++ b/velocity/src/main/java/team/unnamed/commandflow/velocity/factory/CommandSourcePartFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.velocity.factory; +package team.unnamed.commandflow.velocity.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.velocity.part.CommandSenderPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.velocity.part.CommandSenderPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerPartFactory.java b/velocity/src/main/java/team/unnamed/commandflow/velocity/factory/PlayerPartFactory.java similarity index 66% rename from velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerPartFactory.java rename to velocity/src/main/java/team/unnamed/commandflow/velocity/factory/PlayerPartFactory.java index c81814ba..dee55930 100644 --- a/velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerPartFactory.java +++ b/velocity/src/main/java/team/unnamed/commandflow/velocity/factory/PlayerPartFactory.java @@ -1,10 +1,10 @@ -package me.fixeddev.commandflow.velocity.factory; +package team.unnamed.commandflow.velocity.factory; import com.velocitypowered.api.proxy.ProxyServer; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.velocity.annotation.PlayerOrSource; -import me.fixeddev.commandflow.velocity.part.PlayerPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.velocity.annotation.PlayerOrSource; +import team.unnamed.commandflow.velocity.part.PlayerPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerSenderPartFactory.java b/velocity/src/main/java/team/unnamed/commandflow/velocity/factory/PlayerSenderPartFactory.java similarity index 55% rename from velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerSenderPartFactory.java rename to velocity/src/main/java/team/unnamed/commandflow/velocity/factory/PlayerSenderPartFactory.java index 6fb95ae2..079f5d00 100644 --- a/velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/PlayerSenderPartFactory.java +++ b/velocity/src/main/java/team/unnamed/commandflow/velocity/factory/PlayerSenderPartFactory.java @@ -1,8 +1,8 @@ -package me.fixeddev.commandflow.velocity.factory; +package team.unnamed.commandflow.velocity.factory; -import me.fixeddev.commandflow.annotated.part.PartFactory; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.velocity.part.PlayerSenderPart; +import team.unnamed.commandflow.annotated.part.PartFactory; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.velocity.part.PlayerSenderPart; import java.lang.annotation.Annotation; import java.util.List; diff --git a/velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/VelocityModule.java b/velocity/src/main/java/team/unnamed/commandflow/velocity/factory/VelocityModule.java similarity index 73% rename from velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/VelocityModule.java rename to velocity/src/main/java/team/unnamed/commandflow/velocity/factory/VelocityModule.java index 92371d24..3f41fe89 100644 --- a/velocity/src/main/java/me/fixeddev/commandflow/velocity/factory/VelocityModule.java +++ b/velocity/src/main/java/team/unnamed/commandflow/velocity/factory/VelocityModule.java @@ -1,11 +1,11 @@ -package me.fixeddev.commandflow.velocity.factory; +package team.unnamed.commandflow.velocity.factory; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; -import me.fixeddev.commandflow.annotated.part.AbstractModule; -import me.fixeddev.commandflow.annotated.part.Key; -import me.fixeddev.commandflow.velocity.annotation.Sender; +import team.unnamed.commandflow.annotated.part.AbstractModule; +import team.unnamed.commandflow.annotated.part.Key; +import team.unnamed.commandflow.velocity.annotation.Sender; public class VelocityModule extends AbstractModule { diff --git a/velocity/src/main/java/me/fixeddev/commandflow/velocity/part/CommandSenderPart.java b/velocity/src/main/java/team/unnamed/commandflow/velocity/part/CommandSenderPart.java similarity index 74% rename from velocity/src/main/java/me/fixeddev/commandflow/velocity/part/CommandSenderPart.java rename to velocity/src/main/java/team/unnamed/commandflow/velocity/part/CommandSenderPart.java index 8ee0eece..2641b471 100644 --- a/velocity/src/main/java/me/fixeddev/commandflow/velocity/part/CommandSenderPart.java +++ b/velocity/src/main/java/team/unnamed/commandflow/velocity/part/CommandSenderPart.java @@ -1,12 +1,12 @@ -package me.fixeddev.commandflow.velocity.part; +package team.unnamed.commandflow.velocity.part; import com.velocitypowered.api.command.CommandSource; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; -import me.fixeddev.commandflow.velocity.VelocityCommandManager; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.velocity.VelocityCommandManager; import net.kyori.adventure.text.Component; import java.util.Objects; diff --git a/velocity/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerPart.java b/velocity/src/main/java/team/unnamed/commandflow/velocity/part/PlayerPart.java similarity index 84% rename from velocity/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerPart.java rename to velocity/src/main/java/team/unnamed/commandflow/velocity/part/PlayerPart.java index 28f30bcc..b00a3018 100644 --- a/velocity/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerPart.java +++ b/velocity/src/main/java/team/unnamed/commandflow/velocity/part/PlayerPart.java @@ -1,14 +1,14 @@ -package me.fixeddev.commandflow.velocity.part; +package team.unnamed.commandflow.velocity.part; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.part.ArgumentPart; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; -import me.fixeddev.commandflow.velocity.VelocityCommandManager; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.part.ArgumentPart; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.velocity.VelocityCommandManager; import net.kyori.adventure.text.Component; diff --git a/velocity/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerSenderPart.java b/velocity/src/main/java/team/unnamed/commandflow/velocity/part/PlayerSenderPart.java similarity index 77% rename from velocity/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerSenderPart.java rename to velocity/src/main/java/team/unnamed/commandflow/velocity/part/PlayerSenderPart.java index b13041f3..ebec0caf 100644 --- a/velocity/src/main/java/me/fixeddev/commandflow/velocity/part/PlayerSenderPart.java +++ b/velocity/src/main/java/team/unnamed/commandflow/velocity/part/PlayerSenderPart.java @@ -1,13 +1,13 @@ -package me.fixeddev.commandflow.velocity.part; +package team.unnamed.commandflow.velocity.part; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; -import me.fixeddev.commandflow.CommandContext; -import me.fixeddev.commandflow.exception.ArgumentParseException; -import me.fixeddev.commandflow.exception.CommandException; -import me.fixeddev.commandflow.part.CommandPart; -import me.fixeddev.commandflow.stack.ArgumentStack; -import me.fixeddev.commandflow.velocity.VelocityCommandManager; +import team.unnamed.commandflow.CommandContext; +import team.unnamed.commandflow.exception.ArgumentParseException; +import team.unnamed.commandflow.exception.CommandException; +import team.unnamed.commandflow.part.CommandPart; +import team.unnamed.commandflow.stack.ArgumentStack; +import team.unnamed.commandflow.velocity.VelocityCommandManager; import net.kyori.adventure.text.Component; import java.util.Objects; From ba342647179803120c2a9719eb0a87b1952635e2 Mon Sep 17 00:00:00 2001 From: yusshu Date: Mon, 30 Oct 2023 12:28:49 -0500 Subject: [PATCH 5/5] fix: remove invalid imports --- .../commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java | 1 - .../commandflow/annotated/part/defaults/DefaultsModule.java | 1 - 2 files changed, 2 deletions(-) diff --git a/api/src/main/java/team/unnamed/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java b/api/src/main/java/team/unnamed/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java index e612c3d2..dbd45b16 100644 --- a/api/src/main/java/team/unnamed/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/AnnotatedCommandTreeBuilderImpl.java @@ -1,6 +1,5 @@ package team.unnamed.commandflow.annotated; -import me.fixeddev.commandflow.annotated.annotation.*; import team.unnamed.commandflow.annotated.builder.AnnotatedCommandBuilder; import team.unnamed.commandflow.annotated.builder.CommandDataNode; import team.unnamed.commandflow.annotated.builder.CommandModifiersNode; diff --git a/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/DefaultsModule.java b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/DefaultsModule.java index 0ec1835f..7f0d8498 100644 --- a/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/DefaultsModule.java +++ b/api/src/main/java/team/unnamed/commandflow/annotated/part/defaults/DefaultsModule.java @@ -10,7 +10,6 @@ import team.unnamed.commandflow.annotated.annotation.Text; import team.unnamed.commandflow.annotated.part.AbstractModule; import team.unnamed.commandflow.annotated.part.Key; -import me.fixeddev.commandflow.annotated.part.defaults.factory.*; import team.unnamed.commandflow.annotated.part.defaults.modifier.LimitModifier; import team.unnamed.commandflow.annotated.part.defaults.modifier.OptionalModifier; import team.unnamed.commandflow.annotated.part.defaults.modifier.RewritesModifier;