Skip to content

Commit 79bab8f

Browse files
committed
Update for cloud-core and cloud-minecraft access check changes
1 parent a8267a2 commit 79bab8f

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/internal/ModdedExceptionHandler.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.io.StringWriter;
3030
import java.util.function.BiConsumer;
3131
import java.util.function.Function;
32+
import java.util.stream.Collectors;
3233
import net.minecraft.ChatFormatting;
3334
import net.minecraft.commands.CommandSourceStack;
3435
import net.minecraft.commands.SharedSuggestionProvider;
@@ -169,11 +170,15 @@ M extends CommandManager<C> & BrigadierManagerHolder<C, S>> void registerDefault
169170
));
170171
});
171172
ctx.registerHandler(InvalidCommandSenderException.class, (source, exceptionContext) -> {
173+
final boolean multiple = exceptionContext.exception().requiredSenderTypes().size() > 1;
174+
final String expected = multiple
175+
? exceptionContext.exception().requiredSenderTypes().stream().map(TypeUtils::simpleName).collect(Collectors.joining(", "))
176+
: TypeUtils.simpleName(exceptionContext.exception().requiredSenderTypes().iterator().next());
172177
sendError.accept(source, exceptionContext.context().formatCaption(
173178
captionFormatter,
174-
StandardCaptionKeys.EXCEPTION_INVALID_SENDER,
179+
multiple ? StandardCaptionKeys.EXCEPTION_INVALID_SENDER_LIST : StandardCaptionKeys.EXCEPTION_INVALID_SENDER,
175180
CaptionVariable.of("actual", exceptionContext.context().sender().getClass().getSimpleName()),
176-
CaptionVariable.of("expected", TypeUtils.simpleName(exceptionContext.exception().requiredSender()))
181+
CaptionVariable.of("expected", expected)
177182
));
178183
});
179184
ctx.registerHandler(InvalidSyntaxException.class, (source, exceptionContext) -> {

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ stylecheck = "0.2.1"
55
ktlint = "0.50.0"
66
errorprone = "2.27.1"
77

8-
cloud = "2.0.0-beta.5"
9-
cloudMinecraft = "2.0.0-beta.6"
8+
cloud = "2.0.0-SNAPSHOT"
9+
cloudMinecraft = "2.0.0-SNAPSHOT"
1010

1111
immutables = "2.10.1"
1212

0 commit comments

Comments
 (0)