Skip to content

Commit 7adc578

Browse files
jpenillajpenilla
committed
Update
1 parent 6a01b3c commit 7adc578

38 files changed

+256
-256
lines changed

‎cloud-sponge/src/main/java/cloud/commandframework/sponge/CloudInjectionModule.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
//
2424
package cloud.commandframework.sponge;
2525

26-
import cloud.commandframework.SenderMapper;
27-
import cloud.commandframework.execution.ExecutionCoordinator;
2826
import com.google.inject.AbstractModule;
2927
import com.google.inject.Key;
3028
import com.google.inject.util.Types;
3129
import java.lang.reflect.Type;
3230
import org.checkerframework.checker.nullness.qual.NonNull;
31+
import org.incendo.cloud.SenderMapper;
32+
import org.incendo.cloud.execution.ExecutionCoordinator;
3333
import org.spongepowered.api.command.CommandCause;
3434

3535
/**

‎cloud-sponge/src/main/java/cloud/commandframework/sponge/CloudSpongeCommand.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323
//
2424
package cloud.commandframework.sponge;
2525

26-
import cloud.commandframework.CommandComponent;
27-
import cloud.commandframework.arguments.LiteralParser;
28-
import cloud.commandframework.arguments.aggregate.AggregateParser;
29-
import cloud.commandframework.internal.CommandNode;
30-
import cloud.commandframework.permission.Permission;
31-
import cloud.commandframework.types.tuples.Pair;
3226
import java.util.ArrayDeque;
3327
import java.util.Collections;
3428
import java.util.List;
@@ -37,6 +31,12 @@
3731
import java.util.stream.Collectors;
3832
import net.kyori.adventure.text.Component;
3933
import org.checkerframework.checker.nullness.qual.NonNull;
34+
import org.incendo.cloud.component.CommandComponent;
35+
import org.incendo.cloud.internal.CommandNode;
36+
import org.incendo.cloud.parser.aggregate.AggregateParser;
37+
import org.incendo.cloud.parser.standard.LiteralParser;
38+
import org.incendo.cloud.permission.Permission;
39+
import org.incendo.cloud.type.tuple.Pair;
4040
import org.spongepowered.api.command.Command;
4141
import org.spongepowered.api.command.CommandCause;
4242
import org.spongepowered.api.command.CommandCompletion;

‎cloud-sponge/src/main/java/cloud/commandframework/sponge/NodeSource.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@
2323
//
2424
package cloud.commandframework.sponge;
2525

26-
import cloud.commandframework.arguments.parser.ArgumentParser;
2726
import org.checkerframework.checker.nullness.qual.NonNull;
2827
import org.spongepowered.api.command.registrar.tree.CommandTreeNode;
2928

3029
/**
31-
* Implemented by {@link ArgumentParser} which also supply a special {@link CommandTreeNode.Argument}.
30+
* Implemented by {@link org.incendo.cloud.parser.ArgumentParser} which also supply a special {@link CommandTreeNode.Argument}.
3231
*/
3332
public interface NodeSource {
3433

‎cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCaptionKeys.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
//
2424
package cloud.commandframework.sponge;
2525

26-
import cloud.commandframework.captions.Caption;
2726
import java.util.Collection;
2827
import java.util.Collections;
2928
import java.util.HashSet;
3029
import org.checkerframework.checker.nullness.qual.NonNull;
30+
import org.incendo.cloud.caption.Caption;
3131

3232
/**
3333
* {@link Caption} instances for messages in cloud-sponge.

‎cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCommandContextKeys.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323
//
2424
package cloud.commandframework.sponge;
2525

26-
import cloud.commandframework.keys.CloudKey;
2726
import io.leangen.geantyref.TypeToken;
27+
import org.incendo.cloud.key.CloudKey;
2828
import org.spongepowered.api.command.CommandCause;
2929

3030
/**
31-
* Sponge related {@link cloud.commandframework.context.CommandContext} keys.
31+
* Sponge related {@link org.incendo.cloud.context.CommandContext} keys.
3232
*/
3333
public final class SpongeCommandContextKeys {
3434

3535
/**
36-
* The Sponge native {@link org.spongepowered.api.command.CommandCause} instance is stored in the {@link cloud.commandframework.context.CommandContext}
36+
* The Sponge native {@link org.spongepowered.api.command.CommandCause} instance is stored in the {@link org.incendo.cloud.context.CommandContext}
3737
* by {@link SpongeCommandPreprocessor}
3838
*/
3939
public static final CloudKey<CommandCause> COMMAND_CAUSE = CloudKey.of(

‎cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCommandManager.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,11 @@
2323
//
2424
package cloud.commandframework.sponge;
2525

26-
import cloud.commandframework.CommandManager;
27-
import cloud.commandframework.SenderMapper;
28-
import cloud.commandframework.SenderMapperHolder;
29-
import cloud.commandframework.arguments.parser.ParserParameters;
30-
import cloud.commandframework.arguments.suggestion.SuggestionFactory;
31-
import cloud.commandframework.execution.ExecutionCoordinator;
32-
import cloud.commandframework.meta.CommandMeta;
33-
import cloud.commandframework.meta.SimpleCommandMeta;
3426
import cloud.commandframework.sponge.annotation.specifier.Center;
3527
import cloud.commandframework.sponge.parser.RegistryEntryParser;
3628
import cloud.commandframework.sponge.parser.Vector2dParser;
3729
import cloud.commandframework.sponge.parser.Vector3dParser;
3830
import cloud.commandframework.sponge.suggestion.SpongeSuggestion;
39-
import cloud.commandframework.state.RegistrationState;
4031
import com.google.common.collect.ImmutableSet;
4132
import com.google.inject.Inject;
4233
import com.google.inject.Module;
@@ -48,6 +39,15 @@
4839
import java.util.Set;
4940
import java.util.function.Consumer;
5041
import org.checkerframework.checker.nullness.qual.NonNull;
42+
import org.incendo.cloud.CommandManager;
43+
import org.incendo.cloud.SenderMapper;
44+
import org.incendo.cloud.SenderMapperHolder;
45+
import org.incendo.cloud.execution.ExecutionCoordinator;
46+
import org.incendo.cloud.meta.CommandMeta;
47+
import org.incendo.cloud.meta.SimpleCommandMeta;
48+
import org.incendo.cloud.parser.ParserParameters;
49+
import org.incendo.cloud.state.RegistrationState;
50+
import org.incendo.cloud.suggestion.SuggestionFactory;
5151
import org.spongepowered.api.Sponge;
5252
import org.spongepowered.api.command.CommandCause;
5353
import org.spongepowered.api.event.lifecycle.RegisterCommandEvent;
@@ -231,7 +231,7 @@ public boolean hasPermission(
231231

232232
/**
233233
* Get the {@link SpongeParserMapper}, responsible for mapping Cloud
234-
* {@link cloud.commandframework.arguments.parser.ArgumentParser ArgumentParser} to Sponge
234+
* {@link org.incendo.cloud.parser.ArgumentParser ArgumentParser} to Sponge
235235
* {@link org.spongepowered.api.command.registrar.tree.CommandTreeNode.Argument CommandTreeNode.Arguments}.
236236
*
237237
* @return the parser mapper

‎cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeCommandPreprocessor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
//
2424
package cloud.commandframework.sponge;
2525

26-
import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
27-
import cloud.commandframework.execution.preprocessor.CommandPreprocessingContext;
28-
import cloud.commandframework.execution.preprocessor.CommandPreprocessor;
2926
import org.checkerframework.checker.nullness.qual.NonNull;
27+
import org.incendo.cloud.brigadier.parser.WrappedBrigadierParser;
28+
import org.incendo.cloud.execution.preprocessor.CommandPreprocessingContext;
29+
import org.incendo.cloud.execution.preprocessor.CommandPreprocessor;
3030
import org.spongepowered.api.command.CommandCause;
3131

3232
/**
33-
* Command preprocessor which decorates incoming {@link cloud.commandframework.context.CommandContext}
33+
* Command preprocessor which decorates incoming {@link org.incendo.cloud.context.CommandContext}
3434
* with Sponge specific objects
3535
*
3636
* @param <C> Command sender type

‎cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeDefaultCaptionsProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
//
2424
package cloud.commandframework.sponge;
2525

26-
import cloud.commandframework.captions.CaptionProvider;
27-
import cloud.commandframework.captions.DelegatingCaptionProvider;
2826
import org.checkerframework.checker.nullness.qual.NonNull;
27+
import org.incendo.cloud.caption.CaptionProvider;
28+
import org.incendo.cloud.caption.DelegatingCaptionProvider;
2929

3030
/**
3131
* Provides the default captions for messages in cloud-sponge.

‎cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeDefaultExceptionHandlers.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323
//
2424
package cloud.commandframework.sponge;
2525

26-
import cloud.commandframework.exceptions.ArgumentParseException;
27-
import cloud.commandframework.exceptions.CommandExecutionException;
28-
import cloud.commandframework.exceptions.InvalidCommandSenderException;
29-
import cloud.commandframework.exceptions.InvalidSyntaxException;
30-
import cloud.commandframework.exceptions.NoPermissionException;
31-
import cloud.commandframework.exceptions.NoSuchCommandException;
3226
import net.kyori.adventure.audience.Audience;
3327
import net.kyori.adventure.text.Component;
3428
import net.kyori.adventure.util.ComponentMessageThrowable;
3529
import org.checkerframework.checker.nullness.qual.NonNull;
3630
import org.checkerframework.checker.nullness.qual.Nullable;
3731
import org.checkerframework.framework.qual.DefaultQualifier;
32+
import org.incendo.cloud.exception.ArgumentParseException;
33+
import org.incendo.cloud.exception.CommandExecutionException;
34+
import org.incendo.cloud.exception.InvalidCommandSenderException;
35+
import org.incendo.cloud.exception.InvalidSyntaxException;
36+
import org.incendo.cloud.exception.NoPermissionException;
37+
import org.incendo.cloud.exception.NoSuchCommandException;
3838

3939
import static net.kyori.adventure.text.Component.text;
4040
import static net.kyori.adventure.text.format.NamedTextColor.GRAY;

‎cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeParserMapper.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,34 +23,34 @@
2323
//
2424
package cloud.commandframework.sponge;
2525

26-
import cloud.commandframework.CommandComponent;
27-
import cloud.commandframework.arguments.flags.CommandFlagParser;
28-
import cloud.commandframework.arguments.parser.ArgumentParser;
29-
import cloud.commandframework.arguments.parser.MappedArgumentParser;
30-
import cloud.commandframework.arguments.standard.BooleanParser;
31-
import cloud.commandframework.arguments.standard.ByteParser;
32-
import cloud.commandframework.arguments.standard.DoubleParser;
33-
import cloud.commandframework.arguments.standard.FloatParser;
34-
import cloud.commandframework.arguments.standard.IntegerParser;
35-
import cloud.commandframework.arguments.standard.LongParser;
36-
import cloud.commandframework.arguments.standard.ShortParser;
37-
import cloud.commandframework.arguments.standard.StringArrayParser;
38-
import cloud.commandframework.arguments.standard.StringParser;
39-
import cloud.commandframework.arguments.standard.UUIDParser;
4026
import io.leangen.geantyref.GenericTypeReflector;
4127
import io.leangen.geantyref.TypeToken;
4228
import java.util.HashMap;
4329
import java.util.Map;
4430
import java.util.function.Consumer;
4531
import java.util.function.Function;
4632
import org.checkerframework.checker.nullness.qual.NonNull;
33+
import org.incendo.cloud.component.CommandComponent;
34+
import org.incendo.cloud.parser.ArgumentParser;
35+
import org.incendo.cloud.parser.MappedArgumentParser;
36+
import org.incendo.cloud.parser.flag.CommandFlagParser;
37+
import org.incendo.cloud.parser.standard.BooleanParser;
38+
import org.incendo.cloud.parser.standard.ByteParser;
39+
import org.incendo.cloud.parser.standard.DoubleParser;
40+
import org.incendo.cloud.parser.standard.FloatParser;
41+
import org.incendo.cloud.parser.standard.IntegerParser;
42+
import org.incendo.cloud.parser.standard.LongParser;
43+
import org.incendo.cloud.parser.standard.ShortParser;
44+
import org.incendo.cloud.parser.standard.StringArrayParser;
45+
import org.incendo.cloud.parser.standard.StringParser;
46+
import org.incendo.cloud.parser.standard.UUIDParser;
4747
import org.spongepowered.api.command.registrar.tree.CommandTreeNode;
4848
import org.spongepowered.api.command.registrar.tree.CommandTreeNodeTypes;
4949

5050
import static java.util.Objects.requireNonNull;
5151

5252
/**
53-
* Class responsible for mapping Cloud {@link ArgumentParser ArgumentParsers} to Sponge
53+
* Class responsible for mapping Cloud {@link org.incendo.cloud.parser.ArgumentParser ArgumentParsers} to Sponge
5454
* {@link CommandTreeNode.Argument CommandTreeNode.Arguments}.
5555
*
5656
* @param <C> command sender type

0 commit comments

Comments
 (0)