chore: Moving shit around

distributor-command-cloud/src/main/java/com/xpdustry/distributor/command/cloud/parser/PlayerInfoParser.java

@@ -39,9 +39,11 @@ public CompletableFuture<ArgumentParseResult<Administration.PlayerInfo>> parseFu
  .findOfflinePlayers(query, true)
  .thenApply(result -> {
  if (result.isEmpty()) {
- return ArgumentParseResult.failure(new PlayerParser.PlayerNotFoundException(query, ctx));
+ return ArgumentParseResult.failure(
+ new PlayerParseException.PlayerNotFound(PlayerInfoParser.class, query, ctx));
  } else if (result.size() > 1) {
- return ArgumentParseResult.failure(new PlayerParser.TooManyPlayersFoundException(query, ctx));
+ return ArgumentParseResult.failure(
+ new PlayerParseException.TooManyPlayers(PlayerInfoParser.class, query, ctx));
  } else {
  return ArgumentParseResult.success(result.get(0));
  }

distributor-command-cloud/src/main/java/com/xpdustry/distributor/command/cloud/parser/PlayerParseException.java

@@ -0,0 +1,85 @@
+/*
+ * Distributor, a feature-rich framework for Mindustry plugins.
+ *
+ * Copyright (C) 2024 Xpdustry
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.xpdustry.distributor.command.cloud.parser;
+
+import com.xpdustry.distributor.command.cloud.ArcCaptionKeys;
+import org.incendo.cloud.caption.Caption;
+import org.incendo.cloud.caption.CaptionVariable;
+import org.incendo.cloud.context.CommandContext;
+import org.incendo.cloud.exception.parsing.ParserException;
+
+/**
+ * An exception thrown when a parsing error occurs while searching for a player.
+ */
+public sealed class PlayerParseException extends ParserException {
+
+ private final String input;
+
+ /**
+ * Creates a new {@link PlayerParseException}.
+ *
+ * @param input the input string
+ * @param ctx the command context
+ * @param caption the error caption of this exception
+ */
+ public PlayerParseException(
+ final Class<?> parser, final String input, final CommandContext<?> ctx, final Caption caption) {
+ super(parser, ctx, caption, CaptionVariable.of("input", input));
+ this.input = input;
+ }
+
+ /**
+ * Returns the input string.
+ */
+ public final String getInput() {
+ return this.input;
+ }
+
+ /**
+ * An exception thrown when too many players are found for the given input.
+ */
+ public static final class TooManyPlayers extends PlayerParseException {
+
+ /**
+ * Creates a new {@link TooManyPlayers}.
+ *
+ * @param input the input string
+ * @param ctx the command context
+ */
+ public TooManyPlayers(final Class<?> parser, final String input, final CommandContext<?> ctx) {
+ super(parser, input, ctx, ArcCaptionKeys.ARGUMENT_PARSE_FAILURE_PLAYER_TOO_MANY);
+ }
+ }
+
+ /**
+ * An exception thrown when no player was found for the given input.
+ */
+ public static final class PlayerNotFound extends PlayerParseException {
+
+ /**
+ * Creates a new {@link PlayerNotFound}.
+ *
+ * @param input the input string
+ * @param ctx the command context
+ */
+ public PlayerNotFound(final Class<?> parser, final String input, final CommandContext<?> ctx) {
+ super(parser, input, ctx, ArcCaptionKeys.ARGUMENT_PARSE_FAILURE_PLAYER_NOT_FOUND);
+ }
+ }
+}

distributor-command-cloud/src/main/java/com/xpdustry/distributor/command/cloud/parser/PlayerParser.java

@@ -19,17 +19,13 @@
 package com.xpdustry.distributor.command.cloud.parser;
 
 import arc.Core;
-import com.xpdustry.distributor.command.cloud.ArcCaptionKeys;
 import com.xpdustry.distributor.core.DistributorProvider;
 import com.xpdustry.distributor.core.player.PlayerLookup;
 import java.util.concurrent.CompletableFuture;
 import mindustry.gen.Player;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.incendo.cloud.caption.Caption;
-import org.incendo.cloud.caption.CaptionVariable;
 import org.incendo.cloud.context.CommandContext;
 import org.incendo.cloud.context.CommandInput;
-import org.incendo.cloud.exception.parsing.ParserException;
 import org.incendo.cloud.parser.ArgumentParseResult;
 import org.incendo.cloud.parser.ArgumentParser;
 
@@ -43,9 +39,9 @@ public ArgumentParseResult<Player> parse(final CommandContext<C> ctx, final Comm
  .orElseThrow()
  .findOnlinePlayers(query, true);
  if (result.isEmpty()) {
- return ArgumentParseResult.failure(new PlayerNotFoundException(query, ctx));
+ return ArgumentParseResult.failure(new PlayerParseException.PlayerNotFound(PlayerParser.class, query, ctx));
  } else if (result.size() > 1) {
- return ArgumentParseResult.failure(new TooManyPlayersFoundException(query, ctx));
+ return ArgumentParseResult.failure(new PlayerParseException.TooManyPlayers(PlayerParser.class, query, ctx));
  } else {
  return ArgumentParseResult.success(result.get(0));
  }
@@ -56,63 +52,4 @@ public ArgumentParseResult<Player> parse(final CommandContext<C> ctx, final Comm
  final CommandContext<C> ctx, final CommandInput input) {
  return CompletableFuture.supplyAsync(() -> this.parse(ctx, input), Core.app::post);
  }
-
- /**
- * An exception thrown when a parsing error occurs while searching for a player.
- */
- public static sealed class PlayerParseException extends ParserException {
-
- private final String input;
-
- /**
- * Creates a new {@link PlayerParseException}.
- *
- * @param input the input string
- * @param ctx the command context
- * @param caption the error caption of this exception
- */
- public PlayerParseException(final String input, final CommandContext<?> ctx, final Caption caption) {
- super(PlayerParser.class, ctx, caption, CaptionVariable.of("input", input));
- this.input = input;
- }
-
- /**
- * Returns the input string.
- */
- public final String getInput() {
- return this.input;
- }
- }
-
- /**
- * An exception thrown when too many players are found for the given input.
- */
- public static final class TooManyPlayersFoundException extends PlayerParseException {
-
- /**
- * Creates a new {@link TooManyPlayersFoundException}.
- *
- * @param input the input string
- * @param ctx the command context
- */
- public TooManyPlayersFoundException(final String input, final CommandContext<?> ctx) {
- super(input, ctx, ArcCaptionKeys.ARGUMENT_PARSE_FAILURE_PLAYER_TOO_MANY);
- }
- }
-
- /**
- * An exception thrown when no player was found for the given input.
- */
- public static final class PlayerNotFoundException extends PlayerParseException {
-
- /**
- * Creates a new {@link PlayerNotFoundException}.
- *
- * @param input the input string
- * @param ctx the command context
- */
- public PlayerNotFoundException(final String input, final CommandContext<?> ctx) {
- super(input, ctx, ArcCaptionKeys.ARGUMENT_PARSE_FAILURE_PLAYER_NOT_FOUND);
- }
- }
 }