Skip to content

Commit 2a30a77

Browse files
committed
1.20.6
1 parent 0e7d487 commit 2a30a77

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

cloud-sponge/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ dependencies {
1111
implementation(libs.cloud.brigadier)
1212
implementation(project(":cloud-minecraft-modded-common", configuration = "namedElements"))
1313
compileOnly("org.spongepowered:spongeapi:11.0.0-SNAPSHOT")
14-
compileOnly("org.spongepowered:sponge:1.20.4-11.0.0-SNAPSHOT")
14+
compileOnly("org.spongepowered:sponge:1.20.6-11.0.0-SNAPSHOT")
1515
}
1616

1717
minecraft {
18-
version("1.20.4")
18+
version("1.20.6")
1919
platform(MinecraftPlatform.JOINED)
2020
}

cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeRegistrationHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ private void startedEngine(final StartedEngineEvent<Server> serverStartedEngineE
7777
final MinecraftServer engine = (MinecraftServer) serverStartedEngineEvent.engine();
7878
ContextualArgumentTypeProvider.withBuildContext(
7979
this.commandManager,
80-
CommandBuildContext.configurable(engine.registryAccess(), engine.getWorldData().enabledFeatures()),
80+
CommandBuildContext.simple(engine.registryAccess(), engine.getWorldData().enabledFeatures()),
8181
true,
8282
() -> {
8383
for (final org.incendo.cloud.Command<C> registeredCommand : this.registeredCommands) {

cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ComponentParser.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@
2525

2626
import java.util.concurrent.CompletableFuture;
2727
import net.kyori.adventure.text.Component;
28+
import net.minecraft.commands.arguments.ComponentArgument;
2829
import org.checkerframework.checker.nullness.qual.NonNull;
2930
import org.incendo.cloud.brigadier.parser.WrappedBrigadierParser;
3031
import org.incendo.cloud.context.CommandContext;
3132
import org.incendo.cloud.context.CommandInput;
33+
import org.incendo.cloud.minecraft.modded.internal.ContextualArgumentTypeProvider;
3234
import org.incendo.cloud.parser.ArgumentParseResult;
3335
import org.incendo.cloud.parser.ArgumentParser;
3436
import org.incendo.cloud.parser.ParserDescriptor;
@@ -58,7 +60,7 @@ public static <C> ParserDescriptor<C, Component> componentParser() {
5860

5961
private final ArgumentParser<C, Component> mappedParser =
6062
new WrappedBrigadierParser<C, net.minecraft.network.chat.Component>(
61-
net.minecraft.commands.arguments.ComponentArgument.textComponent()
63+
new ContextualArgumentTypeProvider<>(ComponentArgument::textComponent)
6264
).flatMapSuccess((ctx, component) ->
6365
ArgumentParseResult.successFuture(SpongeAdventure.asAdventure(component)));
6466

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ neoForge = "net.neoforged:neoforge:20.6.7-beta"
4646
cloud-buildLogic-spotless = { id = "org.incendo.cloud-build-logic.spotless", version.ref = "cloud-build-logic" }
4747
cloud-buildLogic-rootProject-publishing = { id = "org.incendo.cloud-build-logic.publishing.root-project", version.ref = "cloud-build-logic" }
4848
cloud-buildLogic-rootProject-spotless = { id = "org.incendo.cloud-build-logic.spotless.root-project", version.ref = "cloud-build-logic" }
49-
shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
49+
shadow = { id = "io.github.goooler.shadow", version = "8.1.7" }
5050

5151
[bundles]
5252
immutables = ["immutables", "immutablesAnnotate"]

0 commit comments

Comments
 (0)