Skip to content

Commit 844aa71

Browse files
jpenillajpenilla
committed
Align parser/suggestion package names
1 parent 78761db commit 844aa71

83 files changed

Lines changed: 144 additions & 146 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import cloud.commandframework.brigadier.argument.BrigadierMapping;
4444
import cloud.commandframework.brigadier.argument.BrigadierMappingBuilder;
4545
import cloud.commandframework.brigadier.argument.BrigadierMappings;
46-
import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
46+
import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
4747
import cloud.commandframework.brigadier.node.LiteralBrigadierNodeFactory;
4848
import cloud.commandframework.brigadier.suggestion.TooltipSuggestion;
4949
import cloud.commandframework.context.CommandContext;

‎cloud-brigadier/src/main/java/cloud/commandframework/brigadier/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Cloud {@link cloud.commandframework.CommandTree command trees} to Brigadier nodes.</p>
66
*
77
* <p>To bridge Brigadier and Cloud argument types, an argument parser that wraps Brigadier argument types is available in
8-
* {@link cloud.commandframework.brigadier.argument.WrappedBrigadierParser}. Other classes in that package allow constructing
8+
* {@link cloud.commandframework.brigadier.parser.WrappedBrigadierParser}. Other classes in that package allow constructing
99
* Brigadier {@link com.mojang.brigadier.StringReader} instances that can be used for efficient interoperability with
1010
* Brigadier.</p>
1111
*/

cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/CloudStringReader.java renamed to cloud-brigadier/src/main/java/cloud/commandframework/brigadier/parser/CloudStringReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2222
// SOFTWARE.
2323
//
24-
package cloud.commandframework.brigadier.argument;
24+
package cloud.commandframework.brigadier.parser;
2525

2626
import cloud.commandframework.context.CommandInput;
2727
import com.mojang.brigadier.StringReader;

cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/WrappedBrigadierParser.java renamed to cloud-brigadier/src/main/java/cloud/commandframework/brigadier/parser/WrappedBrigadierParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2222
// SOFTWARE.
2323
//
24-
package cloud.commandframework.brigadier.argument;
24+
package cloud.commandframework.brigadier.parser;
2525

2626
import cloud.commandframework.arguments.parser.ArgumentParseResult;
2727
import cloud.commandframework.arguments.parser.ArgumentParser;

‎cloud-brigadier/src/main/java/cloud/commandframework/brigadier/parser/package-info.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/**
2+
* Argument parsers available on Brigadier platforms.
3+
*/
4+
package cloud.commandframework.brigadier.parser;

cloud-brigadier/src/test/java/cloud/commandframework/brigadier/argument/CloudStringReaderTest.java renamed to cloud-brigadier/src/test/java/cloud/commandframework/brigadier/parser/CloudStringReaderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2222
// SOFTWARE.
2323
//
24-
package cloud.commandframework.brigadier.argument;
24+
package cloud.commandframework.brigadier.parser;
2525

2626
import cloud.commandframework.context.CommandInput;
2727
import com.mojang.brigadier.StringReader;

‎cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitBrigadierMapper.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@
2929
import cloud.commandframework.bukkit.internal.CommandBuildContextSupplier;
3030
import cloud.commandframework.bukkit.internal.MinecraftArgumentTypes;
3131
import cloud.commandframework.bukkit.internal.RegistryReflection;
32-
import cloud.commandframework.bukkit.parsers.BlockPredicateParser;
33-
import cloud.commandframework.bukkit.parsers.EnchantmentParser;
34-
import cloud.commandframework.bukkit.parsers.ItemStackParser;
35-
import cloud.commandframework.bukkit.parsers.ItemStackPredicateParser;
36-
import cloud.commandframework.bukkit.parsers.NamespacedKeyParser;
37-
import cloud.commandframework.bukkit.parsers.location.Location2DParser;
38-
import cloud.commandframework.bukkit.parsers.location.LocationParser;
39-
import cloud.commandframework.bukkit.parsers.selector.MultipleEntitySelectorParser;
40-
import cloud.commandframework.bukkit.parsers.selector.MultiplePlayerSelectorParser;
41-
import cloud.commandframework.bukkit.parsers.selector.SingleEntitySelectorParser;
42-
import cloud.commandframework.bukkit.parsers.selector.SinglePlayerSelectorParser;
32+
import cloud.commandframework.bukkit.parser.BlockPredicateParser;
33+
import cloud.commandframework.bukkit.parser.EnchantmentParser;
34+
import cloud.commandframework.bukkit.parser.ItemStackParser;
35+
import cloud.commandframework.bukkit.parser.ItemStackPredicateParser;
36+
import cloud.commandframework.bukkit.parser.NamespacedKeyParser;
37+
import cloud.commandframework.bukkit.parser.location.Location2DParser;
38+
import cloud.commandframework.bukkit.parser.location.LocationParser;
39+
import cloud.commandframework.bukkit.parser.selector.MultipleEntitySelectorParser;
40+
import cloud.commandframework.bukkit.parser.selector.MultiplePlayerSelectorParser;
41+
import cloud.commandframework.bukkit.parser.selector.SingleEntitySelectorParser;
42+
import cloud.commandframework.bukkit.parser.selector.SinglePlayerSelectorParser;
4343
import com.mojang.brigadier.arguments.ArgumentType;
4444
import com.mojang.brigadier.arguments.StringArgumentType;
4545
import io.leangen.geantyref.GenericTypeReflector;

‎cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,21 @@
3636
import cloud.commandframework.bukkit.data.MultipleEntitySelector;
3737
import cloud.commandframework.bukkit.data.MultiplePlayerSelector;
3838
import cloud.commandframework.bukkit.internal.CraftBukkitReflection;
39-
import cloud.commandframework.bukkit.parsers.BlockPredicateParser;
40-
import cloud.commandframework.bukkit.parsers.EnchantmentParser;
41-
import cloud.commandframework.bukkit.parsers.ItemStackParser;
42-
import cloud.commandframework.bukkit.parsers.ItemStackPredicateParser;
43-
import cloud.commandframework.bukkit.parsers.MaterialParser;
44-
import cloud.commandframework.bukkit.parsers.NamespacedKeyParser;
45-
import cloud.commandframework.bukkit.parsers.OfflinePlayerParser;
46-
import cloud.commandframework.bukkit.parsers.PlayerParser;
47-
import cloud.commandframework.bukkit.parsers.WorldParser;
48-
import cloud.commandframework.bukkit.parsers.location.Location2DParser;
49-
import cloud.commandframework.bukkit.parsers.location.LocationParser;
50-
import cloud.commandframework.bukkit.parsers.selector.MultipleEntitySelectorParser;
51-
import cloud.commandframework.bukkit.parsers.selector.MultiplePlayerSelectorParser;
52-
import cloud.commandframework.bukkit.parsers.selector.SingleEntitySelectorParser;
53-
import cloud.commandframework.bukkit.parsers.selector.SinglePlayerSelectorParser;
39+
import cloud.commandframework.bukkit.parser.BlockPredicateParser;
40+
import cloud.commandframework.bukkit.parser.EnchantmentParser;
41+
import cloud.commandframework.bukkit.parser.ItemStackParser;
42+
import cloud.commandframework.bukkit.parser.ItemStackPredicateParser;
43+
import cloud.commandframework.bukkit.parser.MaterialParser;
44+
import cloud.commandframework.bukkit.parser.NamespacedKeyParser;
45+
import cloud.commandframework.bukkit.parser.OfflinePlayerParser;
46+
import cloud.commandframework.bukkit.parser.PlayerParser;
47+
import cloud.commandframework.bukkit.parser.WorldParser;
48+
import cloud.commandframework.bukkit.parser.location.Location2DParser;
49+
import cloud.commandframework.bukkit.parser.location.LocationParser;
50+
import cloud.commandframework.bukkit.parser.selector.MultipleEntitySelectorParser;
51+
import cloud.commandframework.bukkit.parser.selector.MultiplePlayerSelectorParser;
52+
import cloud.commandframework.bukkit.parser.selector.SingleEntitySelectorParser;
53+
import cloud.commandframework.bukkit.parser.selector.SinglePlayerSelectorParser;
5454
import cloud.commandframework.exceptions.ArgumentParseException;
5555
import cloud.commandframework.exceptions.CommandExecutionException;
5656
import cloud.commandframework.exceptions.InvalidCommandSenderException;

‎cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java‎

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

26-
import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
26+
import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
2727
import cloud.commandframework.bukkit.internal.BukkitBackwardsBrigadierSenderMapper;
2828
import cloud.commandframework.execution.preprocessor.CommandPreprocessingContext;
2929
import cloud.commandframework.execution.preprocessor.CommandPreprocessor;

‎cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitParserParameters.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ private BukkitParserParameters() {
4141

4242
/**
4343
* Used to specify if an empty result is allowed for
44-
* {@link cloud.commandframework.bukkit.parsers.selector.MultiplePlayerSelectorParser} and
45-
* {@link cloud.commandframework.bukkit.parsers.selector.MultipleEntitySelectorParser}.
44+
* {@link cloud.commandframework.bukkit.parser.selector.MultiplePlayerSelectorParser} and
45+
* {@link cloud.commandframework.bukkit.parser.selector.MultipleEntitySelectorParser}.
4646
*
4747
* @since 1.8.0
4848
*/
@@ -51,7 +51,7 @@ private BukkitParserParameters() {
5151
create("allow_empty_selector_result", TypeToken.get(Boolean.class));
5252

5353
/**
54-
* Sets to require explicit namespaces for {@link cloud.commandframework.bukkit.parsers.NamespacedKeyParser}
54+
* Sets to require explicit namespaces for {@link cloud.commandframework.bukkit.parser.NamespacedKeyParser}
5555
* (i.e. 'test' will be rejected but 'test:test' will pass).
5656
*
5757
* @since 1.7.0
@@ -60,7 +60,7 @@ private BukkitParserParameters() {
6060
create("require_explicit_namespace", TypeToken.get(Boolean.class));
6161

6262
/**
63-
* Sets a custom default namespace for {@link cloud.commandframework.bukkit.parsers.NamespacedKeyParser}.
63+
* Sets a custom default namespace for {@link cloud.commandframework.bukkit.parser.NamespacedKeyParser}.
6464
* Without this annotation the default is {@link org.bukkit.NamespacedKey#MINECRAFT}.
6565
*
6666
* @since 1.7.0

0 commit comments

Comments
 (0)