diff --git a/gradle.properties b/gradle.properties
index 31d70bbc..ded7b2bc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
 	minecraft_version=21w11a
-	yarn_mappings=21w11a+build.20
+	yarn_mappings=21w11a+build.46
 	loader_version=0.11.3
 	fabric_version=0.32.5+1.17
 
diff --git a/src/main/java/carpet/mixins/ItemEntityMixin.java b/src/main/java/carpet/mixins/ItemEntityMixin.java
index 84510d21..233540e8 100644
--- a/src/main/java/carpet/mixins/ItemEntityMixin.java
+++ b/src/main/java/carpet/mixins/ItemEntityMixin.java
@@ -24,7 +24,7 @@ public abstract class ItemEntityMixin extends Entity implements ItemEntityInterf
 {
     private static final int SHULKERBOX_MAX_STACK_AMOUNT = 64;
 
-    @Shadow private int age;
+    @Shadow private int itemAge;
     @Shadow private int pickupDelay;
 
     public ItemEntityMixin(EntityType<?> entityType_1, World world_1) {
@@ -34,7 +34,7 @@ public abstract class ItemEntityMixin extends Entity implements ItemEntityInterf
     @Override
     public void onStruckByLightning(ServerWorld world, LightningEntity lightning) {
         if (CarpetSettings.lightningKillsDropsFix) {
-            if (this.age > 8) { //Only kill item if its older then 8 ticks
+            if (this.itemAge > 8) { //Only kill item if its older then 8 ticks
                 super.onStruckByLightning(world, lightning);
             }
         } else {
@@ -44,7 +44,7 @@ public abstract class ItemEntityMixin extends Entity implements ItemEntityInterf
 
     @Override
     public int getAgeCM() {
-        return this.age;
+        return this.itemAge;
     }
 
     @Override
@@ -105,7 +105,7 @@ public abstract class ItemEntityMixin extends Entity implements ItemEntityInterf
             self.setStack(selfStack);
 
             this.pickupDelay = Math.max(((ItemEntityInterface)other).getPickupDelayCM(), this.pickupDelay);
-            this.age = Math.min(((ItemEntityInterface)other).getAgeCM(), this.age);
+            this.itemAge = Math.min(((ItemEntityInterface)other).getAgeCM(), this.itemAge);
 
             otherStack.decrement(amount);
             if (otherStack.isEmpty())
diff --git a/src/main/java/carpet/mixins/PlayerEntity_creativeNoClipMixin.java b/src/main/java/carpet/mixins/PlayerEntity_creativeNoClipMixin.java
index 342783e4..d0e51b81 100644
--- a/src/main/java/carpet/mixins/PlayerEntity_creativeNoClipMixin.java
+++ b/src/main/java/carpet/mixins/PlayerEntity_creativeNoClipMixin.java
@@ -36,7 +36,7 @@ public abstract class PlayerEntity_creativeNoClipMixin extends LivingEntity
         return playerEntity.isSpectator() || (CarpetSettings.creativeNoClip && playerEntity.isCreative() && playerEntity.getAbilities().flying);
     }
 
-    @Redirect(method = "updateSize", at = @At(
+    @Redirect(method = "updatePose", at = @At(
             value = "INVOKE",
             target = "Lnet/minecraft/entity/player/PlayerEntity;isSpectator()Z")
     )
diff --git a/src/main/java/carpet/network/ClientNetworkHandler.java b/src/main/java/carpet/network/ClientNetworkHandler.java
index 9c62c4e0..094b75f3 100644
--- a/src/main/java/carpet/network/ClientNetworkHandler.java
+++ b/src/main/java/carpet/network/ClientNetworkHandler.java
@@ -129,7 +129,7 @@ public class ClientNetworkHandler
 
     private static void onSyncData(PacketByteBuf data, ClientPlayerEntity player)
     {
-        NbtCompound compound = data.readCompoundTag();
+        NbtCompound compound = data.readCompound();
         if (compound == null) return;
         for (String key: compound.getKeys())
         {
@@ -149,7 +149,7 @@ public class ClientNetworkHandler
         outer.put("clientCommand", tag);
         CarpetClient.getPlayer().networkHandler.sendPacket(new CustomPayloadC2SPacket(
                 CarpetClient.CARPET_CHANNEL,
-                (new PacketByteBuf(Unpooled.buffer())).writeVarInt(CarpetClient.DATA).writeCompoundTag(outer)
+                (new PacketByteBuf(Unpooled.buffer())).writeVarInt(CarpetClient.DATA).writeCompound(outer)
         ));
     }
 }
diff --git a/src/main/java/carpet/network/ServerNetworkHandler.java b/src/main/java/carpet/network/ServerNetworkHandler.java
index 25310b4c..59a4b89d 100644
--- a/src/main/java/carpet/network/ServerNetworkHandler.java
+++ b/src/main/java/carpet/network/ServerNetworkHandler.java
@@ -138,7 +138,7 @@ public class ServerNetworkHandler
 
     private static void onClientData(ServerPlayerEntity player, PacketByteBuf data)
     {
-        NbtCompound compound = data.readCompoundTag();
+        NbtCompound compound = data.readCompound();
         if (compound == null) return;
         for (String key: compound.getKeys())
         {
@@ -323,7 +323,7 @@ public class ServerNetworkHandler
         {
             PacketByteBuf packetBuf = new PacketByteBuf(Unpooled.buffer());
             packetBuf.writeVarInt(CarpetClient.DATA);
-            packetBuf.writeCompoundTag(tag);
+            packetBuf.writeCompound(tag);
             return packetBuf;
         }
 
diff --git a/src/main/java/carpet/patches/EntityPlayerMPFake.java b/src/main/java/carpet/patches/EntityPlayerMPFake.java
index 39808ad4..0a567ebc 100644
--- a/src/main/java/carpet/patches/EntityPlayerMPFake.java
+++ b/src/main/java/carpet/patches/EntityPlayerMPFake.java
@@ -52,7 +52,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity
         instance.interactionManager.changeGameMode(gamemode);
         server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), dimensionId);//instance.dimension);
         server.getPlayerManager().sendToDimension(new EntityPositionS2CPacket(instance), dimensionId);//instance.dimension);
-        instance.getServerWorld().getChunkManager().updateCameraPosition(instance);
+        instance.getServerWorld().getChunkManager().updatePosition(instance);
         instance.dataTracker.set(PLAYER_MODEL_PARTS, (byte) 0x7f); // show all model layers (incl. capes)
         return instance;
     }
@@ -76,7 +76,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity
 
         server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(playerShadow, (byte) (player.headYaw * 256 / 360)), playerShadow.world.getRegistryKey());
         server.getPlayerManager().sendToAll(new PlayerListS2CPacket(PlayerListS2CPacket.Action.ADD_PLAYER, playerShadow));
-        player.getServerWorld().getChunkManager().updateCameraPosition(playerShadow);
+        player.getServerWorld().getChunkManager().updatePosition(playerShadow);
         return playerShadow;
     }
 
@@ -111,7 +111,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity
         if (this.getServer().getTicks() % 10 == 0)
         {
             this.networkHandler.syncWithPlayerPosition();
-            this.getServerWorld().getChunkManager().updateCameraPosition(this);
+            this.getServerWorld().getChunkManager().updatePosition(this);
             onTeleportationDone(); //<- causes hard crash but would need to be done to enable portals // not as of 1.17
         }
         super.tick();