Update to 1.21.10

Moulberry · Moulberry · commit d618b1d9f669 · 2025-10-09T16:18:30.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.moulberry.axiom"
-version = "5.0.2+1.21.8"
+version = "5.0.2+1.21.10"
 description = "Serverside component for Axiom on Paper"
 
 java {
@@ -39,7 +39,7 @@ repositories {
 }
 
 dependencies {
-    paperweight.paperDevBundle("1.21.8-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT")
     implementation(libs.reflection.remapper)
     implementation(libs.cloud.paper)
 
diff --git a/src/main/java/com/moulberry/axiom/VersionHelper.java b/src/main/java/com/moulberry/axiom/VersionHelper.java
@@ -1,12 +1,18 @@
 package com.moulberry.axiom;
 
+import com.mojang.serialization.Codec;
 import io.netty.buffer.Unpooled;
+import net.minecraft.SharedConstants;
+import net.minecraft.core.IdMap;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
 import net.minecraft.network.protocol.common.custom.DiscardedPayload;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.chunk.PalettedContainer;
+import net.minecraft.world.level.chunk.Strategy;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
@@ -104,4 +110,16 @@ public static ListTag getList(CompoundTag tag, String key, int type) {
         }
     }
 
+    public static PalettedContainer<BlockState> createPalettedContainer(IdMap<BlockState> map, BlockState defaultValue) {
+        return new PalettedContainer<>(defaultValue, Strategy.createForBlockStates(map));
+    }
+
+    public static Codec<PalettedContainer<BlockState>> createPalettedContainerCodec(Codec<BlockState> codec, IdMap<BlockState> map, BlockState defaultValue) {
+        return PalettedContainer.codecRW(codec, Strategy.createForBlockStates(map), defaultValue);
+    }
+
+    public static String getVersion() {
+        return SharedConstants.getCurrentVersion().name();
+    }
+
 }
diff --git a/src/main/java/com/moulberry/axiom/buffer/BlockBuffer.java b/src/main/java/com/moulberry/axiom/buffer/BlockBuffer.java
@@ -4,6 +4,7 @@
 import com.mojang.serialization.Codec;
 import com.moulberry.axiom.AxiomConstants;
 import com.moulberry.axiom.AxiomPaper;
+import com.moulberry.axiom.VersionHelper;
 import com.moulberry.axiom.viaversion.UnknownVersionHelper;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
@@ -34,7 +35,7 @@ public class BlockBuffer {
     private static final Map<BlockState, IdMap<BlockState>> ID_MAPPERS = new HashMap<>();
 
     public static PalettedContainer<BlockState> createPalettedContainerForEmptyBlockState(BlockState emptyBlockState) {
-        return new PalettedContainer<>(BlockBuffer.getIdMapForEmptyBlockState(emptyBlockState), EMPTY_STATE, PalettedContainer.Strategy.SECTION_STATES);
+        return VersionHelper.createPalettedContainer(BlockBuffer.getIdMapForEmptyBlockState(emptyBlockState), EMPTY_STATE);
     }
 
     public static IdMap<BlockState> getIdMapForEmptyBlockState(BlockState empty) {
@@ -70,7 +71,7 @@ public static Codec<PalettedContainer<BlockState>> getCodecForEmptyBlockState(Bl
                 blockStateCodec = BlockState.CODEC.xmap(mapFunction, mapFunction);
             }
 
-            return PalettedContainer.codecRW(mapping, blockStateCodec, PalettedContainer.Strategy.SECTION_STATES, EMPTY_STATE);
+            return VersionHelper.createPalettedContainerCodec(blockStateCodec, mapping, EMPTY_STATE);
         });
     }
 
@@ -203,8 +204,7 @@ public PalettedContainer<BlockState> getOrCreateSectionForCoord(int x, int y, in
     public PalettedContainer<BlockState> getOrCreateSection(long id) {
         if (this.last == null || id != this.lastId) {
             this.lastId = id;
-            this.last = this.values.computeIfAbsent(id, k -> new PalettedContainer<>(this.registry,
-                             EMPTY_STATE, PalettedContainer.Strategy.SECTION_STATES));
+            this.last = this.values.computeIfAbsent(id, k -> VersionHelper.createPalettedContainer(this.registry, EMPTY_STATE));
         }
 
         return this.last;
diff --git a/src/main/java/com/moulberry/axiom/packet/AxiomBigPayloadHandler.java b/src/main/java/com/moulberry/axiom/packet/AxiomBigPayloadHandler.java
@@ -76,7 +76,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) t
                     } else {
                         byte[] bytes = ByteBufUtil.getBytes(buf);
 
-                        player.getServer().execute(() -> {
+                        player.level().getServer().execute(() -> {
                             RegistryFriendlyByteBuf friendlyByteBuf = new RegistryFriendlyByteBuf(Unpooled.wrappedBuffer(bytes), player.registryAccess());
                             callReceive(handler, player, friendlyByteBuf, identifier);
                         });
diff --git a/src/main/java/com/moulberry/axiom/packet/impl/BlueprintRequestPacketListener.java b/src/main/java/com/moulberry/axiom/packet/impl/BlueprintRequestPacketListener.java
@@ -35,7 +35,7 @@ public void onReceive(Player player, RegistryFriendlyByteBuf friendlyByteBuf) {
         }
 
         if (this.plugin.isMismatchedDataVersion(player.getUniqueId())) {
-            player.sendMessage(Component.text("Axiom+ViaVersion: This feature isn't supported. Switch your client version to " + SharedConstants.VERSION_STRING + " to use this"));
+            player.sendMessage(Component.text("Axiom+ViaVersion: This feature isn't supported. Switch your client version to " + VersionHelper.getVersion() + " to use this"));
             return;
         }
 
diff --git a/src/main/java/com/moulberry/axiom/packet/impl/ManipulateEntityPacketListener.java b/src/main/java/com/moulberry/axiom/packet/impl/ManipulateEntityPacketListener.java
@@ -196,7 +196,7 @@ public void onReceive(Player player, RegistryFriendlyByteBuf friendlyByteBuf) {
                                 continue;
                             }
 
-                            passenger.startRiding(entity, true);
+                            passenger.startRiding(entity, true, false);
                         }
                     }
                     case REMOVE_LIST -> {
diff --git a/src/main/java/com/moulberry/axiom/packet/impl/RequestChunkDataPacketListener.java b/src/main/java/com/moulberry/axiom/packet/impl/RequestChunkDataPacketListener.java
@@ -80,7 +80,7 @@ public void onReceive(Player bukkitPlayer, RegistryFriendlyByteBuf friendlyByteB
             return;
         }
 
-        MinecraftServer server = player.getServer();
+        MinecraftServer server = player.level().getServer();
         if (server == null) {
             sendEmptyResponse(player, id);
             friendlyByteBuf.readerIndex(friendlyByteBuf.writerIndex());
diff --git a/src/main/java/com/moulberry/axiom/packet/impl/SetBlockBufferPacketListener.java b/src/main/java/com/moulberry/axiom/packet/impl/SetBlockBufferPacketListener.java
@@ -68,7 +68,7 @@ public boolean handleAsync() {
 
     public void onReceive(Player player, RegistryFriendlyByteBuf friendlyByteBuf) {
         ServerPlayer serverPlayer = ((CraftPlayer)player).getHandle();
-        MinecraftServer server = serverPlayer.getServer();
+        MinecraftServer server = serverPlayer.level().getServer();
         if (server == null) return;
 
         ResourceKey<Level> worldKey = friendlyByteBuf.readResourceKey(Registries.DIMENSION);
diff --git a/src/main/java/com/moulberry/axiom/packet/impl/UpdateAnnotationPacketListener.java b/src/main/java/com/moulberry/axiom/packet/impl/UpdateAnnotationPacketListener.java
@@ -44,7 +44,7 @@ public void onReceive(Player player, RegistryFriendlyByteBuf friendlyByteBuf) {
         }
 
         // Execute
-        serverPlayer.getServer().execute(() -> {
+        serverPlayer.level().getServer().execute(() -> {
             try {
                 ServerAnnotations.handleUpdates(serverPlayer.level().getWorld(), actions);
             } catch (Throwable t) {
diff --git a/src/main/java/com/moulberry/axiom/packet/impl/UploadBlueprintPacketListener.java b/src/main/java/com/moulberry/axiom/packet/impl/UploadBlueprintPacketListener.java
@@ -1,6 +1,7 @@
 package com.moulberry.axiom.packet.impl;
 
 import com.moulberry.axiom.AxiomPaper;
+import com.moulberry.axiom.VersionHelper;
 import com.moulberry.axiom.blueprint.BlueprintIo;
 import com.moulberry.axiom.blueprint.RawBlueprint;
 import com.moulberry.axiom.blueprint.ServerBlueprintManager;
@@ -42,8 +43,8 @@ public void onReceive(Player player, RegistryFriendlyByteBuf friendlyByteBuf) {
         ServerPlayer serverPlayer = ((CraftPlayer)player).getHandle();
 
         if (this.plugin.isMismatchedDataVersion(serverPlayer.getUUID())) {
-            serverPlayer.getServer().execute(() -> {
-                serverPlayer.sendSystemMessage(Component.literal("Axiom+ViaVersion: This feature isn't supported. Switch your client version to " + SharedConstants.VERSION_STRING + " to use this"));
+            serverPlayer.level().getServer().execute(() -> {
+                serverPlayer.sendSystemMessage(Component.literal("Axiom+ViaVersion: This feature isn't supported. Switch your client version to " + VersionHelper.getVersion() + " to use this"));
             });
             friendlyByteBuf.writerIndex(friendlyByteBuf.readerIndex());
             return;
@@ -73,7 +74,7 @@ public void onReceive(Player player, RegistryFriendlyByteBuf friendlyByteBuf) {
 
         String pathName = pathStr.substring(0, pathStr.length()-3);
 
-        serverPlayer.getServer().execute(() -> {
+        serverPlayer.level().getServer().execute(() -> {
             try {
                 Path path = this.plugin.blueprintFolder.resolve(relative);
 
@@ -93,7 +94,7 @@ public void onReceive(Player player, RegistryFriendlyByteBuf friendlyByteBuf) {
                 registry.blueprints().put("/" + pathName, rawBlueprint);
 
                 // Resend manifest
-                ServerBlueprintManager.sendManifest(serverPlayer.getServer().getPlayerList().getPlayers());
+                ServerBlueprintManager.sendManifest(serverPlayer.level().getServer().getPlayerList().getPlayers());
             } catch (Throwable t) {
                 serverPlayer.getBukkitEntity().kick(net.kyori.adventure.text.Component.text(
                         "An error occured while uploading blueprint: " + t.getMessage()));
diff --git a/src/main/java/com/moulberry/axiom/viaversion/ViaVersionHelper.java b/src/main/java/com/moulberry/axiom/viaversion/ViaVersionHelper.java
@@ -140,8 +140,8 @@ private static CompoundTag readTagViaVersion(FriendlyByteBuf friendlyByteBuf,
     }
 
     public static void readPalettedContainerViaVersion(FriendlyByteBuf friendlyByteBuf, PalettedContainer<BlockState> container, int playerVersion) {
-        Type<DataPalette> from = getPalettedContainerType(playerVersion, container.registry);
-        Type<DataPalette> to = getPalettedContainerType(SharedConstants.getProtocolVersion(), container.registry);
+        Type<DataPalette> from = getPalettedContainerType(playerVersion, container.data.configuration().bitsInMemory());
+        Type<DataPalette> to = getPalettedContainerType(SharedConstants.getProtocolVersion(), container.data.configuration().bitsInMemory());
 
         if (from == to) {
             container.read(friendlyByteBuf);
@@ -167,11 +167,11 @@ public Type<DataPalette> load(Integer size) {
         }
     });
 
-    private static Type<DataPalette> getPalettedContainerType(int version, IdMap<BlockState> registry) {
+    private static Type<DataPalette> getPalettedContainerType(int version, int bits) {
         if (version >= 770) { // 1.21.5
-            return PALETTE_TYPE_1_21_5.getUnchecked(MathUtil.ceilLog2(registry.size()));
+            return PALETTE_TYPE_1_21_5.getUnchecked(bits);
         } else {
-            return PALETTE_TYPE_1_18.getUnchecked(MathUtil.ceilLog2(registry.size()));
+            return PALETTE_TYPE_1_18.getUnchecked(bits);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ plugins {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`group = "com.moulberry.axiom"`
`11`		`-version = "5.0.2+1.21.8"`
	`11`	`+version = "5.0.2+1.21.10"`
`12`	`12`	`description = "Serverside component for Axiom on Paper"`
`13`	`13`
`14`	`14`	`java {`
`@@ -39,7 +39,7 @@ repositories {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`dependencies {`
`42`		`- paperweight.paperDevBundle("1.21.8-R0.1-SNAPSHOT")`
	`42`	`+ paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT")`
`43`	`43`	`implementation(libs.reflection.remapper)`
`44`	`44`	`implementation(libs.cloud.paper)`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public void onReceive(Player player, RegistryFriendlyByteBuf friendlyByteBuf) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`if (this.plugin.isMismatchedDataVersion(player.getUniqueId())) {`
`38`		`- player.sendMessage(Component.text("Axiom+ViaVersion: This feature isn't supported. Switch your client version to " + SharedConstants.VERSION_STRING + " to use this"));`
	`38`	`+ player.sendMessage(Component.text("Axiom+ViaVersion: This feature isn't supported. Switch your client version to " + VersionHelper.getVersion() + " to use this"));`
`39`	`39`	`return;`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public void onReceive(Player player, RegistryFriendlyByteBuf friendlyByteBuf) {`
`196`	`196`	`continue;`
`197`	`197`	`}`
`198`	`198`
`199`		`- passenger.startRiding(entity, true);`
	`199`	`+ passenger.startRiding(entity, true, false);`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`	`case REMOVE_LIST -> {`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public void onReceive(Player bukkitPlayer, RegistryFriendlyByteBuf friendlyByteB`
`80`	`80`	`return;`
`81`	`81`	`}`
`82`	`82`
`83`		`- MinecraftServer server = player.getServer();`
	`83`	`+ MinecraftServer server = player.level().getServer();`
`84`	`84`	`if (server == null) {`
`85`	`85`	`sendEmptyResponse(player, id);`
`86`	`86`	`friendlyByteBuf.readerIndex(friendlyByteBuf.writerIndex());`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public void onReceive(Player player, RegistryFriendlyByteBuf friendlyByteBuf) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// Execute`
`47`		`- serverPlayer.getServer().execute(() -> {`
	`47`	`+ serverPlayer.level().getServer().execute(() -> {`
`48`	`48`	`try {`
`49`	`49`	`ServerAnnotations.handleUpdates(serverPlayer.level().getWorld(), actions);`
`50`	`50`	`} catch (Throwable t) {`