diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/suggestion/package-info.java b/cloud-sponge/src/main/java/cloud/commandframework/sponge/suggestion/package-info.java deleted file mode 100644 index 0891f3c2..00000000 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/suggestion/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Sponge suggestion related classes. - */ -package cloud.commandframework.sponge.suggestion; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/CloudInjectionModule.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/CloudInjectionModule.java similarity index 98% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/CloudInjectionModule.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/CloudInjectionModule.java index 8852e012..242c75e0 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/CloudInjectionModule.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/CloudInjectionModule.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge; +package org.incendo.cloud.sponge; import com.google.inject.AbstractModule; import com.google.inject.Key; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/CloudSpongeCommand.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/CloudSpongeCommand.java similarity index 99% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/CloudSpongeCommand.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/CloudSpongeCommand.java index 310ebc3a..bd863e6b 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/CloudSpongeCommand.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/CloudSpongeCommand.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge; +package org.incendo.cloud.sponge; import java.util.ArrayDeque; import java.util.Collections; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/NodeSource.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/NodeSource.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/NodeSource.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/NodeSource.java index df34fe5b..dcd55871 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/NodeSource.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/NodeSource.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge; +package org.incendo.cloud.sponge; import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCaptionKeys.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeCaptionKeys.java similarity index 98% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCaptionKeys.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeCaptionKeys.java index c3cd2743..0f02f3d5 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCaptionKeys.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeCaptionKeys.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge; +package org.incendo.cloud.sponge; import java.util.Collection; import java.util.Collections; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCommandContextKeys.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeCommandContextKeys.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCommandContextKeys.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeCommandContextKeys.java index 366e48f3..f2fcbc44 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCommandContextKeys.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeCommandContextKeys.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge; +package org.incendo.cloud.sponge; import io.leangen.geantyref.TypeToken; import org.incendo.cloud.key.CloudKey; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCommandManager.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeCommandManager.java similarity index 75% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCommandManager.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeCommandManager.java index 4fba2de4..fca8f492 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCommandManager.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeCommandManager.java @@ -21,13 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge; +package org.incendo.cloud.sponge; -import cloud.commandframework.sponge.annotation.specifier.Center; -import cloud.commandframework.sponge.parser.RegistryEntryParser; -import cloud.commandframework.sponge.parser.Vector2dParser; -import cloud.commandframework.sponge.parser.Vector3dParser; -import cloud.commandframework.sponge.suggestion.SpongeSuggestion; import com.google.common.collect.ImmutableSet; import com.google.inject.Inject; import com.google.inject.Module; @@ -46,6 +41,30 @@ import org.incendo.cloud.meta.CommandMeta; import org.incendo.cloud.meta.SimpleCommandMeta; import org.incendo.cloud.parser.ParserParameters; +import org.incendo.cloud.sponge.annotation.specifier.Center; +import org.incendo.cloud.sponge.parser.BlockInputParser; +import org.incendo.cloud.sponge.parser.BlockPredicateParser; +import org.incendo.cloud.sponge.parser.ComponentParser; +import org.incendo.cloud.sponge.parser.DataContainerParser; +import org.incendo.cloud.sponge.parser.GameProfileCollectionParser; +import org.incendo.cloud.sponge.parser.GameProfileParser; +import org.incendo.cloud.sponge.parser.ItemStackPredicateParser; +import org.incendo.cloud.sponge.parser.MultipleEntitySelectorParser; +import org.incendo.cloud.sponge.parser.MultiplePlayerSelectorParser; +import org.incendo.cloud.sponge.parser.NamedTextColorParser; +import org.incendo.cloud.sponge.parser.OperatorParser; +import org.incendo.cloud.sponge.parser.ProtoItemStackParser; +import org.incendo.cloud.sponge.parser.RegistryEntryParser; +import org.incendo.cloud.sponge.parser.ResourceKeyParser; +import org.incendo.cloud.sponge.parser.SingleEntitySelectorParser; +import org.incendo.cloud.sponge.parser.SinglePlayerSelectorParser; +import org.incendo.cloud.sponge.parser.UserParser; +import org.incendo.cloud.sponge.parser.Vector2dParser; +import org.incendo.cloud.sponge.parser.Vector2iParser; +import org.incendo.cloud.sponge.parser.Vector3dParser; +import org.incendo.cloud.sponge.parser.Vector3iParser; +import org.incendo.cloud.sponge.parser.WorldParser; +import org.incendo.cloud.sponge.suggestion.SpongeSuggestion; import org.incendo.cloud.state.RegistrationState; import org.incendo.cloud.suggestion.SuggestionFactory; import org.spongepowered.api.Sponge; @@ -59,26 +78,6 @@ import org.spongepowered.math.vector.Vector3d; import org.spongepowered.plugin.PluginContainer; -import static cloud.commandframework.sponge.parser.BlockInputParser.blockInputParser; -import static cloud.commandframework.sponge.parser.BlockPredicateParser.blockPredicateParser; -import static cloud.commandframework.sponge.parser.ComponentParser.componentParser; -import static cloud.commandframework.sponge.parser.DataContainerParser.dataContainerParser; -import static cloud.commandframework.sponge.parser.GameProfileCollectionParser.gameProfileCollectionParser; -import static cloud.commandframework.sponge.parser.GameProfileParser.gameProfileParser; -import static cloud.commandframework.sponge.parser.ItemStackPredicateParser.itemStackPredicateParser; -import static cloud.commandframework.sponge.parser.MultipleEntitySelectorParser.multipleEntitySelectorParser; -import static cloud.commandframework.sponge.parser.MultiplePlayerSelectorParser.multiplePlayerSelectorParser; -import static cloud.commandframework.sponge.parser.NamedTextColorParser.namedTextColorParser; -import static cloud.commandframework.sponge.parser.OperatorParser.operatorParser; -import static cloud.commandframework.sponge.parser.ProtoItemStackParser.protoItemStackParser; -import static cloud.commandframework.sponge.parser.ResourceKeyParser.resourceKeyParser; -import static cloud.commandframework.sponge.parser.SingleEntitySelectorParser.singleEntitySelectorParser; -import static cloud.commandframework.sponge.parser.SinglePlayerSelectorParser.singlePlayerSelectorParser; -import static cloud.commandframework.sponge.parser.UserParser.userParser; -import static cloud.commandframework.sponge.parser.Vector2iParser.vector2iParser; -import static cloud.commandframework.sponge.parser.Vector3iParser.vector3iParser; -import static cloud.commandframework.sponge.parser.WorldParser.worldParser; - /** * Command manager for Sponge API v8. *

@@ -140,19 +139,19 @@ private void checkLateCreation() { private void registerParsers() { this.parserRegistry() - .registerParser(componentParser()) - .registerParser(namedTextColorParser()) - .registerParser(operatorParser()) - .registerParser(worldParser()) - .registerParser(protoItemStackParser()) - .registerParser(itemStackPredicateParser()) - .registerParser(resourceKeyParser()) - .registerParser(gameProfileParser()) - .registerParser(gameProfileCollectionParser()) - .registerParser(blockInputParser()) - .registerParser(blockPredicateParser()) - .registerParser(userParser()) - .registerParser(dataContainerParser()) + .registerParser(ComponentParser.componentParser()) + .registerParser(NamedTextColorParser.namedTextColorParser()) + .registerParser(OperatorParser.operatorParser()) + .registerParser(WorldParser.worldParser()) + .registerParser(ProtoItemStackParser.protoItemStackParser()) + .registerParser(ItemStackPredicateParser.itemStackPredicateParser()) + .registerParser(ResourceKeyParser.resourceKeyParser()) + .registerParser(GameProfileParser.gameProfileParser()) + .registerParser(GameProfileCollectionParser.gameProfileCollectionParser()) + .registerParser(BlockInputParser.blockInputParser()) + .registerParser(BlockPredicateParser.blockPredicateParser()) + .registerParser(UserParser.userParser()) + .registerParser(DataContainerParser.dataContainerParser()) .registerAnnotationMapper( Center.class, (annotation, type) -> ParserParameters.single(SpongeParserParameters.CENTER_INTEGERS, true) @@ -165,12 +164,12 @@ private void registerParsers() { TypeToken.get(Vector3d.class), params -> new Vector3dParser<>(params.get(SpongeParserParameters.CENTER_INTEGERS, false)) ) - .registerParser(vector2iParser()) - .registerParser(vector3iParser()) - .registerParser(singlePlayerSelectorParser()) - .registerParser(multiplePlayerSelectorParser()) - .registerParser(singleEntitySelectorParser()) - .registerParser(multipleEntitySelectorParser()); + .registerParser(Vector2iParser.vector2iParser()) + .registerParser(Vector3iParser.vector3iParser()) + .registerParser(SinglePlayerSelectorParser.singlePlayerSelectorParser()) + .registerParser(MultiplePlayerSelectorParser.multiplePlayerSelectorParser()) + .registerParser(SingleEntitySelectorParser.singleEntitySelectorParser()) + .registerParser(MultipleEntitySelectorParser.multipleEntitySelectorParser()); this.registerRegistryParsers(); } diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCommandPreprocessor.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeCommandPreprocessor.java similarity index 98% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCommandPreprocessor.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeCommandPreprocessor.java index aa29da32..70149772 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCommandPreprocessor.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeCommandPreprocessor.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge; +package org.incendo.cloud.sponge; import org.checkerframework.checker.nullness.qual.NonNull; import org.incendo.cloud.brigadier.parser.WrappedBrigadierParser; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeDefaultCaptionsProvider.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeDefaultCaptionsProvider.java similarity index 99% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeDefaultCaptionsProvider.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeDefaultCaptionsProvider.java index 3ab84c83..cb6770be 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeDefaultCaptionsProvider.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeDefaultCaptionsProvider.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge; +package org.incendo.cloud.sponge; import org.checkerframework.checker.nullness.qual.NonNull; import org.incendo.cloud.caption.CaptionProvider; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeDefaultExceptionHandlers.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeDefaultExceptionHandlers.java similarity index 99% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeDefaultExceptionHandlers.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeDefaultExceptionHandlers.java index 13c8adea..9e49e5f5 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeDefaultExceptionHandlers.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeDefaultExceptionHandlers.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge; +package org.incendo.cloud.sponge; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.text.Component; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeParserMapper.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeParserMapper.java similarity index 99% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeParserMapper.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeParserMapper.java index 08be9d3f..d816d6f7 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeParserMapper.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeParserMapper.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge; +package org.incendo.cloud.sponge; import io.leangen.geantyref.GenericTypeReflector; import io.leangen.geantyref.TypeToken; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeParserParameters.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeParserParameters.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeParserParameters.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeParserParameters.java index 5919815f..fe14fff7 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeParserParameters.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeParserParameters.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge; +package org.incendo.cloud.sponge; import io.leangen.geantyref.TypeToken; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeRegistrationHandler.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeRegistrationHandler.java similarity index 99% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeRegistrationHandler.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeRegistrationHandler.java index f7bc5cec..9f4edd29 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeRegistrationHandler.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeRegistrationHandler.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge; +package org.incendo.cloud.sponge; import io.leangen.geantyref.TypeToken; import java.util.HashSet; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/annotation/package-info.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/annotation/package-info.java similarity index 95% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/annotation/package-info.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/annotation/package-info.java index 3019c7a4..2bd372f6 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/annotation/package-info.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/annotation/package-info.java @@ -24,4 +24,4 @@ /** * Annotations for cloud-sponge. */ -package cloud.commandframework.sponge.annotation; +package org.incendo.cloud.sponge.annotation; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/annotation/specifier/Center.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/annotation/specifier/Center.java similarity index 89% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/annotation/specifier/Center.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/annotation/specifier/Center.java index 7200b904..e347bf09 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/annotation/specifier/Center.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/annotation/specifier/Center.java @@ -21,14 +21,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.annotation.specifier; +package org.incendo.cloud.sponge.annotation.specifier; -import cloud.commandframework.sponge.parser.Vector2dParser; -import cloud.commandframework.sponge.parser.Vector3dParser; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.incendo.cloud.sponge.parser.Vector2dParser; +import org.incendo.cloud.sponge.parser.Vector3dParser; /** * Annotation used to enable coordinate centering for {@link Vector3dParser} and {@link Vector2dParser}. diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/annotation/specifier/package-info.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/annotation/specifier/package-info.java similarity index 95% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/annotation/specifier/package-info.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/annotation/specifier/package-info.java index 765e84c1..182e4f7f 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/annotation/specifier/package-info.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/annotation/specifier/package-info.java @@ -24,4 +24,4 @@ /** * Specifier annotations for cloud-sponge. */ -package cloud.commandframework.sponge.annotation.specifier; +package org.incendo.cloud.sponge.annotation.specifier; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/BlockInput.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/BlockInput.java similarity index 98% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/data/BlockInput.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/BlockInput.java index 10c0a51c..987dc8d2 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/BlockInput.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/BlockInput.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.data; +package org.incendo.cloud.sponge.data; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/BlockPredicate.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/BlockPredicate.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/data/BlockPredicate.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/BlockPredicate.java index 7478bfc4..b3dc3c79 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/BlockPredicate.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/BlockPredicate.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.data; +package org.incendo.cloud.sponge.data; import java.util.function.Predicate; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/GameProfileCollection.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/GameProfileCollection.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/data/GameProfileCollection.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/GameProfileCollection.java index 0cd9f30e..0602d135 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/GameProfileCollection.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/GameProfileCollection.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.data; +package org.incendo.cloud.sponge.data; import java.util.Collection; import org.spongepowered.api.profile.GameProfile; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/ItemStackPredicate.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/ItemStackPredicate.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/data/ItemStackPredicate.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/ItemStackPredicate.java index 00ae457c..a52a3fe6 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/ItemStackPredicate.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/ItemStackPredicate.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.data; +package org.incendo.cloud.sponge.data; import java.util.function.Predicate; import org.spongepowered.api.item.inventory.ItemStack; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/MultipleEntitySelector.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/MultipleEntitySelector.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/data/MultipleEntitySelector.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/MultipleEntitySelector.java index 28eceb85..72b420e9 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/MultipleEntitySelector.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/MultipleEntitySelector.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.data; +package org.incendo.cloud.sponge.data; import org.spongepowered.api.entity.Entity; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/MultiplePlayerSelector.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/MultiplePlayerSelector.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/data/MultiplePlayerSelector.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/MultiplePlayerSelector.java index 7d45b52b..707b5c25 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/MultiplePlayerSelector.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/MultiplePlayerSelector.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.data; +package org.incendo.cloud.sponge.data; import org.spongepowered.api.entity.living.player.server.ServerPlayer; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/ProtoItemStack.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/ProtoItemStack.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/data/ProtoItemStack.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/ProtoItemStack.java index 862e351b..e8c14be3 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/ProtoItemStack.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/ProtoItemStack.java @@ -21,11 +21,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.data; +package org.incendo.cloud.sponge.data; -import cloud.commandframework.sponge.exception.ComponentMessageRuntimeException; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; +import org.incendo.cloud.sponge.exception.ComponentMessageRuntimeException; import org.spongepowered.api.data.persistence.DataContainer; import org.spongepowered.api.item.ItemType; import org.spongepowered.api.item.inventory.ItemStack; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/SelectorWrapper.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/SelectorWrapper.java similarity index 98% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/data/SelectorWrapper.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/SelectorWrapper.java index 3e64d994..c1c08268 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/SelectorWrapper.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/SelectorWrapper.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.data; +package org.incendo.cloud.sponge.data; import java.util.Collection; import java.util.Collections; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/SingleEntitySelector.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/SingleEntitySelector.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/data/SingleEntitySelector.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/SingleEntitySelector.java index 2773863e..024eeeba 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/SingleEntitySelector.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/SingleEntitySelector.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.data; +package org.incendo.cloud.sponge.data; import org.spongepowered.api.entity.Entity; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/SinglePlayerSelector.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/SinglePlayerSelector.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/data/SinglePlayerSelector.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/SinglePlayerSelector.java index 46523c8d..e673366d 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/SinglePlayerSelector.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/SinglePlayerSelector.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.data; +package org.incendo.cloud.sponge.data; import org.spongepowered.api.entity.living.player.server.ServerPlayer; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/package-info.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/package-info.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/data/package-info.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/package-info.java index 2f04885c..4f838515 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/data/package-info.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/data/package-info.java @@ -24,4 +24,4 @@ /** * Data holders for cloud-sponge. */ -package cloud.commandframework.sponge.data; +package org.incendo.cloud.sponge.data; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/exception/ComponentMessageRuntimeException.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/exception/ComponentMessageRuntimeException.java similarity index 98% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/exception/ComponentMessageRuntimeException.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/exception/ComponentMessageRuntimeException.java index 4769bbc9..021bbf44 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/exception/ComponentMessageRuntimeException.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/exception/ComponentMessageRuntimeException.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.exception; +package org.incendo.cloud.sponge.exception; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.ComponentLike; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/exception/package-info.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/exception/package-info.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/exception/package-info.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/exception/package-info.java index 0ceaaf45..04622cea 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/exception/package-info.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/exception/package-info.java @@ -24,4 +24,4 @@ /** * Exception types for cloud-sponge. */ -package cloud.commandframework.sponge.exception; +package org.incendo.cloud.sponge.exception; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/package-info.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/package-info.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/package-info.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/package-info.java index 9a7e0cdc..c3db0785 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/package-info.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/package-info.java @@ -24,4 +24,4 @@ /** * Cloud for Sponge 8 */ -package cloud.commandframework.sponge; +package org.incendo.cloud.sponge; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/BlockInputParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/BlockInputParser.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/BlockInputParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/BlockInputParser.java index 12fbee62..fb4f2c51 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/BlockInputParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/BlockInputParser.java @@ -21,10 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; -import cloud.commandframework.sponge.data.BlockInput; import java.lang.reflect.Field; import java.util.Arrays; import java.util.concurrent.CompletableFuture; @@ -40,6 +38,8 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; +import org.incendo.cloud.sponge.data.BlockInput; import org.incendo.cloud.suggestion.Suggestion; import org.incendo.cloud.suggestion.SuggestionProvider; import org.spongepowered.api.block.BlockState; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/BlockPredicateParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/BlockPredicateParser.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/BlockPredicateParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/BlockPredicateParser.java index 83a4d1f4..75632fcd 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/BlockPredicateParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/BlockPredicateParser.java @@ -21,10 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; -import cloud.commandframework.sponge.data.BlockPredicate; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; import net.minecraft.commands.arguments.blocks.BlockPredicateArgument; @@ -38,6 +36,8 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; +import org.incendo.cloud.sponge.data.BlockPredicate; import org.incendo.cloud.suggestion.Suggestion; import org.incendo.cloud.suggestion.SuggestionProvider; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/ComponentParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ComponentParser.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/ComponentParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ComponentParser.java index 544bc91c..041c59b5 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/ComponentParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ComponentParser.java @@ -21,9 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; import java.util.concurrent.CompletableFuture; import net.kyori.adventure.text.Component; import org.checkerframework.checker.nullness.qual.NonNull; @@ -33,6 +32,7 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; import org.incendo.cloud.suggestion.Suggestion; import org.incendo.cloud.suggestion.SuggestionProvider; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/DataContainerParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/DataContainerParser.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/DataContainerParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/DataContainerParser.java index 5c6e82f9..6364fb93 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/DataContainerParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/DataContainerParser.java @@ -21,9 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; import java.util.concurrent.CompletableFuture; import net.minecraft.commands.arguments.CompoundTagArgument; import net.minecraft.nbt.CompoundTag; @@ -34,6 +33,7 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; import org.incendo.cloud.suggestion.Suggestion; import org.incendo.cloud.suggestion.SuggestionProvider; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/GameProfileCollectionParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/GameProfileCollectionParser.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/GameProfileCollectionParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/GameProfileCollectionParser.java index cc0f9b5e..6096e698 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/GameProfileCollectionParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/GameProfileCollectionParser.java @@ -21,11 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; -import cloud.commandframework.sponge.SpongeCommandContextKeys; -import cloud.commandframework.sponge.data.GameProfileCollection; import com.mojang.brigadier.exceptions.CommandSyntaxException; import java.util.AbstractCollection; import java.util.Collection; @@ -44,6 +41,9 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; +import org.incendo.cloud.sponge.SpongeCommandContextKeys; +import org.incendo.cloud.sponge.data.GameProfileCollection; import org.incendo.cloud.suggestion.Suggestion; import org.incendo.cloud.suggestion.SuggestionProvider; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/GameProfileParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/GameProfileParser.java similarity index 95% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/GameProfileParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/GameProfileParser.java index fdb89c7b..46b9696a 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/GameProfileParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/GameProfileParser.java @@ -21,11 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; -import cloud.commandframework.sponge.SpongeCaptionKeys; -import cloud.commandframework.sponge.SpongeCommandContextKeys; import com.mojang.brigadier.exceptions.CommandSyntaxException; import java.util.Collection; import java.util.concurrent.CompletableFuture; @@ -38,6 +35,9 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; +import org.incendo.cloud.sponge.SpongeCaptionKeys; +import org.incendo.cloud.sponge.SpongeCommandContextKeys; import org.incendo.cloud.suggestion.Suggestion; import org.incendo.cloud.suggestion.SuggestionProvider; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/ItemStackPredicateParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ItemStackPredicateParser.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/ItemStackPredicateParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ItemStackPredicateParser.java index bee02bfd..1b748ba3 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/ItemStackPredicateParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ItemStackPredicateParser.java @@ -21,10 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; -import cloud.commandframework.sponge.data.ItemStackPredicate; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; import net.minecraft.commands.arguments.item.ItemPredicateArgument; @@ -36,6 +34,8 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; +import org.incendo.cloud.sponge.data.ItemStackPredicate; import org.incendo.cloud.suggestion.Suggestion; import org.incendo.cloud.suggestion.SuggestionProvider; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/MultipleEntitySelectorParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/MultipleEntitySelectorParser.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/MultipleEntitySelectorParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/MultipleEntitySelectorParser.java index 78d9be5b..54fa1f7d 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/MultipleEntitySelectorParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/MultipleEntitySelectorParser.java @@ -21,11 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; -import cloud.commandframework.sponge.SpongeCommandContextKeys; -import cloud.commandframework.sponge.data.MultipleEntitySelector; import com.mojang.brigadier.exceptions.CommandSyntaxException; import java.util.Collection; import java.util.List; @@ -41,6 +38,9 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; +import org.incendo.cloud.sponge.SpongeCommandContextKeys; +import org.incendo.cloud.sponge.data.MultipleEntitySelector; import org.incendo.cloud.suggestion.Suggestion; import org.incendo.cloud.suggestion.SuggestionProvider; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/MultiplePlayerSelectorParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/MultiplePlayerSelectorParser.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/MultiplePlayerSelectorParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/MultiplePlayerSelectorParser.java index b918e7e1..d52fc7e6 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/MultiplePlayerSelectorParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/MultiplePlayerSelectorParser.java @@ -21,11 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; -import cloud.commandframework.sponge.SpongeCommandContextKeys; -import cloud.commandframework.sponge.data.MultiplePlayerSelector; import com.mojang.brigadier.exceptions.CommandSyntaxException; import java.util.Collection; import java.util.List; @@ -41,6 +38,9 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; +import org.incendo.cloud.sponge.SpongeCommandContextKeys; +import org.incendo.cloud.sponge.data.MultiplePlayerSelector; import org.incendo.cloud.suggestion.Suggestion; import org.incendo.cloud.suggestion.SuggestionProvider; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/NamedTextColorParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/NamedTextColorParser.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/NamedTextColorParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/NamedTextColorParser.java index d4dbbf4c..2d8646ee 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/NamedTextColorParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/NamedTextColorParser.java @@ -21,9 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; import java.util.ArrayList; import java.util.Locale; import net.kyori.adventure.text.format.NamedTextColor; @@ -34,6 +33,7 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; import org.incendo.cloud.suggestion.BlockingSuggestionProvider; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; import org.spongepowered.api.command.registrar.tree.CommandTreeNodeTypes; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/OperatorParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/OperatorParser.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/OperatorParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/OperatorParser.java index 19a6d6d5..dca603d3 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/OperatorParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/OperatorParser.java @@ -21,9 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import java.lang.reflect.Method; import java.util.Optional; @@ -34,6 +33,7 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; import org.incendo.cloud.suggestion.BlockingSuggestionProvider; import org.spongepowered.api.command.parameter.managed.operator.Operator; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/ProtoItemStackParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ProtoItemStackParser.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/ProtoItemStackParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ProtoItemStackParser.java index 751be192..358171a7 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/ProtoItemStackParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ProtoItemStackParser.java @@ -21,11 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; -import cloud.commandframework.sponge.data.ProtoItemStack; -import cloud.commandframework.sponge.exception.ComponentMessageRuntimeException; import com.mojang.brigadier.exceptions.CommandSyntaxException; import java.lang.reflect.Field; import java.util.Arrays; @@ -43,6 +40,9 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; +import org.incendo.cloud.sponge.data.ProtoItemStack; +import org.incendo.cloud.sponge.exception.ComponentMessageRuntimeException; import org.incendo.cloud.suggestion.Suggestion; import org.incendo.cloud.suggestion.SuggestionProvider; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/RegistryEntryParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/RegistryEntryParser.java similarity index 98% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/RegistryEntryParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/RegistryEntryParser.java index 95f45053..3eb80252 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/RegistryEntryParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/RegistryEntryParser.java @@ -21,10 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; -import cloud.commandframework.sponge.SpongeCaptionKeys; import io.leangen.geantyref.TypeToken; import java.util.List; import java.util.Optional; @@ -40,6 +38,8 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; +import org.incendo.cloud.sponge.SpongeCaptionKeys; import org.incendo.cloud.suggestion.BlockingSuggestionProvider; import org.spongepowered.api.ResourceKey; import org.spongepowered.api.command.registrar.tree.CommandCompletionProviders; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/ResourceKeyParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ResourceKeyParser.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/ResourceKeyParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ResourceKeyParser.java index 4cb32a76..7723d478 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/ResourceKeyParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ResourceKeyParser.java @@ -21,15 +21,15 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; import org.checkerframework.checker.nullness.qual.NonNull; import org.incendo.cloud.context.CommandContext; import org.incendo.cloud.context.CommandInput; import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; import org.spongepowered.api.ResourceKey; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; import org.spongepowered.api.command.registrar.tree.CommandTreeNodeTypes; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/ResourceKeyUtil.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ResourceKeyUtil.java similarity index 98% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/ResourceKeyUtil.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ResourceKeyUtil.java index 1c2e9ab0..bdff1a9e 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/ResourceKeyUtil.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ResourceKeyUtil.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import java.lang.reflect.Field; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/SingleEntitySelectorParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/SingleEntitySelectorParser.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/SingleEntitySelectorParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/SingleEntitySelectorParser.java index 5d3258db..359d1993 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/SingleEntitySelectorParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/SingleEntitySelectorParser.java @@ -21,11 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; -import cloud.commandframework.sponge.SpongeCommandContextKeys; -import cloud.commandframework.sponge.data.SingleEntitySelector; import com.mojang.brigadier.exceptions.CommandSyntaxException; import java.util.concurrent.CompletableFuture; import net.minecraft.commands.CommandSourceStack; @@ -38,6 +35,9 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; +import org.incendo.cloud.sponge.SpongeCommandContextKeys; +import org.incendo.cloud.sponge.data.SingleEntitySelector; import org.incendo.cloud.suggestion.Suggestion; import org.incendo.cloud.suggestion.SuggestionProvider; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/SinglePlayerSelectorParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/SinglePlayerSelectorParser.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/SinglePlayerSelectorParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/SinglePlayerSelectorParser.java index c9e18602..ab9be032 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/SinglePlayerSelectorParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/SinglePlayerSelectorParser.java @@ -21,11 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; -import cloud.commandframework.sponge.SpongeCommandContextKeys; -import cloud.commandframework.sponge.data.SinglePlayerSelector; import com.mojang.brigadier.exceptions.CommandSyntaxException; import java.util.concurrent.CompletableFuture; import net.minecraft.commands.CommandSourceStack; @@ -38,6 +35,9 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; +import org.incendo.cloud.sponge.SpongeCommandContextKeys; +import org.incendo.cloud.sponge.data.SinglePlayerSelector; import org.incendo.cloud.suggestion.Suggestion; import org.incendo.cloud.suggestion.SuggestionProvider; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/UserParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/UserParser.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/UserParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/UserParser.java index d11c1bbb..dd04b2f3 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/UserParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/UserParser.java @@ -21,11 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; -import cloud.commandframework.sponge.SpongeCaptionKeys; -import cloud.commandframework.sponge.SpongeCommandContextKeys; import com.mojang.brigadier.exceptions.CommandSyntaxException; import java.util.ArrayList; import java.util.List; @@ -47,6 +44,9 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; +import org.incendo.cloud.sponge.SpongeCaptionKeys; +import org.incendo.cloud.sponge.SpongeCommandContextKeys; import org.incendo.cloud.suggestion.Suggestion; import org.incendo.cloud.suggestion.SuggestionProvider; import org.spongepowered.api.Sponge; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/Vector2dParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/Vector2dParser.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/Vector2dParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/Vector2dParser.java index a0bc9ba6..7710c27b 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/Vector2dParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/Vector2dParser.java @@ -21,9 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.SpongeCommandContextKeys; import java.util.concurrent.CompletableFuture; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.arguments.coordinates.Coordinates; @@ -36,6 +35,7 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.SpongeCommandContextKeys; import org.incendo.cloud.suggestion.Suggestion; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; import org.spongepowered.api.command.registrar.tree.CommandTreeNodeTypes; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/Vector2iParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/Vector2iParser.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/Vector2iParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/Vector2iParser.java index 0cd422b1..368ea641 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/Vector2iParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/Vector2iParser.java @@ -21,10 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; -import cloud.commandframework.sponge.SpongeCommandContextKeys; import java.util.concurrent.CompletableFuture; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.arguments.coordinates.ColumnPosArgument; @@ -37,6 +35,8 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; +import org.incendo.cloud.sponge.SpongeCommandContextKeys; import org.incendo.cloud.suggestion.Suggestion; import org.incendo.cloud.suggestion.SuggestionProvider; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/Vector3dParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/Vector3dParser.java similarity index 97% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/Vector3dParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/Vector3dParser.java index 1bacd06c..79dee684 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/Vector3dParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/Vector3dParser.java @@ -21,9 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.SpongeCommandContextKeys; import java.util.concurrent.CompletableFuture; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.arguments.coordinates.Coordinates; @@ -35,6 +34,7 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.SpongeCommandContextKeys; import org.incendo.cloud.suggestion.Suggestion; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; import org.spongepowered.api.command.registrar.tree.CommandTreeNodeTypes; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/Vector3iParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/Vector3iParser.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/Vector3iParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/Vector3iParser.java index 3478306a..ac9faf98 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/Vector3iParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/Vector3iParser.java @@ -21,10 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; -import cloud.commandframework.sponge.SpongeCommandContextKeys; import java.util.concurrent.CompletableFuture; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.arguments.coordinates.BlockPosArgument; @@ -36,6 +34,8 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; +import org.incendo.cloud.sponge.SpongeCommandContextKeys; import org.incendo.cloud.suggestion.Suggestion; import org.incendo.cloud.suggestion.SuggestionProvider; import org.spongepowered.api.command.registrar.tree.CommandTreeNode; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/VectorParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/VectorParser.java similarity index 95% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/VectorParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/VectorParser.java index 802a4c73..f66847e5 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/VectorParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/VectorParser.java @@ -21,10 +21,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; import org.incendo.cloud.parser.ArgumentParser; +import org.incendo.cloud.sponge.NodeSource; import org.incendo.cloud.suggestion.SuggestionProvider; /** diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/WorldParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/WorldParser.java similarity index 98% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/WorldParser.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/WorldParser.java index a7cc6212..f6fc17e6 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/WorldParser.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/WorldParser.java @@ -21,9 +21,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; -import cloud.commandframework.sponge.NodeSource; import com.google.common.base.Suppliers; import com.mojang.brigadier.exceptions.DynamicCommandExceptionType; import java.lang.reflect.Field; @@ -40,6 +39,7 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.sponge.NodeSource; import org.incendo.cloud.suggestion.BlockingSuggestionProvider; import org.spongepowered.api.ResourceKey; import org.spongepowered.api.Sponge; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/package-info.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/package-info.java similarity index 51% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/package-info.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/package-info.java index 637c61f3..e6629410 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/parser/package-info.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/package-info.java @@ -1,4 +1,4 @@ /** * Parsers for the Sponge 8 environment. */ -package cloud.commandframework.sponge.parser; +package org.incendo.cloud.sponge.parser; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/suggestion/SpongeSuggestion.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/suggestion/SpongeSuggestion.java similarity index 98% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/suggestion/SpongeSuggestion.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/suggestion/SpongeSuggestion.java index c47bf0f9..dccd57f6 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/suggestion/SpongeSuggestion.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/suggestion/SpongeSuggestion.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.suggestion; +package org.incendo.cloud.sponge.suggestion; import java.util.Optional; import net.kyori.adventure.text.Component; diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/suggestion/SpongeSuggestionImpl.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/suggestion/SpongeSuggestionImpl.java similarity index 96% rename from cloud-sponge/src/main/java/cloud/commandframework/sponge/suggestion/SpongeSuggestionImpl.java rename to cloud-sponge/src/main/java/org/incendo/cloud/sponge/suggestion/SpongeSuggestionImpl.java index a4b18be8..4689d2aa 100644 --- a/cloud-sponge/src/main/java/cloud/commandframework/sponge/suggestion/SpongeSuggestionImpl.java +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/suggestion/SpongeSuggestionImpl.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.sponge.suggestion; +package org.incendo.cloud.sponge.suggestion; import net.kyori.adventure.text.Component; diff --git a/cloud-sponge/src/main/java/org/incendo/cloud/sponge/suggestion/package-info.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/suggestion/package-info.java new file mode 100644 index 00000000..b29fcb74 --- /dev/null +++ b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/suggestion/package-info.java @@ -0,0 +1,4 @@ +/** + * Sponge suggestion related classes. + */ +package org.incendo.cloud.sponge.suggestion; diff --git a/examples/example-sponge/src/main/java/cloud/commandframework/examples/sponge/CloudExamplePlugin.java b/examples/example-sponge/src/main/java/org/incendo/cloud/examples/sponge/CloudExamplePlugin.java similarity index 92% rename from examples/example-sponge/src/main/java/cloud/commandframework/examples/sponge/CloudExamplePlugin.java rename to examples/example-sponge/src/main/java/org/incendo/cloud/examples/sponge/CloudExamplePlugin.java index bb2f2dbf..0b3c555c 100644 --- a/examples/example-sponge/src/main/java/cloud/commandframework/examples/sponge/CloudExamplePlugin.java +++ b/examples/example-sponge/src/main/java/org/incendo/cloud/examples/sponge/CloudExamplePlugin.java @@ -23,14 +23,6 @@ // package cloud.commandframework.examples.sponge; -import cloud.commandframework.sponge.CloudInjectionModule; -import cloud.commandframework.sponge.SpongeCommandManager; -import cloud.commandframework.sponge.data.BlockInput; -import cloud.commandframework.sponge.data.BlockPredicate; -import cloud.commandframework.sponge.data.ItemStackPredicate; -import cloud.commandframework.sponge.data.MultipleEntitySelector; -import cloud.commandframework.sponge.data.ProtoItemStack; -import cloud.commandframework.sponge.data.SinglePlayerSelector; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; @@ -50,6 +42,14 @@ import org.incendo.cloud.minecraft.extras.MinecraftExceptionHandler; import org.incendo.cloud.parser.standard.StringParser; import org.incendo.cloud.permission.PredicatePermission; +import org.incendo.cloud.sponge.CloudInjectionModule; +import org.incendo.cloud.sponge.SpongeCommandManager; +import org.incendo.cloud.sponge.data.BlockInput; +import org.incendo.cloud.sponge.data.BlockPredicate; +import org.incendo.cloud.sponge.data.ItemStackPredicate; +import org.incendo.cloud.sponge.data.MultipleEntitySelector; +import org.incendo.cloud.sponge.data.ProtoItemStack; +import org.incendo.cloud.sponge.data.SinglePlayerSelector; import org.incendo.cloud.type.tuple.Pair; import org.spongepowered.api.ResourceKey; import org.spongepowered.api.Sponge; @@ -84,20 +84,6 @@ import org.spongepowered.math.vector.Vector3i; import org.spongepowered.plugin.builtin.jvm.Plugin; -import static cloud.commandframework.sponge.parser.BlockInputParser.blockInputParser; -import static cloud.commandframework.sponge.parser.BlockPredicateParser.blockPredicateParser; -import static cloud.commandframework.sponge.parser.DataContainerParser.dataContainerParser; -import static cloud.commandframework.sponge.parser.ItemStackPredicateParser.itemStackPredicateParser; -import static cloud.commandframework.sponge.parser.MultipleEntitySelectorParser.multipleEntitySelectorParser; -import static cloud.commandframework.sponge.parser.NamedTextColorParser.namedTextColorParser; -import static cloud.commandframework.sponge.parser.OperatorParser.operatorParser; -import static cloud.commandframework.sponge.parser.ProtoItemStackParser.protoItemStackParser; -import static cloud.commandframework.sponge.parser.RegistryEntryParser.registryEntryParser; -import static cloud.commandframework.sponge.parser.SinglePlayerSelectorParser.singlePlayerSelectorParser; -import static cloud.commandframework.sponge.parser.UserParser.userParser; -import static cloud.commandframework.sponge.parser.Vector3dParser.vector3dParser; -import static cloud.commandframework.sponge.parser.Vector3iParser.vector3iParser; -import static cloud.commandframework.sponge.parser.WorldParser.worldParser; import static net.kyori.adventure.text.Component.newline; import static net.kyori.adventure.text.Component.space; import static net.kyori.adventure.text.Component.text; @@ -112,6 +98,20 @@ import static org.incendo.cloud.parser.standard.IntegerParser.integerParser; import static org.incendo.cloud.parser.standard.StringParser.greedyStringParser; import static org.incendo.cloud.parser.standard.StringParser.stringParser; +import static org.incendo.cloud.sponge.parser.BlockInputParser.blockInputParser; +import static org.incendo.cloud.sponge.parser.BlockPredicateParser.blockPredicateParser; +import static org.incendo.cloud.sponge.parser.DataContainerParser.dataContainerParser; +import static org.incendo.cloud.sponge.parser.ItemStackPredicateParser.itemStackPredicateParser; +import static org.incendo.cloud.sponge.parser.MultipleEntitySelectorParser.multipleEntitySelectorParser; +import static org.incendo.cloud.sponge.parser.NamedTextColorParser.namedTextColorParser; +import static org.incendo.cloud.sponge.parser.OperatorParser.operatorParser; +import static org.incendo.cloud.sponge.parser.ProtoItemStackParser.protoItemStackParser; +import static org.incendo.cloud.sponge.parser.RegistryEntryParser.registryEntryParser; +import static org.incendo.cloud.sponge.parser.SinglePlayerSelectorParser.singlePlayerSelectorParser; +import static org.incendo.cloud.sponge.parser.UserParser.userParser; +import static org.incendo.cloud.sponge.parser.Vector3dParser.vector3dParser; +import static org.incendo.cloud.sponge.parser.Vector3iParser.vector3iParser; +import static org.incendo.cloud.sponge.parser.WorldParser.worldParser; @Plugin("cloud-example-sponge") public final class CloudExamplePlugin { diff --git a/examples/example-sponge/src/main/java/cloud/commandframework/examples/sponge/package-info.java b/examples/example-sponge/src/main/java/org/incendo/cloud/examples/sponge/package-info.java similarity index 96% rename from examples/example-sponge/src/main/java/cloud/commandframework/examples/sponge/package-info.java rename to examples/example-sponge/src/main/java/org/incendo/cloud/examples/sponge/package-info.java index f8e78d06..e93c92bb 100644 --- a/examples/example-sponge/src/main/java/cloud/commandframework/examples/sponge/package-info.java +++ b/examples/example-sponge/src/main/java/org/incendo/cloud/examples/sponge/package-info.java @@ -24,4 +24,4 @@ /** * Cloud example for Sponge API v8 */ -package cloud.commandframework.examples.sponge; +package org.incendo.cloud.examples.sponge;