Move to org.incendo (#10)

* Update

* Move to org.incendo

cloud-fabric/build.gradle.kts

@@ -17,13 +17,13 @@ configurations {
 
         exclude("org.checkerframework")
         exclude("org.apiguardian")
-        exclude("cloud.commandframework", "cloud-minecraft-modded-common-fabric-repack")
+        exclude("org.incendo", "cloud-minecraft-modded-common-fabric-repack")
     }
     runtimeClasspath {
-        exclude("cloud.commandframework", "cloud-minecraft-modded-common-fabric-repack")
+        exclude("org.incendo", "cloud-minecraft-modded-common-fabric-repack")
     }
     compileClasspath {
-        exclude("cloud.commandframework", "cloud-minecraft-modded-common-fabric-repack")
+        exclude("org.incendo", "cloud-minecraft-modded-common-fabric-repack")
     }
 }
 

cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricClientCommandManager.java → cloud-fabric/src/main/java/org/incendo/cloud/fabric/FabricClientCommandManager.java

@@ -21,17 +21,17 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.fabric;
+package org.incendo.cloud.fabric;
 
-import cloud.commandframework.SenderMapper;
-import cloud.commandframework.execution.ExecutionCoordinator;
-import cloud.commandframework.minecraft.modded.internal.ModdedExceptionHandler;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientSuggestionProvider;
 import org.apiguardian.api.API;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.SenderMapper;
+import org.incendo.cloud.execution.ExecutionCoordinator;
+import org.incendo.cloud.minecraft.modded.internal.ModdedExceptionHandler;
 
 /**
  * A command manager for registering client-side commands.

cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandManager.java → cloud-fabric/src/main/java/org/incendo/cloud/fabric/FabricCommandManager.java

@@ -21,25 +21,24 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.fabric;
+package org.incendo.cloud.fabric;
 
-import cloud.commandframework.CommandManager;
-import cloud.commandframework.SenderMapper;
-import cloud.commandframework.SenderMapperHolder;
-import cloud.commandframework.arguments.suggestion.SuggestionFactory;
-import cloud.commandframework.brigadier.BrigadierManagerHolder;
-import cloud.commandframework.brigadier.CloudBrigadierManager;
-import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
-import cloud.commandframework.brigadier.suggestion.TooltipSuggestion;
-import cloud.commandframework.context.CommandContext;
-import cloud.commandframework.execution.ExecutionCoordinator;
-import cloud.commandframework.minecraft.modded.ModdedDefaultCaptionsProvider;
-import cloud.commandframework.minecraft.modded.internal.ModdedParserMappings;
-import cloud.commandframework.minecraft.modded.internal.ModdedPreprocessor;
 import java.util.function.Supplier;
 import net.minecraft.commands.SharedSuggestionProvider;
 import org.apiguardian.api.API;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.CommandManager;
+import org.incendo.cloud.SenderMapper;
+import org.incendo.cloud.SenderMapperHolder;
+import org.incendo.cloud.brigadier.BrigadierManagerHolder;
+import org.incendo.cloud.brigadier.CloudBrigadierManager;
+import org.incendo.cloud.brigadier.suggestion.TooltipSuggestion;
+import org.incendo.cloud.context.CommandContext;
+import org.incendo.cloud.execution.ExecutionCoordinator;
+import org.incendo.cloud.minecraft.modded.ModdedDefaultCaptionsProvider;
+import org.incendo.cloud.minecraft.modded.internal.ModdedParserMappings;
+import org.incendo.cloud.minecraft.modded.internal.ModdedPreprocessor;
+import org.incendo.cloud.suggestion.SuggestionFactory;
 
 /**
  * A command manager for either the server or client on Fabric.
@@ -48,7 +47,7 @@
  *
  * <p>Where possible, Vanilla argument types are made available in a cloud-friendly format. In some cases, these argument
  * types may only be available for server commands. Mod-provided argument types can be exposed to Cloud as well, by using
- * {@link WrappedBrigadierParser}.</p>
+ * {@link org.incendo.cloud.brigadier.parser.WrappedBrigadierParser}.</p>
  *
  * @param <C> the manager's sender type
  * @param <S> the platform sender type

cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandRegistrationHandler.java → cloud-fabric/src/main/java/org/incendo/cloud/fabric/FabricCommandRegistrationHandler.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.fabric;
+package org.incendo.cloud.fabric;
 
-import cloud.commandframework.Command;
-import cloud.commandframework.CommandComponent;
-import cloud.commandframework.brigadier.CloudBrigadierCommand;
-import cloud.commandframework.internal.CommandRegistrationHandler;
-import cloud.commandframework.minecraft.modded.internal.ContextualArgumentTypeProvider;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.tree.CommandNode;
 import com.mojang.brigadier.tree.RootCommandNode;
@@ -46,8 +41,13 @@
 import net.minecraft.commands.SharedSuggestionProvider;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.Command;
+import org.incendo.cloud.brigadier.CloudBrigadierCommand;
+import org.incendo.cloud.component.CommandComponent;
+import org.incendo.cloud.internal.CommandRegistrationHandler;
+import org.incendo.cloud.minecraft.modded.internal.ContextualArgumentTypeProvider;
 
-import static cloud.commandframework.brigadier.util.BrigadierUtil.buildRedirect;
+import static org.incendo.cloud.brigadier.util.BrigadierUtil.buildRedirect;
 
 /**
  * A registration handler for Fabric API.

cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricServerCommandManager.java → cloud-fabric/src/main/java/org/incendo/cloud/fabric/FabricServerCommandManager.java

@@ -21,14 +21,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.fabric;
+package org.incendo.cloud.fabric;
 
-import cloud.commandframework.SenderMapper;
-import cloud.commandframework.execution.ExecutionCoordinator;
-import cloud.commandframework.fabric.internal.LateRegistrationCatcher;
-import cloud.commandframework.keys.CloudKey;
-import cloud.commandframework.minecraft.modded.internal.ModdedExceptionHandler;
-import cloud.commandframework.minecraft.modded.internal.ModdedParserMappings;
 import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.minecraft.commands.CommandSource;
@@ -39,6 +33,12 @@
 import net.minecraft.world.phys.Vec3;
 import org.apiguardian.api.API;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.SenderMapper;
+import org.incendo.cloud.execution.ExecutionCoordinator;
+import org.incendo.cloud.fabric.internal.LateRegistrationCatcher;
+import org.incendo.cloud.key.CloudKey;
+import org.incendo.cloud.minecraft.modded.internal.ModdedExceptionHandler;
+import org.incendo.cloud.minecraft.modded.internal.ModdedParserMappings;
 
 /**
  * A command manager for registering server-side commands.

cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/LateRegistrationCatcher.java → cloud-fabric/src/main/java/org/incendo/cloud/fabric/internal/LateRegistrationCatcher.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.fabric.internal;
+package org.incendo.cloud.fabric.internal;
 
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;

cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/package-info.java → cloud-fabric/src/main/java/org/incendo/cloud/fabric/internal/package-info.java

@@ -1,4 +1,4 @@
 /**
  * Implementation-internal content for the Fabric implementation of Cloud.
  */
-package cloud.commandframework.fabric.internal;
+package org.incendo.cloud.fabric.internal;

cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/EntitySelectorMixin.java → cloud-fabric/src/main/java/org/incendo/cloud/fabric/mixin/EntitySelectorMixin.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.fabric.mixin;
+package org.incendo.cloud.fabric.mixin;
 
-import cloud.commandframework.minecraft.modded.internal.EntitySelectorAccess;
 import net.minecraft.commands.arguments.selector.EntitySelector;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.minecraft.modded.internal.EntitySelectorAccess;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
 import org.spongepowered.asm.mixin.Mixin;

cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/EntitySelectorParserMixin.java → cloud-fabric/src/main/java/org/incendo/cloud/fabric/mixin/EntitySelectorParserMixin.java

@@ -21,13 +21,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.fabric.mixin;
+package org.incendo.cloud.fabric.mixin;
 
-import cloud.commandframework.minecraft.modded.internal.EntitySelectorAccess;
 import com.mojang.brigadier.StringReader;
 import net.minecraft.commands.arguments.selector.EntitySelector;
 import net.minecraft.commands.arguments.selector.EntitySelectorParser;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.minecraft.modded.internal.EntitySelectorAccess;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/MessageArgumentMessageAccess.java → cloud-fabric/src/main/java/org/incendo/cloud/fabric/mixin/MessageArgumentMessageAccess.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.fabric.mixin;
+package org.incendo.cloud.fabric.mixin;
 
 import net.minecraft.commands.arguments.MessageArgument;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(MessageArgument.Message.class)
-public interface MessageArgumentMessageAccess extends cloud.commandframework.minecraft.modded.internal.MessageArgumentMessageAccess {
+public interface MessageArgumentMessageAccess extends org.incendo.cloud.minecraft.modded.internal.MessageArgumentMessageAccess {
 
     @Accessor("parts")
     @Override

cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/MessageArgumentPartAccess.java → cloud-fabric/src/main/java/org/incendo/cloud/fabric/mixin/MessageArgumentPartAccess.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.fabric.mixin;
+package org.incendo.cloud.fabric.mixin;
 
 import net.minecraft.commands.arguments.MessageArgument;
 import net.minecraft.commands.arguments.selector.EntitySelector;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(MessageArgument.Part.class)
-public interface MessageArgumentPartAccess extends cloud.commandframework.minecraft.modded.internal.MessageArgumentPartAccess {
+public interface MessageArgumentPartAccess extends org.incendo.cloud.minecraft.modded.internal.MessageArgumentPartAccess {
 
     @Accessor("selector")
     @Override

cloud-fabric/src/main/java/cloud/commandframework/fabric/package-info.java → cloud-fabric/src/main/java/org/incendo/cloud/fabric/package-info.java

@@ -3,4 +3,4 @@
  *
  * @since 1.5.0
  */
-package cloud.commandframework.fabric;
+package org.incendo.cloud.fabric;

cloud-fabric/src/main/resources/cloud.mixins.json

@@ -1,5 +1,5 @@
 {
-  "package": "cloud.commandframework.fabric.mixin",
+  "package": "org.incendo.cloud.fabric.mixin",
   "compatibilityLevel": "JAVA_8",
   "required": true,
   "mixins": [

cloud-fabric/src/main/resources/fabric.mod.json

@@ -15,7 +15,7 @@
 
   "entrypoints": {
     "main": [
-      "cloud.commandframework.fabric.internal.LateRegistrationCatcher"
+      "org.incendo.cloud.fabric.internal.LateRegistrationCatcher"
     ]
   },
 

cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/FabricClientExample.java → cloud-fabric/src/testmod/java/org/incendo/cloud/fabric/testmod/FabricClientExample.java

@@ -21,16 +21,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.fabric.testmod;
+package org.incendo.cloud.fabric.testmod;
 
-import cloud.commandframework.Command;
-import cloud.commandframework.CommandDescription;
-import cloud.commandframework.arguments.flags.CommandFlag;
-import cloud.commandframework.execution.ExecutionCoordinator;
-import cloud.commandframework.fabric.FabricClientCommandManager;
-import cloud.commandframework.fabric.testmod.mixin.PauseScreenAccess;
-import cloud.commandframework.minecraft.modded.ModdedPredicatePermissions;
-import cloud.commandframework.minecraft.modded.parser.VanillaArgumentParsers;
 import com.google.gson.JsonObject;
 import com.google.gson.internal.Streams;
 import com.google.gson.stream.JsonWriter;
@@ -54,9 +46,17 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.ComponentUtils;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.Command;
+import org.incendo.cloud.description.CommandDescription;
+import org.incendo.cloud.execution.ExecutionCoordinator;
+import org.incendo.cloud.fabric.FabricClientCommandManager;
+import org.incendo.cloud.fabric.testmod.mixin.PauseScreenAccess;
+import org.incendo.cloud.minecraft.modded.ModdedPredicatePermissions;
+import org.incendo.cloud.minecraft.modded.parser.VanillaArgumentParsers;
+import org.incendo.cloud.parser.flag.CommandFlag;
 
-import static cloud.commandframework.arguments.standard.StringParser.greedyStringParser;
-import static cloud.commandframework.arguments.standard.StringParser.stringParser;
+import static org.incendo.cloud.parser.standard.StringParser.greedyStringParser;
+import static org.incendo.cloud.parser.standard.StringParser.stringParser;
 
 public final class FabricClientExample implements ClientModInitializer {
 

cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/FabricExample.java → cloud-fabric/src/testmod/java/org/incendo/cloud/fabric/testmod/FabricExample.java

@@ -21,25 +21,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.fabric.testmod;
+package org.incendo.cloud.fabric.testmod;
 
-import cloud.commandframework.Command;
-import cloud.commandframework.TypedCommandComponent;
-import cloud.commandframework.arguments.DefaultValue;
-import cloud.commandframework.arguments.parser.ArgumentParseResult;
-import cloud.commandframework.arguments.parser.ParserDescriptor;
-import cloud.commandframework.arguments.suggestion.Suggestion;
-import cloud.commandframework.arguments.suggestion.SuggestionProvider;
-import cloud.commandframework.execution.ExecutionCoordinator;
-import cloud.commandframework.fabric.FabricServerCommandManager;
-import cloud.commandframework.fabric.testmod.mixin.GiveCommandAccess;
-import cloud.commandframework.keys.CloudKey;
-import cloud.commandframework.minecraft.modded.data.Coordinates;
-import cloud.commandframework.minecraft.modded.data.Coordinates.ColumnCoordinates;
-import cloud.commandframework.minecraft.modded.data.MultipleEntitySelector;
-import cloud.commandframework.minecraft.modded.data.MultiplePlayerSelector;
-import cloud.commandframework.minecraft.modded.parser.NamedColorParser;
-import cloud.commandframework.minecraft.modded.parser.RegistryEntryParser;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import java.util.Collection;
 import java.util.Comparator;
@@ -64,13 +47,30 @@
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.phys.Vec3;
+import org.incendo.cloud.Command;
+import org.incendo.cloud.component.DefaultValue;
+import org.incendo.cloud.component.TypedCommandComponent;
+import org.incendo.cloud.execution.ExecutionCoordinator;
+import org.incendo.cloud.fabric.FabricServerCommandManager;
+import org.incendo.cloud.fabric.testmod.mixin.GiveCommandAccess;
+import org.incendo.cloud.key.CloudKey;
+import org.incendo.cloud.minecraft.modded.data.Coordinates;
+import org.incendo.cloud.minecraft.modded.data.Coordinates.ColumnCoordinates;
+import org.incendo.cloud.minecraft.modded.data.MultipleEntitySelector;
+import org.incendo.cloud.minecraft.modded.data.MultiplePlayerSelector;
+import org.incendo.cloud.minecraft.modded.parser.NamedColorParser;
+import org.incendo.cloud.minecraft.modded.parser.RegistryEntryParser;
+import org.incendo.cloud.parser.ArgumentParseResult;
+import org.incendo.cloud.parser.ParserDescriptor;
+import org.incendo.cloud.suggestion.Suggestion;
+import org.incendo.cloud.suggestion.SuggestionProvider;
 
-import static cloud.commandframework.arguments.standard.IntegerParser.integerParser;
-import static cloud.commandframework.arguments.standard.StringParser.stringParser;
-import static cloud.commandframework.minecraft.modded.parser.VanillaArgumentParsers.columnPosParser;
-import static cloud.commandframework.minecraft.modded.parser.VanillaArgumentParsers.itemInput;
-import static cloud.commandframework.minecraft.modded.parser.VanillaArgumentParsers.multiplePlayerSelectorParser;
-import static cloud.commandframework.minecraft.modded.parser.VanillaArgumentParsers.vec3Parser;
+import static org.incendo.cloud.minecraft.modded.parser.VanillaArgumentParsers.columnPosParser;
+import static org.incendo.cloud.minecraft.modded.parser.VanillaArgumentParsers.itemInput;
+import static org.incendo.cloud.minecraft.modded.parser.VanillaArgumentParsers.multiplePlayerSelectorParser;
+import static org.incendo.cloud.minecraft.modded.parser.VanillaArgumentParsers.vec3Parser;
+import static org.incendo.cloud.parser.standard.IntegerParser.integerParser;
+import static org.incendo.cloud.parser.standard.StringParser.stringParser;
 
 public final class FabricExample implements ModInitializer {
 

cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/mixin/GiveCommandAccess.java → cloud-fabric/src/testmod/java/org/incendo/cloud/fabric/testmod/mixin/GiveCommandAccess.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.fabric.testmod.mixin;
+package org.incendo.cloud.fabric.testmod.mixin;
 
 import com.mojang.brigadier.Command;
 import java.util.Collection;

cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/mixin/PauseScreenAccess.java → cloud-fabric/src/testmod/java/org/incendo/cloud/fabric/testmod/mixin/PauseScreenAccess.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.fabric.testmod.mixin;
+package org.incendo.cloud.fabric.testmod.mixin;
 
 import net.minecraft.client.gui.screens.PauseScreen;
 import org.spongepowered.asm.mixin.Mixin;

cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/package-info.java → cloud-fabric/src/testmod/java/org/incendo/cloud/fabric/testmod/package-info.java

@@ -1,4 +1,4 @@
 /**
  * A test mod for the fabric implementation of Cloud.
  */
-package cloud.commandframework.fabric.testmod;
+package org.incendo.cloud.fabric.testmod;

cloud-fabric/src/testmod/resources/cloud-testmod.mixins.json

@@ -1,5 +1,5 @@
 {
-  "package": "cloud.commandframework.fabric.testmod.mixin",
+  "package": "org.incendo.cloud.fabric.testmod.mixin",
   "compatibilityLevel": "JAVA_8",
   "required": true,
   "mixins": [

cloud-fabric/src/testmod/resources/fabric.mod.json

@@ -15,10 +15,10 @@
 
   "entrypoints": {
     "main": [
-      "cloud.commandframework.fabric.testmod.FabricExample"
+      "org.incendo.cloud.fabric.testmod.FabricExample"
     ],
     "client": [
-      "cloud.commandframework.fabric.testmod.FabricClientExample"
+      "org.incendo.cloud.fabric.testmod.FabricClientExample"
     ]
   },