1.20.6

Incendo · May 30, 2024 · 2a30a77 · 2a30a77
1 parent 0e7d487
commit 2a30a77
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/cloud-sponge/build.gradle.kts b/cloud-sponge/build.gradle.kts
@@ -11,10 +11,10 @@ dependencies {
     implementation(libs.cloud.brigadier)
     implementation(project(":cloud-minecraft-modded-common", configuration = "namedElements"))
     compileOnly("org.spongepowered:spongeapi:11.0.0-SNAPSHOT")
-    compileOnly("org.spongepowered:sponge:1.20.4-11.0.0-SNAPSHOT")
+    compileOnly("org.spongepowered:sponge:1.20.6-11.0.0-SNAPSHOT")
 }
 
 minecraft {
-    version("1.20.4")
+    version("1.20.6")
     platform(MinecraftPlatform.JOINED)
 }
diff --git a/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeRegistrationHandler.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/SpongeRegistrationHandler.java
@@ -77,7 +77,7 @@ private void startedEngine(final StartedEngineEvent<Server> serverStartedEngineE
         final MinecraftServer engine = (MinecraftServer) serverStartedEngineEvent.engine();
         ContextualArgumentTypeProvider.withBuildContext(
             this.commandManager,
-            CommandBuildContext.configurable(engine.registryAccess(), engine.getWorldData().enabledFeatures()),
+            CommandBuildContext.simple(engine.registryAccess(), engine.getWorldData().enabledFeatures()),
             true,
             () -> {
                 for (final org.incendo.cloud.Command<C> registeredCommand : this.registeredCommands) {

diff --git a/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ComponentParser.java b/cloud-sponge/src/main/java/org/incendo/cloud/sponge/parser/ComponentParser.java
@@ -25,10 +25,12 @@
 
 import java.util.concurrent.CompletableFuture;
 import net.kyori.adventure.text.Component;
+import net.minecraft.commands.arguments.ComponentArgument;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.incendo.cloud.brigadier.parser.WrappedBrigadierParser;
 import org.incendo.cloud.context.CommandContext;
 import org.incendo.cloud.context.CommandInput;
+import org.incendo.cloud.minecraft.modded.internal.ContextualArgumentTypeProvider;
 import org.incendo.cloud.parser.ArgumentParseResult;
 import org.incendo.cloud.parser.ArgumentParser;
 import org.incendo.cloud.parser.ParserDescriptor;
@@ -58,7 +60,7 @@ public static <C> ParserDescriptor<C, Component> componentParser() {
 
     private final ArgumentParser<C, Component> mappedParser =
         new WrappedBrigadierParser<C, net.minecraft.network.chat.Component>(
-            net.minecraft.commands.arguments.ComponentArgument.textComponent()
+            new ContextualArgumentTypeProvider<>(ComponentArgument::textComponent)
         ).flatMapSuccess((ctx, component) ->
             ArgumentParseResult.successFuture(SpongeAdventure.asAdventure(component)));
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -46,7 +46,7 @@ neoForge = "net.neoforged:neoforge:20.6.7-beta"
 cloud-buildLogic-spotless = { id = "org.incendo.cloud-build-logic.spotless", version.ref = "cloud-build-logic" }
 cloud-buildLogic-rootProject-publishing = { id = "org.incendo.cloud-build-logic.publishing.root-project", version.ref = "cloud-build-logic" }
 cloud-buildLogic-rootProject-spotless = { id = "org.incendo.cloud-build-logic.spotless.root-project", version.ref = "cloud-build-logic" }
-shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
+shadow = { id = "io.github.goooler.shadow", version = "8.1.7" }
 
 [bundles]
 immutables = ["immutables", "immutablesAnnotate"]