zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

chore: make code style consistent

Browse source
This commit is contained in:
Citymonstret 2022-06-10 10:24:50 +02:00 • committed by Jason
parent a2cea2f33e
commit 89ec3fbf29
380 changed files with 479 additions and 936 deletions
Download patch file Download diff file Expand all files Collapse all files

153
cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/CloudCommandCallable.java
View file

@ -49,11 +49,15 @@ import org.spongepowered.api.world.World;
final class CloudCommandCallable<C> implements CommandCallable {
private static final Text MESSAGE_INTERNAL_ERROR = Text.of(TextColors.RED,
"An internal error occurred while attempting to perform this command.");
private static final Text MESSAGE_NO_PERMS = Text.of(TextColors.RED,
"I'm sorry, but you do not have permission to perform this command. "
+ "Please contact the server administrators if you believe that this is in error.");
private static final Text MESSAGE_INTERNAL_ERROR = Text.of(
TextColors.RED,
"An internal error occurred while attempting to perform this command."
);
private static final Text MESSAGE_NO_PERMS = Text.of(
TextColors.RED,
"I'm sorry, but you do not have permission to perform this command. "
+ "Please contact the server administrators if you believe that this is in error."
);
private static final Text MESSAGE_UNKNOWN_COMMAND = Text.of("Unknown command. Type \"/help\" for help.");
private final CommandArgument<?, ?> command;
@ -61,9 +65,9 @@ final class CloudCommandCallable<C> implements CommandCallable {
private final SpongeCommandManager<C> manager;
CloudCommandCallable(
final CommandArgument<?, ?> command,
final Command<C> cloudCommand,
final SpongeCommandManager<C> manager
final CommandArgument<?, ?> command,
final Command<C> cloudCommand,
final SpongeCommandManager<C> manager
) {
this.command = command;
this.cloudCommand = cloudCommand;
@ -75,65 +79,72 @@ final class CloudCommandCallable<C> implements CommandCallable {
final C cloudSender = this.manager.getCommandSourceMapper().apply(source);
this.manager.executeCommand(cloudSender, this.formatCommand(arguments))
.whenComplete((result, throwable) -> {
if (throwable != null) {
if (throwable instanceof CompletionException) {
throwable = throwable.getCause();
.whenComplete((result, throwable) -> {
if (throwable != null) {
if (throwable instanceof CompletionException) {
throwable = throwable.getCause();
}
final Throwable finalThrowable = throwable;
if (throwable instanceof InvalidSyntaxException) {
this.manager.handleException(cloudSender,
InvalidSyntaxException.class,
(InvalidSyntaxException) throwable, (c, e) ->
source.sendMessage(Text.of(
TextColors.RED,
"Invalid Command Syntax. Correct command syntax is: ",
Text.of(
TextColors.GRAY,
((InvalidSyntaxException) finalThrowable).getCorrectSyntax()
)
))
);
} else if (throwable instanceof InvalidCommandSenderException) {
this.manager.handleException(cloudSender,
InvalidCommandSenderException.class,
(InvalidCommandSenderException) throwable, (c, e) ->
source.sendMessage(Text.of(TextColors.RED, finalThrowable.getMessage()))
);
} else if (throwable instanceof NoPermissionException) {
this.manager.handleException(cloudSender,
NoPermissionException.class,
(NoPermissionException) throwable, (c, e) ->
source.sendMessage(MESSAGE_NO_PERMS)
);
} else if (throwable instanceof NoSuchCommandException) {
this.manager.handleException(cloudSender,
NoSuchCommandException.class,
(NoSuchCommandException) throwable, (c, e) ->
source.sendMessage(MESSAGE_UNKNOWN_COMMAND)
);
} else if (throwable instanceof ArgumentParseException) {
this.manager.handleException(cloudSender,
ArgumentParseException.class,
(ArgumentParseException) throwable, (c, e) ->
source.sendMessage(Text.of(
"Invalid Command Argument: ",
this.formatMessage(finalThrowable.getCause())
))
);
} else if (throwable instanceof CommandExecutionException) {
this.manager.handleException(cloudSender,
CommandExecutionException.class,
(CommandExecutionException) throwable, (c, e) -> {
source.sendMessage(MESSAGE_INTERNAL_ERROR);
this.manager.getOwningPlugin().getLogger().error(
"Exception executing command handler",
finalThrowable.getCause()
);
}
);
} else {
source.sendMessage(MESSAGE_INTERNAL_ERROR);
this.manager.getOwningPlugin().getLogger().error(
"An unhandled exception was thrown during command execution",
throwable
);
}
}
final Throwable finalThrowable = throwable;
if (throwable instanceof InvalidSyntaxException) {
this.manager.handleException(cloudSender,
InvalidSyntaxException.class,
(InvalidSyntaxException) throwable, (c, e) ->
source.sendMessage(Text.of(TextColors.RED,
"Invalid Command Syntax. Correct command syntax is: ",
Text.of(TextColors.GRAY, ((InvalidSyntaxException) finalThrowable).getCorrectSyntax())))
);
} else if (throwable instanceof InvalidCommandSenderException) {
this.manager.handleException(cloudSender,
InvalidCommandSenderException.class,
(InvalidCommandSenderException) throwable, (c, e) ->
source.sendMessage(Text.of(TextColors.RED, finalThrowable.getMessage()))
);
} else if (throwable instanceof NoPermissionException) {
this.manager.handleException(cloudSender,
NoPermissionException.class,
(NoPermissionException) throwable, (c, e) ->
source.sendMessage(MESSAGE_NO_PERMS)
);
} else if (throwable instanceof NoSuchCommandException) {
this.manager.handleException(cloudSender,
NoSuchCommandException.class,
(NoSuchCommandException) throwable, (c, e) ->
source.sendMessage(MESSAGE_UNKNOWN_COMMAND)
);
} else if (throwable instanceof ArgumentParseException) {
this.manager.handleException(cloudSender,
ArgumentParseException.class,
(ArgumentParseException) throwable, (c, e) ->
source.sendMessage(Text.of("Invalid Command Argument: ",
this.formatMessage(finalThrowable.getCause())))
);
} else if (throwable instanceof CommandExecutionException) {
this.manager.handleException(cloudSender,
CommandExecutionException.class,
(CommandExecutionException) throwable, (c, e) -> {
source.sendMessage(MESSAGE_INTERNAL_ERROR);
this.manager.getOwningPlugin().getLogger().error(
"Exception executing command handler",
finalThrowable.getCause()
);
}
);
} else {
source.sendMessage(MESSAGE_INTERNAL_ERROR);
this.manager.getOwningPlugin().getLogger().error(
"An unhandled exception was thrown during command execution",
throwable
);
}
}
});
});
return CommandResult.success();
}
@ -171,7 +182,10 @@ final class CloudCommandCallable<C> implements CommandCallable {
@Override
public boolean testPermission(final @NonNull CommandSource source) {
return this.manager.hasPermission(this.manager.getCommandSourceMapper().apply(source), this.cloudCommand.getCommandPermission());
return this.manager.hasPermission(
this.manager.getCommandSourceMapper().apply(source),
this.cloudCommand.getCommandPermission()
);
}
@Override
@ -197,9 +211,8 @@ final class CloudCommandCallable<C> implements CommandCallable {
@Override
public Text getUsage(final @NonNull CommandSource source) {
return Text.of(this.manager.getCommandSyntaxFormatter().apply(
Collections.emptyList(),
this.manager.getCommandTree().getNamedNode(this.command.getName())
Collections.emptyList(),
this.manager.getCommandTree().getNamedNode(this.command.getName())
));
}
}

1
cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/CloudInjectionModule.java
View file

@ -90,5 +90,4 @@ public final class CloudInjectionModule<C> extends AbstractModule {
final Key backwardsCommandSenderMapperFunctionKey = Key.get(backwardsCommandSenderMapperFunction);
this.bind(backwardsCommandSenderMapperFunctionKey).toInstance(this.backwardsCommandSenderMapper);
}
}

9
cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/SpongeCommandManager.java
View file

@ -69,10 +69,10 @@ public class SpongeCommandManager<C> extends CommandManager<C> {
@Inject
@SuppressWarnings("unchecked")
public SpongeCommandManager(
final @NonNull PluginContainer container,
final @NonNull Function<CommandTree<C>, CommandExecutionCoordinator<C>> commandExecutionCoordinator,
final Function<CommandSource, C> forwardMapper,
final Function<C, CommandSource> reverseMapper
final @NonNull PluginContainer container,
final @NonNull Function<CommandTree<C>, CommandExecutionCoordinator<C>> commandExecutionCoordinator,
final Function<CommandSource, C> forwardMapper,
final Function<C, CommandSource> reverseMapper
) {
super(commandExecutionCoordinator, new SpongePluginRegistrationHandler<>());
this.owningPlugin = requireNonNull(container, "container");
@ -112,5 +112,4 @@ public class SpongeCommandManager<C> extends CommandManager<C> {
final PluginContainer getOwningPlugin() {
return this.owningPlugin;
}
}

1
cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/SpongeMetaKeys.java
View file

@ -48,5 +48,4 @@ public final class SpongeMetaKeys {
Text.class,
"cloud:sponge7/rich_long_description"
);
}

14
cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/SpongePluginRegistrationHandler.java
View file

@ -52,16 +52,16 @@ final class SpongePluginRegistrationHandler<C> implements CommandRegistrationHan
}
final CloudCommandCallable<C> callable = new CloudCommandCallable<>(
commandArgument,
(Command<C>) command,
this.manager);
commandArgument,
(Command<C>) command,
this.manager
);
this.registeredCommands.put(commandArgument, callable);
return Sponge.getGame().getCommandManager().register(
this.manager.getOwningPlugin(),
callable,
ImmutableList.copyOf(commandArgument.getAliases())
this.manager.getOwningPlugin(),
callable,
ImmutableList.copyOf(commandArgument.getAliases())
).isPresent();
}
}