diff --git a/.checkstyle/checkstyle.xml b/.checkstyle/checkstyle.xml index 3d9f3362..2c6abd29 100644 --- a/.checkstyle/checkstyle.xml +++ b/.checkstyle/checkstyle.xml @@ -207,6 +207,10 @@ + + + + { final @NonNull CommandRegistrationHandler commandRegistrationHandler ) { this.commandTree = CommandTree.newTree(this); - this.commandExecutionCoordinator = commandExecutionCoordinator.apply(commandTree); + this.commandExecutionCoordinator = commandExecutionCoordinator.apply(this.commandTree); this.commandRegistrationHandler = commandRegistrationHandler; this.commandSuggestionEngine = new DelegatingCommandSuggestionEngineFactory<>(this).create(); /* Register service types */ @@ -374,7 +374,7 @@ public abstract class CommandManager { final @NonNull Description description, final @NonNull CommandMeta meta ) { - return commandBuilder(name, aliases, (ArgumentDescription) description, meta); + return this.commandBuilder(name, aliases, (ArgumentDescription) description, meta); } /** diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandTree.java b/cloud-core/src/main/java/cloud/commandframework/CommandTree.java index 7ac76347..201872de 100644 --- a/cloud-core/src/main/java/cloud/commandframework/CommandTree.java +++ b/cloud-core/src/main/java/cloud/commandframework/CommandTree.java @@ -240,8 +240,8 @@ public final class CommandTree { if (root.equals(this.internalTree)) { return Pair.of(null, new NoSuchCommandException( commandContext.getSender(), - getChain(root).stream().map(Node::getValue).collect(Collectors.toList()), - stringOrEmpty(commandQueue.peek()) + this.getChain(root).stream().map(Node::getValue).collect(Collectors.toList()), + this.stringOrEmpty(commandQueue.peek()) )); } /* If we couldn't match a child, check if there's a command attached and execute it */ @@ -476,7 +476,7 @@ public final class CommandTree { final @NonNull CommandContext context, final @NonNull Queue<@NonNull String> commandQueue ) { - return getSuggestions(context, commandQueue, this.internalTree); + return this.getSuggestions(context, commandQueue, this.internalTree); } @SuppressWarnings("MixedMutabilityReturnType") @@ -533,7 +533,7 @@ public final class CommandTree { /* Calculate suggestions for the literal arguments */ final List suggestions = new LinkedList<>(); if (commandQueue.size() <= 1) { - final String literalValue = stringOrEmpty(commandQueue.peek()); + final String literalValue = this.stringOrEmpty(commandQueue.peek()); for (final Node> argument : staticArguments) { if (this.isPermitted(commandContext.getSender(), argument) != null) { continue; @@ -658,7 +658,7 @@ public final class CommandTree { // Fallback: use suggestion provider of argument commandContext.setCurrentArgument(child.getValue()); - return child.getValue().getSuggestionsProvider().apply(commandContext, stringOrEmpty(commandQueue.peek())); + return child.getValue().getSuggestionsProvider().apply(commandContext, this.stringOrEmpty(commandQueue.peek())); } private @NonNull String stringOrEmpty(final @Nullable String string) { @@ -873,7 +873,7 @@ public final class CommandTree { leaves.add(node); } } else { - node.children.forEach(child -> leaves.addAll(getLeavesRaw(child))); + node.children.forEach(child -> leaves.addAll(this.getLeavesRaw(child))); } return leaves; } @@ -887,7 +887,7 @@ public final class CommandTree { leaves.add(node.getValue()); } } else { - node.children.forEach(child -> leaves.addAll(getLeaves(child))); + node.children.forEach(child -> leaves.addAll(this.getLeaves(child))); } return leaves; } @@ -1024,12 +1024,12 @@ public final class CommandTree { return false; } final Node node = (Node) o; - return Objects.equals(getValue(), node.getValue()); + return Objects.equals(this.getValue(), node.getValue()); } @Override public int hashCode() { - return Objects.hash(getValue()); + return Objects.hash(this.getValue()); } /** @@ -1052,7 +1052,7 @@ public final class CommandTree { @Override public String toString() { - return "Node{value=" + value + '}'; + return "Node{value=" + this.value + '}'; } } diff --git a/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotatedElementAccessor.java b/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotatedElementAccessor.java index b38b269f..f9382e8c 100644 --- a/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotatedElementAccessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotatedElementAccessor.java @@ -46,7 +46,7 @@ final class AnnotatedElementAccessor implements AnnotationAccessor { final @NonNull Class clazz ) { try { - return element.getAnnotation(clazz); + return this.element.getAnnotation(clazz); } catch (final NullPointerException exception) { return null; } diff --git a/cloud-core/src/main/java/cloud/commandframework/annotations/MultiDelegateAnnotationAccessor.java b/cloud-core/src/main/java/cloud/commandframework/annotations/MultiDelegateAnnotationAccessor.java index 98522c5b..eb00a146 100644 --- a/cloud-core/src/main/java/cloud/commandframework/annotations/MultiDelegateAnnotationAccessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/annotations/MultiDelegateAnnotationAccessor.java @@ -43,7 +43,7 @@ final class MultiDelegateAnnotationAccessor implements AnnotationAccessor { @Override public @Nullable A annotation(@NonNull final Class clazz) { A instance = null; - for (final AnnotationAccessor annotationAccessor : accessors) { + for (final AnnotationAccessor annotationAccessor : this.accessors) { instance = annotationAccessor.annotation(clazz); if (instance != null) { break; @@ -55,7 +55,7 @@ final class MultiDelegateAnnotationAccessor implements AnnotationAccessor { @Override public @NonNull Collection<@NonNull Annotation> annotations() { final List annotationList = new LinkedList<>(); - for (final AnnotationAccessor annotationAccessor : accessors) { + for (final AnnotationAccessor annotationAccessor : this.accessors) { annotationList.addAll(annotationAccessor.annotations()); } return Collections.unmodifiableCollection(annotationList); diff --git a/cloud-core/src/main/java/cloud/commandframework/annotations/injection/ParameterInjectorRegistry.java b/cloud-core/src/main/java/cloud/commandframework/annotations/injection/ParameterInjectorRegistry.java index 145ae3c9..acedf30e 100644 --- a/cloud-core/src/main/java/cloud/commandframework/annotations/injection/ParameterInjectorRegistry.java +++ b/cloud-core/src/main/java/cloud/commandframework/annotations/injection/ParameterInjectorRegistry.java @@ -57,7 +57,7 @@ public final class ParameterInjectorRegistry implements InjectionService { * Create a new parameter injector registry */ public ParameterInjectorRegistry() { - servicePipeline.registerServiceType(new TypeToken>() { + this.servicePipeline.registerServiceType(new TypeToken>() { }, this); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java index d088c837..0a78a82f 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java @@ -462,12 +462,12 @@ public class CommandArgument implements Comparable>, return false; } final CommandArgument that = (CommandArgument) o; - return isRequired() == that.isRequired() && Objects.equals(getName(), that.getName()); + return this.isRequired() == that.isRequired() && Objects.equals(this.getName(), that.getName()); } @Override public final int hashCode() { - return Objects.hash(isRequired(), getName()); + return Objects.hash(this.isRequired(), this.getName()); } @Override @@ -693,7 +693,7 @@ public class CommandArgument implements Comparable>, */ public @NonNull CommandArgument<@NonNull C, @NonNull T> build() { if (this.parser == null && this.manager != null) { - this.parser = this.manager.getParserRegistry().createParser(valueType, ParserParameters.empty()) + this.parser = this.manager.getParserRegistry().createParser(this.valueType, ParserParameters.empty()) .orElse(null); } if (this.parser == null) { diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java index 8cbaaeb0..2ca52c2a 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java @@ -285,7 +285,7 @@ public final class FlagArgument extends CommandArgument { } } commandContext.store(FLAG_META_KEY, ""); - return suggestions(commandContext, input); + return this.suggestions(commandContext, input); } /** @@ -486,7 +486,7 @@ public final class FlagArgument extends CommandArgument { * @return String value */ public String getInput() { - return input; + return this.input; } } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameter.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameter.java index 67031ba7..0ad4265e 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameter.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameter.java @@ -79,13 +79,13 @@ public class ParserParameter { return false; } final ParserParameter that = (ParserParameter) o; - return Objects.equals(key, that.key) - && Objects.equals(expectedType, that.expectedType); + return Objects.equals(this.key, that.key) + && Objects.equals(this.expectedType, that.expectedType); } @Override public final int hashCode() { - return Objects.hash(key, expectedType); + return Objects.hash(this.key, this.expectedType); } } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/preprocessor/RegexPreprocessor.java b/cloud-core/src/main/java/cloud/commandframework/arguments/preprocessor/RegexPreprocessor.java index e21e0bf8..e360fd7b 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/preprocessor/RegexPreprocessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/preprocessor/RegexPreprocessor.java @@ -96,7 +96,7 @@ public final class RegexPreprocessor implements BiFunction<@NonNull CommandCo context )); } - if (predicate.test(head)) { + if (this.predicate.test(head)) { return ArgumentParseResult.success(true); } return ArgumentParseResult.failure( diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java index c5be5d54..f4aa42a8 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java @@ -184,7 +184,7 @@ public final class BooleanArgument extends CommandArgument { } inputQueue.remove(); - if (!liberal) { + if (!this.liberal) { if (input.equalsIgnoreCase("true")) { return ArgumentParseResult.success(true); } @@ -214,7 +214,7 @@ public final class BooleanArgument extends CommandArgument { final @NonNull CommandContext commandContext, final @NonNull String input ) { - if (!liberal) { + if (!this.liberal) { return Arrays.asList("TRUE", "FALSE"); } @@ -267,7 +267,7 @@ public final class BooleanArgument extends CommandArgument { * @return String value */ public String getInput() { - return input; + return this.input; } /** @@ -276,7 +276,7 @@ public final class BooleanArgument extends CommandArgument { * @return Liberal value */ public boolean isLiberal() { - return liberal; + return this.liberal; } } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java index afc8994a..5dcaa101 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java @@ -183,7 +183,7 @@ public final class CharArgument extends CommandArgument { * @return Input value */ public @NonNull String getInput() { - return input; + return this.input; } } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java index 78616b60..c0c8eb17 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java @@ -190,7 +190,7 @@ public final class UUIDArgument extends CommandArgument { * @return String value */ public String getInput() { - return input; + return this.input; } } diff --git a/cloud-core/src/main/java/cloud/commandframework/captions/Caption.java b/cloud-core/src/main/java/cloud/commandframework/captions/Caption.java index df0a6ba5..9ea0c4e3 100644 --- a/cloud-core/src/main/java/cloud/commandframework/captions/Caption.java +++ b/cloud-core/src/main/java/cloud/commandframework/captions/Caption.java @@ -57,7 +57,7 @@ public final class Caption { return false; } final Caption caption = (Caption) o; - return Objects.equals(key, caption.key); + return Objects.equals(this.key, caption.key); } /** @@ -71,7 +71,7 @@ public final class Caption { @Override public int hashCode() { - return Objects.hash(key); + return Objects.hash(this.key); } @Override diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/AmbiguousNodeException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/AmbiguousNodeException.java index fc0c5365..2d5d7ed5 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/AmbiguousNodeException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/AmbiguousNodeException.java @@ -92,9 +92,9 @@ public final class AmbiguousNodeException extends IllegalStateException { @Override public String getMessage() { final StringBuilder stringBuilder = new StringBuilder("Ambiguous Node: ") - .append(ambiguousNode.getName()) + .append(this.ambiguousNode.getName()) .append(" cannot be added as a child to ") - .append(parentNode == null ? "" : parentNode.getName()) + .append(this.parentNode == null ? "" : this.parentNode.getName()) .append(" (All children: "); final Iterator> childIterator = this.children.iterator(); while (childIterator.hasNext()) { diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidCommandSenderException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidCommandSenderException.java index d1cf4dfb..54022b1b 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidCommandSenderException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidCommandSenderException.java @@ -88,7 +88,7 @@ public final class InvalidCommandSenderException extends CommandParseException { return String.format( "%s is not allowed to execute that command. Must be of type %s", getCommandSender().getClass().getSimpleName(), - requiredSender.getSimpleName() + this.requiredSender.getSimpleName() ); } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/CommandPostprocessingContext.java b/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/CommandPostprocessingContext.java index 514e790f..93ab13f4 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/CommandPostprocessingContext.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/CommandPostprocessingContext.java @@ -80,7 +80,7 @@ public final class CommandPostprocessingContext { return false; } final CommandPostprocessingContext that = (CommandPostprocessingContext) o; - return Objects.equals(getCommandContext(), that.getCommandContext()) + return Objects.equals(this.getCommandContext(), that.getCommandContext()) && Objects.equals(this.getCommand(), that.getCommand()); } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/CommandPreprocessingContext.java b/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/CommandPreprocessingContext.java index 1dd36f05..4f2d2cd7 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/CommandPreprocessingContext.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/CommandPreprocessingContext.java @@ -81,13 +81,13 @@ public final class CommandPreprocessingContext { return false; } final CommandPreprocessingContext that = (CommandPreprocessingContext) o; - return Objects.equals(getCommandContext(), that.getCommandContext()) - && Objects.equals(getInputQueue(), that.getInputQueue()); + return Objects.equals(this.getCommandContext(), that.getCommandContext()) + && Objects.equals(this.getInputQueue(), that.getInputQueue()); } @Override public int hashCode() { - return Objects.hash(getCommandContext(), getInputQueue()); + return Objects.hash(this.getCommandContext(), this.getInputQueue()); } } diff --git a/cloud-core/src/main/java/cloud/commandframework/extra/confirmation/CommandConfirmationManager.java b/cloud-core/src/main/java/cloud/commandframework/extra/confirmation/CommandConfirmationManager.java index 4fbfed34..472da044 100644 --- a/cloud-core/src/main/java/cloud/commandframework/extra/confirmation/CommandConfirmationManager.java +++ b/cloud-core/src/main/java/cloud/commandframework/extra/confirmation/CommandConfirmationManager.java @@ -182,9 +182,9 @@ public class CommandConfirmationManager { return; } /* Add it to the "queue" */ - addPending(context); + CommandConfirmationManager.this.addPending(context); /* Notify the consumer that a confirmation is required */ - notifyConsumer(context); + CommandConfirmationManager.this.notifyConsumer(context); /* Interrupt */ ConsumerService.interrupt(); } diff --git a/cloud-core/src/main/java/cloud/commandframework/internal/CommandInputTokenizer.java b/cloud-core/src/main/java/cloud/commandframework/internal/CommandInputTokenizer.java index 85a35161..7088e430 100644 --- a/cloud-core/src/main/java/cloud/commandframework/internal/CommandInputTokenizer.java +++ b/cloud-core/src/main/java/cloud/commandframework/internal/CommandInputTokenizer.java @@ -56,12 +56,12 @@ public final class CommandInputTokenizer { * @return Linked list containing the tokenized input */ public @NonNull LinkedList<@NonNull String> tokenize() { - final StringTokenizer stringTokenizer = stringTokenizerFactory.createStringTokenizer(); + final StringTokenizer stringTokenizer = this.stringTokenizerFactory.createStringTokenizer(); final LinkedList tokens = new LinkedList<>(); while (stringTokenizer.hasMoreElements()) { tokens.add(stringTokenizer.nextToken()); } - if (input.endsWith(DELIMITER)) { + if (this.input.endsWith(DELIMITER)) { tokens.add(EMPTY); } return tokens; @@ -74,7 +74,7 @@ public final class CommandInputTokenizer { private final class StringTokenizerFactory { private @NonNull StringTokenizer createStringTokenizer() { - return new StringTokenizer(input, DELIMITER); + return new StringTokenizer(CommandInputTokenizer.this.input, DELIMITER); } } diff --git a/cloud-core/src/main/java/cloud/commandframework/keys/SimpleCloudKey.java b/cloud-core/src/main/java/cloud/commandframework/keys/SimpleCloudKey.java index 9a71928e..d5e6d2c4 100644 --- a/cloud-core/src/main/java/cloud/commandframework/keys/SimpleCloudKey.java +++ b/cloud-core/src/main/java/cloud/commandframework/keys/SimpleCloudKey.java @@ -76,7 +76,7 @@ public final class SimpleCloudKey<@NonNull T> implements CloudKey { @Override public @NonNull String getName() { - return name; + return this.name; } @Override @@ -93,12 +93,12 @@ public final class SimpleCloudKey<@NonNull T> implements CloudKey { return false; } final SimpleCloudKey key = (SimpleCloudKey) o; - return name.equals(key.name); + return this.name.equals(key.name); } @Override public int hashCode() { - return Objects.hash(name); + return Objects.hash(this.name); } @Override diff --git a/cloud-core/src/main/java/cloud/commandframework/permission/Permission.java b/cloud-core/src/main/java/cloud/commandframework/permission/Permission.java index 7614cf5a..02eb0132 100644 --- a/cloud-core/src/main/java/cloud/commandframework/permission/Permission.java +++ b/cloud-core/src/main/java/cloud/commandframework/permission/Permission.java @@ -97,12 +97,12 @@ public final class Permission implements CommandPermission { return false; } final Permission that = (Permission) o; - return Objects.equals(getPermission(), that.getPermission()); + return Objects.equals(this.getPermission(), that.getPermission()); } @Override public int hashCode() { - return Objects.hash(getPermission()); + return Objects.hash(this.getPermission()); } } diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Pair.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Pair.java index bfba9ec0..c66c3703 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Pair.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Pair.java @@ -89,13 +89,13 @@ public class Pair implements Tuple { return false; } final Pair pair = (Pair) o; - return Objects.equals(getFirst(), pair.getFirst()) - && Objects.equals(getSecond(), pair.getSecond()); + return Objects.equals(this.getFirst(), pair.getFirst()) + && Objects.equals(this.getSecond(), pair.getSecond()); } @Override public final int hashCode() { - return Objects.hash(getFirst(), getSecond()); + return Objects.hash(this.getFirst(), this.getSecond()); } @Override diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java index 8ce802f3..9dd8b97a 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java @@ -121,15 +121,15 @@ public class Quartet implements Tuple { return false; } final Quartet quartet = (Quartet) o; - return Objects.equals(getFirst(), quartet.getFirst()) - && Objects.equals(getSecond(), quartet.getSecond()) - && Objects.equals(getThird(), quartet.getThird()) - && Objects.equals(getFourth(), quartet.getFourth()); + return Objects.equals(this.getFirst(), quartet.getFirst()) + && Objects.equals(this.getSecond(), quartet.getSecond()) + && Objects.equals(this.getThird(), quartet.getThird()) + && Objects.equals(this.getFourth(), quartet.getFourth()); } @Override public final int hashCode() { - return Objects.hash(getFirst(), getSecond(), getThird(), getFourth()); + return Objects.hash(this.getFirst(), this.getSecond(), this.getThird(), this.getFourth()); } @Override diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java index 1658f19b..cb7b38a1 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java @@ -137,16 +137,16 @@ public class Quintet implements Tuple { return false; } final Quintet quintet = (Quintet) o; - return Objects.equals(getFirst(), quintet.getFirst()) - && Objects.equals(getSecond(), quintet.getSecond()) - && Objects.equals(getThird(), quintet.getThird()) - && Objects.equals(getFourth(), quintet.getFourth()) - && Objects.equals(getFifth(), quintet.getFifth()); + return Objects.equals(this.getFirst(), quintet.getFirst()) + && Objects.equals(this.getSecond(), quintet.getSecond()) + && Objects.equals(this.getThird(), quintet.getThird()) + && Objects.equals(this.getFourth(), quintet.getFourth()) + && Objects.equals(this.getFifth(), quintet.getFifth()); } @Override public final int hashCode() { - return Objects.hash(getFirst(), getSecond(), getThird(), getFourth(), getFifth()); + return Objects.hash(this.getFirst(), this.getSecond(), this.getThird(), this.getFourth(), this.getFifth()); } @Override diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java index 2b1dc152..3e539fab 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java @@ -153,17 +153,17 @@ public class Sextet implements Tuple { return false; } final Sextet sextet = (Sextet) o; - return Objects.equals(getFirst(), sextet.getFirst()) - && Objects.equals(getSecond(), sextet.getSecond()) - && Objects.equals(getThird(), sextet.getThird()) - && Objects.equals(getFourth(), sextet.getFourth()) - && Objects.equals(getFifth(), sextet.getFifth()) - && Objects.equals(getSixth(), sextet.getSixth()); + return Objects.equals(this.getFirst(), sextet.getFirst()) + && Objects.equals(this.getSecond(), sextet.getSecond()) + && Objects.equals(this.getThird(), sextet.getThird()) + && Objects.equals(this.getFourth(), sextet.getFourth()) + && Objects.equals(this.getFifth(), sextet.getFifth()) + && Objects.equals(this.getSixth(), sextet.getSixth()); } @Override public final int hashCode() { - return Objects.hash(getFirst(), getSecond(), getThird(), getFourth(), getFifth(), getSixth()); + return Objects.hash(this.getFirst(), this.getSecond(), this.getThird(), this.getFourth(), this.getFifth(), this.getSixth()); } @Override diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Triplet.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Triplet.java index b264f0f8..20ac73d4 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Triplet.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Triplet.java @@ -105,14 +105,14 @@ public class Triplet implements Tuple { return false; } final Triplet triplet = (Triplet) o; - return Objects.equals(getFirst(), triplet.getFirst()) - && Objects.equals(getSecond(), triplet.getSecond()) - && Objects.equals(getThird(), triplet.getThird()); + return Objects.equals(this.getFirst(), triplet.getFirst()) + && Objects.equals(this.getSecond(), triplet.getSecond()) + && Objects.equals(this.getThird(), triplet.getThird()); } @Override public final int hashCode() { - return Objects.hash(getFirst(), getSecond(), getThird()); + return Objects.hash(this.getFirst(), this.getSecond(), this.getThird()); } @Override diff --git a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommand.java b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommand.java index 2edc0978..4d5624b6 100644 --- a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommand.java +++ b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommand.java @@ -75,24 +75,24 @@ public class JavacordCommand implements MessageCreateListener { commandSender = new JavacordCommandSender(event); } - C sender = manager.getCommandSenderMapper().apply(commandSender); + C sender = this.manager.getCommandSenderMapper().apply(commandSender); String messageContent = event.getMessageContent(); - String commandPrefix = manager.getCommandPrefix(sender); + String commandPrefix = this.manager.getCommandPrefix(sender); if (!messageContent.startsWith(commandPrefix)) { return; } messageContent = messageContent.replaceFirst(commandPrefix, ""); final String finalContent = messageContent; - if (((StaticArgument) command).getAliases() + if (((StaticArgument) this.command).getAliases() .stream() .map(String::toLowerCase) .noneMatch(commandAlias -> finalContent.toLowerCase().startsWith(commandAlias))) { return; } - manager.executeCommand(sender, finalContent) + this.manager.executeCommand(sender, finalContent) .whenComplete((commandResult, throwable) -> { if (throwable == null) { return; @@ -109,7 +109,7 @@ public class JavacordCommand implements MessageCreateListener { } if (throwable instanceof InvalidSyntaxException) { - manager.handleException( + this.manager.handleException( sender, InvalidSyntaxException.class, (InvalidSyntaxException) throwable, @@ -123,7 +123,7 @@ public class JavacordCommand implements MessageCreateListener { } if (throwable instanceof InvalidCommandSenderException) { - manager.handleException( + this.manager.handleException( sender, InvalidCommandSenderException.class, (InvalidCommandSenderException) throwable, @@ -134,7 +134,7 @@ public class JavacordCommand implements MessageCreateListener { } if (throwable instanceof NoPermissionException) { - manager.handleException( + this.manager.handleException( sender, NoPermissionException.class, (NoPermissionException) throwable, @@ -145,7 +145,7 @@ public class JavacordCommand implements MessageCreateListener { } if (throwable instanceof ArgumentParseException) { - manager.handleException( + this.manager.handleException( sender, ArgumentParseException.class, (ArgumentParseException) throwable, @@ -157,7 +157,7 @@ public class JavacordCommand implements MessageCreateListener { } if (throwable instanceof CommandExecutionException) { - manager.handleException( + this.manager.handleException( sender, CommandExecutionException.class, (CommandExecutionException) throwable, diff --git a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordCommandSender.java b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordCommandSender.java index b4418305..cb370740 100644 --- a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordCommandSender.java +++ b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordCommandSender.java @@ -104,7 +104,7 @@ public class JavacordCommandSender { */ @NonNull public CompletableFuture sendErrorMessage(final @Nullable String message) { - return sendMessage(":x: " + message); + return this.sendMessage(":x: " + message); } /** @@ -115,7 +115,7 @@ public class JavacordCommandSender { */ @NonNull public CompletableFuture sendSuccessMessage(final @Nullable String message) { - return sendMessage(":white_check_mark: " + message); + return this.sendMessage(":white_check_mark: " + message); } } diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandListener.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandListener.java index ffb2e5db..687c2f4b 100644 --- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandListener.java +++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandListener.java @@ -77,7 +77,7 @@ public class JDACommandListener extends ListenerAdapter { content = content.substring(prefix.length()); - commandManager.executeCommand(sender, content) + this.commandManager.executeCommand(sender, content) .whenComplete((commandResult, throwable) -> { if (throwable == null) { return; diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandManager.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandManager.java index 4e4ba561..c3d17c0c 100644 --- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandManager.java +++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandManager.java @@ -126,7 +126,7 @@ public class JDACommandManager extends CommandManager { * @return JDA instance */ public final @NonNull JDA getJDA() { - return jda; + return this.jda; } /** diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/ChannelArgument.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/ChannelArgument.java index 7dd7ea68..e3836605 100644 --- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/ChannelArgument.java +++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/ChannelArgument.java @@ -96,7 +96,7 @@ public final class ChannelArgument extends CommandArgument * @return List of Modes */ public @NotNull Set getModes() { - return modes; + return this.modes; } @@ -133,7 +133,7 @@ public final class ChannelArgument extends CommandArgument */ @Override public @NonNull ChannelArgument build() { - return new ChannelArgument<>(this.isRequired(), this.getName(), modes); + return new ChannelArgument<>(this.isRequired(), this.getName(), this.modes); } } @@ -183,7 +183,7 @@ public final class ChannelArgument extends CommandArgument return ArgumentParseResult.failure(new IllegalArgumentException("Channel arguments can only be parsed in guilds")); } - if (modes.contains(ParserMode.MENTION)) { + if (this.modes.contains(ParserMode.MENTION)) { if (input.startsWith("<#") && input.endsWith(">")) { final String id = input.substring(2, input.length() - 1); @@ -201,7 +201,7 @@ public final class ChannelArgument extends CommandArgument } } - if (modes.contains(ParserMode.ID)) { + if (this.modes.contains(ParserMode.ID)) { try { final ArgumentParseResult result = this.channelFromId(event, input, input); inputQueue.remove(); @@ -211,7 +211,7 @@ public final class ChannelArgument extends CommandArgument } } - if (modes.contains(ParserMode.NAME)) { + if (this.modes.contains(ParserMode.NAME)) { final List channels = event.getGuild().getTextChannelsByName(input, true); if (channels.size() == 0) { @@ -271,7 +271,7 @@ public final class ChannelArgument extends CommandArgument * @return users input */ public final @NonNull String getInput() { - return input; + return this.input; } } diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/RoleArgument.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/RoleArgument.java index 19043104..45d36b30 100644 --- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/RoleArgument.java +++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/RoleArgument.java @@ -96,7 +96,7 @@ public final class RoleArgument extends CommandArgument { * @return List of Modes */ public @NotNull Set getModes() { - return modes; + return this.modes; } @@ -133,7 +133,7 @@ public final class RoleArgument extends CommandArgument { */ @Override public @NonNull RoleArgument build() { - return new RoleArgument<>(this.isRequired(), this.getName(), modes); + return new RoleArgument<>(this.isRequired(), this.getName(), this.modes); } } @@ -183,7 +183,7 @@ public final class RoleArgument extends CommandArgument { return ArgumentParseResult.failure(new IllegalArgumentException("Role arguments can only be parsed in guilds")); } - if (modes.contains(ParserMode.MENTION)) { + if (this.modes.contains(ParserMode.MENTION)) { if (input.startsWith("<@&") && input.endsWith(">")) { final String id = input.substring(3, input.length() - 1); @@ -201,7 +201,7 @@ public final class RoleArgument extends CommandArgument { } } - if (modes.contains(ParserMode.ID)) { + if (this.modes.contains(ParserMode.ID)) { try { final ArgumentParseResult result = this.roleFromId(event, input, input); inputQueue.remove(); @@ -211,7 +211,7 @@ public final class RoleArgument extends CommandArgument { } } - if (modes.contains(ParserMode.NAME)) { + if (this.modes.contains(ParserMode.NAME)) { final List roles = event.getGuild().getRolesByName(input, true); if (roles.size() == 0) { @@ -271,7 +271,7 @@ public final class RoleArgument extends CommandArgument { * @return users input */ public final @NonNull String getInput() { - return input; + return this.input; } } diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/UserArgument.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/UserArgument.java index 666c140b..2e1aa187 100644 --- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/UserArgument.java +++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/UserArgument.java @@ -102,7 +102,7 @@ public final class UserArgument extends CommandArgument { * @return List of Modes */ public @NotNull Set getModes() { - return modes; + return this.modes; } @@ -167,7 +167,7 @@ public final class UserArgument extends CommandArgument { */ @Override public @NonNull UserArgument build() { - return new UserArgument<>(this.isRequired(), this.getName(), modes, isolationLevel); + return new UserArgument<>(this.isRequired(), this.getName(), this.modes, this.isolationLevel); } } @@ -228,7 +228,7 @@ public final class UserArgument extends CommandArgument { final MessageReceivedEvent event = commandContext.get("MessageReceivedEvent"); Exception exception = null; - if (modes.contains(ParserMode.MENTION)) { + if (this.modes.contains(ParserMode.MENTION)) { if (input.startsWith("<@") && input.endsWith(">")) { final String id; if (input.startsWith("<@!")) { @@ -251,7 +251,7 @@ public final class UserArgument extends CommandArgument { } } - if (modes.contains(ParserMode.ID)) { + if (this.modes.contains(ParserMode.ID)) { try { final ArgumentParseResult result = this.userFromId(event, input, input); inputQueue.remove(); @@ -261,10 +261,10 @@ public final class UserArgument extends CommandArgument { } } - if (modes.contains(ParserMode.NAME)) { + if (this.modes.contains(ParserMode.NAME)) { final List users; - if (isolationLevel == Isolation.GLOBAL) { + if (this.isolationLevel == Isolation.GLOBAL) { users = event.getJDA().getUsersByName(input, true); } else if (event.isFromGuild()) { users = event.getGuild().getMembersByEffectiveName(input, true) @@ -302,7 +302,7 @@ public final class UserArgument extends CommandArgument { ) throws UserNotFoundParseException, NumberFormatException { final User user; - if (isolationLevel == Isolation.GLOBAL) { + if (this.isolationLevel == Isolation.GLOBAL) { user = event.getJDA().getUserById(id); } else if (event.isFromGuild()) { Member member = event.getGuild().getMemberById(id); @@ -344,7 +344,7 @@ public final class UserArgument extends CommandArgument { * @return Users input */ public final @NonNull String getInput() { - return input; + return this.input; } } diff --git a/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/CloudListenerAdapter.java b/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/CloudListenerAdapter.java index 3578307d..a0e48673 100644 --- a/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/CloudListenerAdapter.java +++ b/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/CloudListenerAdapter.java @@ -54,7 +54,7 @@ final class CloudListenerAdapter extends ListenerAdapter { return; } final C sender = this.manager.getUserMapper().apply(event.getUser()); - manager.executeCommand(sender, message.substring(this.manager.getCommandPrefix().length())) + this.manager.executeCommand(sender, message.substring(this.manager.getCommandPrefix().length())) .whenComplete((commandResult, throwable) -> { if (throwable == null) { return; diff --git a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java index 46539118..804b5550 100644 --- a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java +++ b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java @@ -488,7 +488,7 @@ public final class CloudBrigadierManager { for (final CommandTree.Node> node : root.getChildren()) { argumentBuilders[parsers.length - 1] - .then(constructCommandNode(forceExecutor, node, permissionChecker, executor, suggestionProvider)); + .then(this.constructCommandNode(forceExecutor, node, permissionChecker, executor, suggestionProvider)); } return argumentBuilders[0]; @@ -536,7 +536,7 @@ public final class CloudBrigadierManager { argumentBuilder.executes(executor); } for (final CommandTree.Node> node : root.getChildren()) { - argumentBuilder.then(constructCommandNode(forceExecutor, node, permissionChecker, executor, suggestionProvider)); + argumentBuilder.then(this.constructCommandNode(forceExecutor, node, permissionChecker, executor, suggestionProvider)); } return argumentBuilder; } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitBrigadierMapper.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitBrigadierMapper.java index bd749d12..c3a9b459 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitBrigadierMapper.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitBrigadierMapper.java @@ -72,7 +72,7 @@ public final class BukkitBrigadierMapper { /* Detect Minecraft Version Metadata */ final String version = Bukkit.getServer().getClass().getPackage().getName(); this.nmsVersion = version.substring(version.lastIndexOf(".") + 1); - final int majorMinecraftVersion = Integer.parseInt(nmsVersion.split("_")[1]); + final int majorMinecraftVersion = Integer.parseInt(this.nmsVersion.split("_")[1]); try { /* UUID nms argument is a 1.16+ feature */ diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java index 73743e29..32f8e596 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java @@ -52,9 +52,9 @@ final class BukkitCommandPreprocessor implements CommandPreprocessor { */ @Override public void accept(final @NonNull CommandPreprocessingContext context) { - context.getCommandContext().store("BukkitCommandSender", mgr.getBackwardsCommandSenderMapper().apply( + context.getCommandContext().store("BukkitCommandSender", this.mgr.getBackwardsCommandSenderMapper().apply( context.getCommandContext().getSender())); - context.getCommandContext().store("CloudBukkitCapabilities", mgr.queryCapabilities()); + context.getCommandContext().store("CloudBukkitCapabilities", this.mgr.queryCapabilities()); } } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandSender.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandSender.java index f00d74fc..0d27c732 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandSender.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandSender.java @@ -84,12 +84,12 @@ public abstract class BukkitCommandSender { return false; } final BukkitCommandSender that = (BukkitCommandSender) o; - return Objects.equal(internalSender, that.internalSender); + return Objects.equal(this.internalSender, that.internalSender); } @Override public final int hashCode() { - return Objects.hashCode(internalSender); + return Objects.hashCode(this.internalSender); } /** diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPluginRegistrationHandler.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPluginRegistrationHandler.java index db7b9057..4c65f531 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPluginRegistrationHandler.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPluginRegistrationHandler.java @@ -64,7 +64,7 @@ public class BukkitPluginRegistrationHandler implements CommandRegistrationHa final Field knownCommands = SimpleCommandMap.class.getDeclaredField("knownCommands"); knownCommands.setAccessible(true); @SuppressWarnings("unchecked") final Map bukkitCommands = - (Map) knownCommands.get(commandMap); + (Map) knownCommands.get(this.commandMap); this.bukkitCommands = bukkitCommands; this.bukkitCommandManager = bukkitCommandManager; Bukkit.getHelpMap().registerHelpTopicFactory(BukkitCommand.class, GenericCommandHelpTopic::new); diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudCommodoreManager.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudCommodoreManager.java index 193847dc..15b04bba 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudCommodoreManager.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudCommodoreManager.java @@ -60,7 +60,7 @@ class CloudCommodoreManager extends BukkitPluginRegistrationHandler { )); this.brigadierManager.brigadierSenderMapper( sender -> this.commandManager.getCommandSenderMapper().apply( - commodore.getBukkitSender(sender) + this.commodore.getBukkitSender(sender) ) ); new BukkitBrigadierMapper<>(this.commandManager, this.brigadierManager); diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/MultiplePlayerSelector.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/MultiplePlayerSelector.java index 33d45b73..b5fbbc30 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/MultiplePlayerSelector.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/MultiplePlayerSelector.java @@ -51,7 +51,7 @@ public class MultiplePlayerSelector extends MultipleEntitySelector { if (e.getType() != EntityType.PLAYER) { throw new IllegalArgumentException("Non-players selected in player selector."); } else { - players.add((Player) e); + this.players.add((Player) e); } }); } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java index 2d9a17da..49f5a7df 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java @@ -219,7 +219,7 @@ public final class OfflinePlayerArgument extends CommandArgument extends CommandArgument { * @return String value */ public @NonNull String getInput() { - return input; + return this.input; } } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinate.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinate.java index c4da521a..f5de70ea 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinate.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinate.java @@ -86,13 +86,13 @@ public final class LocationCoordinate { return false; } final LocationCoordinate that = (LocationCoordinate) o; - return Double.compare(that.coordinate, coordinate) == 0 - && type == that.type; + return Double.compare(that.coordinate, this.coordinate) == 0 + && this.type == that.type; } @Override public int hashCode() { - return Objects.hash(type, coordinate); + return Objects.hash(this.type, this.coordinate); } @Override diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorParseException.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorParseException.java index 15f9c428..a0a46581 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorParseException.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorParseException.java @@ -69,7 +69,7 @@ public final class SelectorParseException extends ParserException { * @return String value */ public @NonNull String getInput() { - return input; + return this.input; } /** diff --git a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandPreprocessor.java b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandPreprocessor.java index 1721cc0e..aa574fef 100644 --- a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandPreprocessor.java +++ b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandPreprocessor.java @@ -49,7 +49,7 @@ final class BungeeCommandPreprocessor implements CommandPreprocessor { @Override public void accept(final @NonNull CommandPreprocessingContext context) { - context.getCommandContext().store(BungeeContextKeys.PROXY_SERVER_KEY, mgr.getOwningPlugin().getProxy()); + context.getCommandContext().store(BungeeContextKeys.PROXY_SERVER_KEY, this.mgr.getOwningPlugin().getProxy()); } } diff --git a/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommand.java b/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommand.java index 315936c4..e504f9be 100644 --- a/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommand.java +++ b/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommand.java @@ -132,7 +132,7 @@ final class CloudburstCommand extends PluginCommand { CommandExecutionException.class, (CommandExecutionException) throwable, (c, e) -> { commandSender.sendMessage(MESSAGE_INTERNAL_ERROR); - manager.getOwningPlugin().getLogger().error( + this.manager.getOwningPlugin().getLogger().error( "Exception executing command handler", finalThrowable.getCause() ); @@ -140,7 +140,7 @@ final class CloudburstCommand extends PluginCommand { ); } else { commandSender.sendMessage(MESSAGE_INTERNAL_ERROR); - manager.getOwningPlugin().getLogger().error( + this.manager.getOwningPlugin().getLogger().error( "An unhandled exception was thrown during command execution", throwable ); diff --git a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/Pagination.java b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/Pagination.java index 23ef1512..625a2399 100644 --- a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/Pagination.java +++ b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/Pagination.java @@ -57,7 +57,7 @@ final class Pagination { ) { final int pages = (int) Math.ceil(content.size() / (itemsPerPage * 1.00)); if (page < 1 || page > pages) { - return Collections.singletonList(outOfRangeRenderer.apply(page, pages)); + return Collections.singletonList(this.outOfRangeRenderer.apply(page, pages)); } final List renderedContent = new ArrayList<>(this.headerRenderer.apply(page, pages)); diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandPreprocessor.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandPreprocessor.java index 059a9e4e..1614c9a0 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandPreprocessor.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandPreprocessor.java @@ -51,7 +51,7 @@ final class VelocityCommandPreprocessor implements CommandPreprocessor { public void accept(final @NonNull CommandPreprocessingContext context) { context.getCommandContext().store( VelocityContextKeys.PROXY_SERVER_KEY, - mgr.getProxyServer() + this.mgr.getProxyServer() ); } diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityPluginRegistrationHandler.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityPluginRegistrationHandler.java index 1d66a94a..4e732789 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityPluginRegistrationHandler.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityPluginRegistrationHandler.java @@ -71,7 +71,7 @@ final class VelocityPluginRegistrationHandler implements CommandRegistrationH p ), true, - new VelocityExecutor<>(manager) + new VelocityExecutor<>(this.manager) ) ); final CommandMeta commandMeta = this.manager.getProxyServer().getCommandManager() diff --git a/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodService.java b/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodService.java index 2e673bb4..f0594d8d 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodService.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodService.java @@ -69,7 +69,7 @@ class AnnotatedMethodService implements Service defaultImplementation ) { synchronized (this.lock) { - if (repositories.containsKey(type.getType())) { + if (this.repositories.containsKey(type.getType())) { throw new IllegalArgumentException(String .format( "Service of type '%s' has already been registered", @@ -151,7 +151,7 @@ public final class ServicePipeline { final @NonNull Collection> filters ) { synchronized (this.lock) { - final ServiceRepository repository = getRepository(type); + final ServiceRepository repository = this.getRepository(type); repository.registerImplementation(implementation, filters); } return this; @@ -175,7 +175,7 @@ public final class ServicePipeline { final @NonNull Service implementation, final @NonNull Collection> filters ) { - return registerServiceImplementation(TypeToken.get(type), implementation, filters); + return this.registerServiceImplementation(TypeToken.get(type), implementation, filters); } /** @@ -229,7 +229,7 @@ public final class ServicePipeline { public > Collection> getImplementations( final @NonNull TypeToken type ) { - ServiceRepository repository = getRepository(type); + ServiceRepository repository = this.getRepository(type); List> collection = new LinkedList<>(); final LinkedList.ServiceWrapper>> queue = repository.getQueue(); diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java b/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java index f527f7e7..4432db04 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java @@ -107,7 +107,7 @@ public final class ServiceRepository { final @NonNull T implementation, final @NonNull Collection> filters ) { - this.defaultImplementation = implementations.isEmpty(); + this.defaultImplementation = ServiceRepository.this.implementations.isEmpty(); this.implementation = implementation; this.filters = filters; ExecutionOrder executionOrder = implementation.order(); @@ -139,8 +139,8 @@ public final class ServiceRepository { @Override public String toString() { return String - .format("ServiceWrapper{type=%s,implementation=%s}", serviceType.toString(), - TypeToken.get(implementation.getClass()).toString() + .format("ServiceWrapper{type=%s,implementation=%s}", ServiceRepository.this.serviceType.toString(), + TypeToken.get(this.implementation.getClass()).toString() ); } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java b/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java index dd49eb84..d0f880de 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java @@ -133,7 +133,7 @@ public final class ServiceSpigot { */ public void getResult(final @NonNull BiConsumer consumer) { try { - consumer.accept(getResult(), null); + consumer.accept(this.getResult(), null); } catch (final PipelineException pipelineException) { consumer.accept(null, pipelineException.getCause()); } catch (final Exception e) { @@ -167,7 +167,7 @@ public final class ServiceSpigot { * @return New pump, for the result of this request */ public @NonNull CompletableFuture> forwardAsynchronously() { - return this.getResultAsynchronously().thenApply(pipeline::pump); + return this.getResultAsynchronously().thenApply(this.pipeline::pump); } } diff --git a/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskRecipe.java b/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskRecipe.java index c759fa31..72b516a0 100644 --- a/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskRecipe.java +++ b/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskRecipe.java @@ -127,7 +127,7 @@ public final class TaskRecipe { * @return New task recipe component */ public TaskRecipeComponentOutputting synchronous(final @NonNull TaskFunction function) { - addSynchronous(function); + TaskRecipe.this.addSynchronous(function); return new TaskRecipeComponentOutputting<>(this.initialInput); } @@ -139,7 +139,7 @@ public final class TaskRecipe { * @return New task recipe component */ public TaskRecipeComponentOutputting asynchronous(final @NonNull TaskFunction function) { - addAsynchronous(function); + TaskRecipe.this.addAsynchronous(function); return new TaskRecipeComponentOutputting<>(this.initialInput); } @@ -150,8 +150,8 @@ public final class TaskRecipe { * @return New task recipe component */ public TaskRecipeComponentVoid synchronous(final @NonNull TaskConsumer consumer) { - addSynchronous(consumer); - return new TaskRecipeComponentVoid<>(initialInput); + TaskRecipe.this.addSynchronous(consumer); + return new TaskRecipeComponentVoid<>(this.initialInput); } /** @@ -161,8 +161,8 @@ public final class TaskRecipe { * @return New task recipe component */ public TaskRecipeComponentVoid asynchronous(final @NonNull TaskConsumer consumer) { - addAsynchronous(consumer); - return new TaskRecipeComponentVoid<>(initialInput); + TaskRecipe.this.addAsynchronous(consumer); + return new TaskRecipeComponentVoid<>(this.initialInput); } /** @@ -171,7 +171,7 @@ public final class TaskRecipe { * @param callback Callback function */ public void execute(final @NonNull Runnable callback) { - TaskRecipe.this.execute(initialInput, callback); + TaskRecipe.this.execute(this.initialInput, callback); } /** @@ -204,8 +204,8 @@ public final class TaskRecipe { * @return New task recipe component */ public TaskRecipeComponentVoid synchronous(final @NonNull TaskConsumer consumer) { - addSynchronous(consumer); - return new TaskRecipeComponentVoid<>(initialInput); + TaskRecipe.this.addSynchronous(consumer); + return new TaskRecipeComponentVoid<>(this.initialInput); } /** @@ -215,8 +215,8 @@ public final class TaskRecipe { * @return New task recipe component */ public TaskRecipeComponentVoid asynchronous(final @NonNull TaskConsumer consumer) { - addSynchronous(consumer); - return new TaskRecipeComponentVoid<>(initialInput); + TaskRecipe.this.addSynchronous(consumer); + return new TaskRecipeComponentVoid<>(this.initialInput); } /** @@ -225,7 +225,7 @@ public final class TaskRecipe { * @param callback Callback function */ public void execute(final @NonNull Runnable callback) { - TaskRecipe.this.execute(initialInput, callback); + TaskRecipe.this.execute(this.initialInput, callback); } /** diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/ExamplePlugin.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/ExamplePlugin.java index 9d94b6bc..73ad5814 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/ExamplePlugin.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/ExamplePlugin.java @@ -26,7 +26,6 @@ package cloud.commandframework.examples.bukkit; import cloud.commandframework.ArgumentDescription; import cloud.commandframework.Command; import cloud.commandframework.CommandTree; -import cloud.commandframework.Description; import cloud.commandframework.keys.SimpleCloudKey; import cloud.commandframework.minecraft.extras.MinecraftExceptionHandler; import cloud.commandframework.minecraft.extras.MinecraftHelp; @@ -138,7 +137,7 @@ public final class ExamplePlugin extends JavaPlugin { /* C -> Command Sender */ mapperFunction ); } catch (final Exception e) { - this.getLogger().severe("Failed to initialize the command manager"); + this.getLogger().severe("Failed to initialize the command this.manager"); /* Disable the plugin */ this.getServer().getPluginManager().disablePlugin(this); return; @@ -159,17 +158,17 @@ public final class ExamplePlugin extends JavaPlugin { // // Register Brigadier mappings // - if (manager.queryCapability(CloudBukkitCapabilities.BRIGADIER)) { - manager.registerBrigadier(); + if (this.manager.queryCapability(CloudBukkitCapabilities.BRIGADIER)) { + this.manager.registerBrigadier(); } // // Register asynchronous completions // - if (manager.queryCapability(CloudBukkitCapabilities.ASYNCHRONOUS_COMPLETION)) { + if (this.manager.queryCapability(CloudBukkitCapabilities.ASYNCHRONOUS_COMPLETION)) { ((PaperCommandManager) this.manager).registerAsynchronousCompletions(); } // - // Create the confirmation manager. This allows us to require certain commands to be + // Create the confirmation this.manager. This allows us to require certain commands to be // confirmed before they can be executed // this.confirmationManager = new CommandConfirmationManager<>( @@ -183,7 +182,7 @@ public final class ExamplePlugin extends JavaPlugin { // // Register the confirmation processor. This will enable confirmations for commands that require it // - this.confirmationManager.registerConfirmationProcessor(manager); + this.confirmationManager.registerConfirmationProcessor(this.manager); // // Create the annotation parser. This allows you to define commands using methods annotated with // @CommandMethod @@ -213,7 +212,7 @@ public final class ExamplePlugin extends JavaPlugin { .append(text("Example", NamedTextColor.GOLD)) .append(text("] ", NamedTextColor.DARK_GRAY)) .append(component).build() - ).apply(manager, bukkitAudiences::sender); + ).apply(this.manager, this.bukkitAudiences::sender); // // Create the commands // @@ -266,7 +265,7 @@ public final class ExamplePlugin extends JavaPlugin { ), ArgumentDescription.of("Coordinates") ) - .handler(context -> manager.taskRecipe().begin(context) + .handler(context -> this.manager.taskRecipe().begin(context) .synchronous(commandContext -> { final Player player = (Player) commandContext.getSender(); final World world = commandContext.get(worldArgument); @@ -283,7 +282,7 @@ public final class ExamplePlugin extends JavaPlugin { ) .literal("here") .handler( - context -> manager.taskRecipe().begin(context) + context -> this.manager.taskRecipe().begin(context) .synchronous(commandContext -> { final Player player = (Player) commandContext.getSender(); final SingleEntitySelector singleEntitySelector = commandContext @@ -299,13 +298,13 @@ public final class ExamplePlugin extends JavaPlugin { .command(builder.literal("teleport") .meta(CommandMeta.DESCRIPTION, "Teleport to a world") .argument(WorldArgument.of("world"), ArgumentDescription.of("World to teleport to")) - .handler(context -> manager.taskRecipe().begin(context).synchronous(ctx -> { + .handler(context -> this.manager.taskRecipe().begin(context).synchronous(ctx -> { final Player player = (Player) ctx.getSender(); player.teleport(ctx.get("world").getSpawnLocation()); player.sendMessage(ChatColor.GREEN + "You have been teleported!"); }).execute())); - manager.command(builder.literal("tasktest") - .handler(context -> manager.taskRecipe() + this.manager.command(builder.literal("tasktest") + .handler(context -> this.manager.taskRecipe() .begin(context) .asynchronous(c -> { c.getSender().sendMessage("ASYNC: " + !Bukkit.isPrimaryThread()); @@ -316,7 +315,7 @@ public final class ExamplePlugin extends JavaPlugin { }) .execute(() -> context.getSender().sendMessage("DONE!")) )); - manager.command(manager.commandBuilder("give") + this.manager.command(this.manager.commandBuilder("give") .senderType(Player.class) .argument(MaterialArgument.of("material")) .argument(IntegerArgument.of("amount")) @@ -327,18 +326,18 @@ public final class ExamplePlugin extends JavaPlugin { ((Player) c.getSender()).getInventory().addItem(itemStack); c.getSender().sendMessage("You've been given stuff, bro."); })); - manager.command(builder.literal("summon") + this.manager.command(builder.literal("summon") .senderType(Player.class) .argument(EnumArgument.of(EntityType.class, "type")) - .handler(c -> manager.taskRecipe().begin(c).synchronous(ctx -> { + .handler(c -> this.manager.taskRecipe().begin(c).synchronous(ctx -> { final Location loc = ((Player) ctx.getSender()).getLocation(); loc.getWorld().spawnEntity(loc, ctx.get("type")); }).execute())); - manager.command(builder.literal("enchant") + this.manager.command(builder.literal("enchant") .senderType(Player.class) .argument(EnchantmentArgument.of("enchant")) .argument(IntegerArgument.of("level")) - .handler(c -> manager.taskRecipe().begin(c).synchronous(ctx -> { + .handler(c -> this.manager.taskRecipe().begin(c).synchronous(ctx -> { final Player player = ((Player) ctx.getSender()); player.getInventory().getItemInHand().addEnchantment(ctx.get("enchant"), ctx.get("level")); }).execute())); @@ -346,7 +345,7 @@ public final class ExamplePlugin extends JavaPlugin { // // A command to change the color scheme for the help command // - manager.command(builder + this.manager.command(builder .meta(CommandMeta.DESCRIPTION, "Sets the color scheme for '/example help'") .literal("helpcolors") .argument( @@ -369,7 +368,7 @@ public final class ExamplePlugin extends JavaPlugin { TextColorArgument.of("accent"), RichDescription.of(text("The color used for accents and symbols")) ) - .handler(c -> minecraftHelp.setHelpColors(MinecraftHelp.HelpColors.of( + .handler(c -> this.minecraftHelp.setHelpColors(MinecraftHelp.HelpColors.of( c.get("primary"), c.get("highlight"), c.get("alternate_highlight"), @@ -381,8 +380,8 @@ public final class ExamplePlugin extends JavaPlugin { // // Create a Bukkit-like command // - manager.command( - manager.commandBuilder( + this.manager.command( + this.manager.commandBuilder( "arraycommand", ArgumentDescription.of("Bukkit-esque cmmand") ).argument( @@ -405,8 +404,8 @@ public final class ExamplePlugin extends JavaPlugin { /* Register a custom regex caption */ final Caption moneyCaption = Caption.of("regex.money"); - if (manager.getCaptionRegistry() instanceof SimpleCaptionRegistry) { - ((SimpleCaptionRegistry) manager.getCaptionRegistry()).registerMessageFactory( + if (this.manager.getCaptionRegistry() instanceof SimpleCaptionRegistry) { + ((SimpleCaptionRegistry) this.manager.getCaptionRegistry()).registerMessageFactory( moneyCaption, (sender, key) -> "'{input}' is not very cash money of you" ); @@ -471,7 +470,7 @@ public final class ExamplePlugin extends JavaPlugin { final @Argument("money") @Regex(value = "(?=.*?\\d)^\\$?(([1-9]\\d{0,2}(,\\d{3})*)|\\d+)?(\\.\\d{1,2})?$", failureCaption = "regex.money") String money ) { - bukkitAudiences.sender(sender).sendMessage( + this.bukkitAudiences.sender(sender).sendMessage( Identity.nil(), text().append(text("You have been given ", NamedTextColor.AQUA)) .append(text(money, NamedTextColor.GOLD)) diff --git a/examples/example-bungee/src/main/java/cloud/commandframework/examples/bungee/ExamplePlugin.java b/examples/example-bungee/src/main/java/cloud/commandframework/examples/bungee/ExamplePlugin.java index f133887a..66570bec 100644 --- a/examples/example-bungee/src/main/java/cloud/commandframework/examples/bungee/ExamplePlugin.java +++ b/examples/example-bungee/src/main/java/cloud/commandframework/examples/bungee/ExamplePlugin.java @@ -70,7 +70,7 @@ public final class ExamplePlugin extends Plugin { mapperFunction ); } catch (final Exception e) { - this.getLogger().severe("Failed to initialize the command manager"); + this.getLogger().severe("Failed to initialize the command this.manager"); return; } @@ -79,14 +79,14 @@ public final class ExamplePlugin extends Plugin { this.confirmationManager = new CommandConfirmationManager<>( 30L, TimeUnit.SECONDS, - context -> bungeeAudiences.sender(context.getCommandContext().getSender()).sendMessage( + context -> this.bungeeAudiences.sender(context.getCommandContext().getSender()).sendMessage( text( "Confirmation required. Confirm using /example confirm.", NamedTextColor.RED)), - sender -> bungeeAudiences.sender(sender).sendMessage( + sender -> this.bungeeAudiences.sender(sender).sendMessage( text("You do not have any pending commands.", NamedTextColor.RED)) ); - this.confirmationManager.registerConfirmationProcessor(manager); + this.confirmationManager.registerConfirmationProcessor(this.manager); new MinecraftExceptionHandler() .withInvalidSyntaxHandler() @@ -98,7 +98,7 @@ public final class ExamplePlugin extends Plugin { .append(text("Example", NamedTextColor.GOLD)) .append(text("] ", NamedTextColor.DARK_GRAY)) .append(component).build() - ).apply(manager, bungeeAudiences::sender); + ).apply(this.manager, this.bungeeAudiences::sender); this.constructCommands(); } @@ -121,12 +121,12 @@ public final class ExamplePlugin extends Plugin { // Create a player command // this.manager.command( - manager.commandBuilder("player") + this.manager.commandBuilder("player") .senderType(ProxiedPlayer.class) .argument(playerArgument, RichDescription.of(text("Player ").append(text("name", NamedTextColor.GOLD)))) .handler(context -> { final ProxiedPlayer player = context.get("player"); - bungeeAudiences.sender(context.getSender()).sendMessage( + this.bungeeAudiences.sender(context.getSender()).sendMessage( text("Selected ", NamedTextColor.GOLD) .append(text(player.getDisplayName(), NamedTextColor.AQUA)) ); @@ -142,7 +142,7 @@ public final class ExamplePlugin extends Plugin { .argument(serverArgument, ArgumentDescription.of("Server name")) .handler(context -> { final ServerInfo server = context.get("server"); - bungeeAudiences.sender(context.getSender()).sendMessage( + this.bungeeAudiences.sender(context.getSender()).sendMessage( text("Selected ", NamedTextColor.GOLD) .append(text(server.getName(), NamedTextColor.AQUA)) ); diff --git a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/CustomUser.java b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/CustomUser.java index b05b1de3..54ee5089 100644 --- a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/CustomUser.java +++ b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/CustomUser.java @@ -69,7 +69,7 @@ public abstract class CustomUser { * @return Sending user */ public final @NonNull User getUser() { - return user; + return this.user; } /** @@ -78,7 +78,7 @@ public abstract class CustomUser { * @return Message channel */ public final @NonNull MessageChannel getChannel() { - return channel; + return this.channel; } } diff --git a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/GuildUser.java b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/GuildUser.java index 821d31cd..7d9d75a2 100644 --- a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/GuildUser.java +++ b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/GuildUser.java @@ -53,7 +53,7 @@ public final class GuildUser extends CustomUser { * @return Sending member */ public @NonNull Member getMember() { - return member; + return this.member; } /** @@ -62,7 +62,7 @@ public final class GuildUser extends CustomUser { * @return Message channel */ public @NonNull TextChannel getTextChannel() { - return channel; + return this.channel; } } diff --git a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/PrivateUser.java b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/PrivateUser.java index ec6faeec..7ba4862d 100644 --- a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/PrivateUser.java +++ b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/PrivateUser.java @@ -51,7 +51,7 @@ public final class PrivateUser extends CustomUser { * @return Private channel */ public @NonNull PrivateChannel getPrivateChannel() { - return privateChannel; + return this.privateChannel; } } diff --git a/examples/example-velocity/src/main/java/cloud/commandframework/examples/velocity/ExampleVelocityPlugin.java b/examples/example-velocity/src/main/java/cloud/commandframework/examples/velocity/ExampleVelocityPlugin.java index 7737a2d9..1619faf8 100644 --- a/examples/example-velocity/src/main/java/cloud/commandframework/examples/velocity/ExampleVelocityPlugin.java +++ b/examples/example-velocity/src/main/java/cloud/commandframework/examples/velocity/ExampleVelocityPlugin.java @@ -62,7 +62,7 @@ public final class ExampleVelocityPlugin { */ @Subscribe public void onProxyInitialization(final @NonNull ProxyInitializeEvent event) { - final Injector childInjector = injector.createChildInjector( + final Injector childInjector = this.injector.createChildInjector( new CloudInjectionModule<>( CommandSource.class, CommandExecutionCoordinator.simpleCoordinator(),