From 48c2af3e90b9d281c616ecf2af643ac823478993 Mon Sep 17 00:00:00 2001 From: Moulberry Date: Thu, 27 Jun 2024 02:45:25 +0800 Subject: [PATCH] Update to 1.21 --- build.gradle.kts | 2 +- gradle/libs.versions.toml | 4 ++-- src/main/java/com/moulberry/axiom/AxiomPaper.java | 2 +- src/main/java/com/moulberry/axiom/WorldExtension.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ad9212f..7e153ff 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -71,7 +71,7 @@ tasks { "name" to project.name, "version" to project.version, "description" to project.description, - "apiVersion" to "1.20" + "apiVersion" to "1.21" ) inputs.properties(props) filesMatching("plugin.yml") { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3939ced..041cc70 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ bom-newest = "1.37" cloud-paper = "2.0.0-20240516.054251-69" coreprotect = "22.4" -paper = "1.20.6-R0.1-SNAPSHOT" +paper = "1.21-R0.1-SNAPSHOT" plotsquared = "7.3.9-20240513.192211-13" reflection-remapper = "0.1.2-20240315.033304-2" viaversion-api = "4.10.1-20240505.124211-22" @@ -29,4 +29,4 @@ zstd-jni = { group = "com.github.luben", name = "zstd-jni", version = "1.5.5-4" [plugins] paperweight-userdev = { id = "io.papermc.paperweight.userdev", version.ref = "paperweight-userdev" } run-paper = { id = "xyz.jpenilla.run-paper", version.ref = "run-paper" } -shadow = { id = "io.github.goooler.shadow", version.ref = "shadow" } \ No newline at end of file +shadow = { id = "io.github.goooler.shadow", version.ref = "shadow" } diff --git a/src/main/java/com/moulberry/axiom/AxiomPaper.java b/src/main/java/com/moulberry/axiom/AxiomPaper.java index e7aac44..d8c7565 100644 --- a/src/main/java/com/moulberry/axiom/AxiomPaper.java +++ b/src/main/java/com/moulberry/axiom/AxiomPaper.java @@ -162,7 +162,7 @@ public class AxiomPaper extends JavaPlugin implements Listener { new RequestChunkDataPacketListener(this) : null; // Hack to figure out the id of the CustomPayload packet - ProtocolInfo protocol = GameProtocols.SERVERBOUND.bind(k -> new RegistryFriendlyByteBuf(k, + ProtocolInfo protocol = GameProtocols.SERVERBOUND_TEMPLATE.bind(k -> new RegistryFriendlyByteBuf(k, MinecraftServer.getServer().registryAccess())); RegistryFriendlyByteBuf friendlyByteBuf = new RegistryFriendlyByteBuf(Unpooled.buffer(), MinecraftServer.getServer().registryAccess()); protocol.codec().encode(friendlyByteBuf, new ServerboundCustomPayloadPacket(new DiscardedPayload(VersionHelper.createResourceLocation("dummy"), Unpooled.buffer()))); diff --git a/src/main/java/com/moulberry/axiom/WorldExtension.java b/src/main/java/com/moulberry/axiom/WorldExtension.java index 7f610a8..e948922 100644 --- a/src/main/java/com/moulberry/axiom/WorldExtension.java +++ b/src/main/java/com/moulberry/axiom/WorldExtension.java @@ -169,7 +169,7 @@ public class WorldExtension { } } - this.level.getChunkSource().getLightEngine().relight(chunkSet, pos -> {}, count -> {}); + this.level.getChunkSource().getLightEngine().starlight$serverRelightChunks(chunkSet, pos -> {}, count -> {}); } }