From ab78bd82479e989b91ec37aadbdff911edbc9de0 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 9 Feb 2024 15:12:10 +0000 Subject: [PATCH] Fix build after cherry-pick --- .../fabric/mixin/attachment/ChunkSerializerMixin.java | 2 +- .../fabric/mixin/attachment/WrapperProtoChunkMixin.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ChunkSerializerMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ChunkSerializerMixin.java index 665936888f..32d5d9a06f 100644 --- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ChunkSerializerMixin.java +++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ChunkSerializerMixin.java @@ -55,7 +55,7 @@ private static WorldChunk readWorldChunkAttachments(WorldChunk chunk, ServerWorl method = "deserialize" ) private static ProtoChunk readProtoChunkAttachments(ProtoChunk chunk, ServerWorld world, PointOfInterestStorage poiStorage, ChunkPos chunkPos, NbtCompound nbt) { - ((AttachmentTargetImpl) chunk).fabric_readAttachmentsFromNbt(nbt); + ((AttachmentTargetImpl) chunk).fabric_readAttachmentsFromNbt(nbt, world.getRegistryManager()); return chunk; } diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/WrapperProtoChunkMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/WrapperProtoChunkMixin.java index 9d4fd39025..6412fe2d53 100644 --- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/WrapperProtoChunkMixin.java +++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/WrapperProtoChunkMixin.java @@ -24,6 +24,7 @@ import org.spongepowered.asm.mixin.Shadow; import net.minecraft.nbt.NbtCompound; +import net.minecraft.registry.RegistryWrapper; import net.minecraft.world.chunk.WorldChunk; import net.minecraft.world.chunk.WrapperProtoChunk; @@ -54,13 +55,13 @@ public boolean hasAttached(AttachmentType type) { } @Override - public void fabric_writeAttachmentsToNbt(NbtCompound nbt) { - ((AttachmentTargetImpl) this.wrapped).fabric_writeAttachmentsToNbt(nbt); + public void fabric_writeAttachmentsToNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup wrapperLookup) { + ((AttachmentTargetImpl) this.wrapped).fabric_writeAttachmentsToNbt(nbt, wrapperLookup); } @Override - public void fabric_readAttachmentsFromNbt(NbtCompound nbt) { - ((AttachmentTargetImpl) this.wrapped).fabric_readAttachmentsFromNbt(nbt); + public void fabric_readAttachmentsFromNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup wrapperLookup) { + ((AttachmentTargetImpl) this.wrapped).fabric_readAttachmentsFromNbt(nbt, wrapperLookup); } @Override