Skip to content

Commit 02fffbd

Browse files
Vilsu221jpenilla
authored andcommitted
Update to API-12
1 parent 2fbca1a commit 02fffbd

4 files changed

Lines changed: 14 additions & 27 deletions

File tree

cloud-sponge/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ dependencies {
99
implementation(libs.cloud.brigadier)
1010
offlineLinkedJavadoc(project(":cloud-minecraft-modded-common"))
1111
implementation(project(":cloud-minecraft-modded-common"))
12-
compileOnly("org.spongepowered:spongeapi:11.0.0-SNAPSHOT")
13-
compileOnly("org.spongepowered:sponge:1.20.6-11.0.0-SNAPSHOT")
12+
compileOnly("org.spongepowered:spongeapi:12.1.0-SNAPSHOT")
13+
compileOnly("org.spongepowered:sponge:1.21.1-12.0.3-SNAPSHOT")
1414
}
1515

1616
neoForge {
1717
enable {
18-
neoFormVersion = "1.20.6-20240627.102356"
18+
neoFormVersion = "1.21.1-20240808.144430"
1919
}
2020
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private static final class ProtoItemStackImpl implements ProtoItemStack {
158158
final int stackSize,
159159
final boolean respectMaximumStackSize
160160
) throws ComponentMessageRuntimeException {
161-
return this.createItemStack(stackSize, respectMaximumStackSize).createSnapshot();
161+
return this.createItemStack(stackSize, respectMaximumStackSize).asImmutable();
162162
}
163163

164164
}

examples/example-sponge/build.gradle.kts

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.spongepowered.gradle.plugin.config.PluginLoaders
22
import org.spongepowered.plugin.metadata.model.PluginDependency
33

44
plugins {
5-
id("org.spongepowered.gradle.plugin") version "2.2.0"
5+
id("org.spongepowered.gradle.plugin") version "2.3.1-SNAPSHOT"
66
id("conventions.base")
77
alias(libs.plugins.shadow)
88
}
@@ -14,7 +14,8 @@ dependencies {
1414

1515
sponge {
1616
injectRepositories(false)
17-
apiVersion("11.0.0-SNAPSHOT")
17+
apiVersion("12.1.0-SNAPSHOT")
18+
minecraftVersion("1.21.1")
1819
plugin("cloud-example-sponge") {
1920
loader {
2021
name(PluginLoaders.JAVA_PLAIN)
@@ -23,7 +24,7 @@ sponge {
2324
displayName("Cloud example Sponge plugin")
2425
description("Plugin to demonstrate and test the Sponge implementation of cloud")
2526
license("MIT")
26-
entrypoint("cloud.commandframework.examples.sponge.CloudExamplePlugin")
27+
entrypoint("org.incendo.cloud.examples.sponge.CloudExamplePlugin")
2728
dependency("spongeapi") {
2829
loadOrder(PluginDependency.LoadOrder.AFTER)
2930
optional(false)
@@ -35,24 +36,10 @@ tasks {
3536
assemble {
3637
dependsOn(shadowJar)
3738
}
38-
}
3939

40-
configurations {
41-
spongeRuntime {
42-
resolutionStrategy {
43-
cacheChangingModulesFor(1, "MINUTES")
44-
eachDependency {
45-
if (target.name == "spongevanilla") {
46-
useVersion("1.20.+")
47-
}
48-
}
40+
shadowJar {
41+
dependencies {
42+
exclude(dependency("io.leangen.geantyref:.*"))
4943
}
5044
}
5145
}
52-
53-
afterEvaluate {
54-
tasks.compileJava {
55-
// TODO - sponge AP not compatible with J21
56-
options.compilerArgs.remove("-Werror")
57-
}
58-
}

examples/example-sponge/src/main/java/org/incendo/cloud/examples/sponge/CloudExamplePlugin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import io.leangen.geantyref.TypeToken;
3131
import java.util.List;
3232
import java.util.Optional;
33+
import java.util.UUID;
3334
import java.util.function.Function;
3435
import net.kyori.adventure.text.Component;
3536
import net.kyori.adventure.text.format.NamedTextColor;
@@ -65,7 +66,6 @@
6566
import org.spongepowered.api.entity.EntityType;
6667
import org.spongepowered.api.entity.EntityTypes;
6768
import org.spongepowered.api.entity.living.player.Player;
68-
import org.spongepowered.api.entity.living.player.User;
6969
import org.spongepowered.api.entity.living.trader.Villager;
7070
import org.spongepowered.api.item.enchantment.Enchantment;
7171
import org.spongepowered.api.item.enchantment.EnchantmentType;
@@ -198,7 +198,7 @@ private void registerCommands() {
198198
return;
199199
}
200200
final ItemStack modified = ItemStack.builder()
201-
.fromItemStack(result.polledItem().createStack())
201+
.fromItemStack(result.polledItem().asMutable())
202202
.add(Keys.APPLIED_ENCHANTMENTS, List.of(
203203
Enchantment.of(
204204
ctx.<EnchantmentType>get("enchantment_type"),
@@ -367,7 +367,7 @@ private void registerCommands() {
367367
this.commandManager.command(cloud.literal("user")
368368
.required("user", userParser())
369369
.handler(ctx -> {
370-
ctx.sender().audience().sendMessage(text(ctx.<User>get("user").toString()));
370+
ctx.sender().audience().sendMessage(text(ctx.<UUID>get("user").toString()));
371371
}));
372372
this.commandManager.command(cloud.literal("data")
373373
.required("data", dataContainerParser())

0 commit comments

Comments
 (0)