diff --git a/mappings/net/minecraft/datafixer/fix/BitStorageAlignFix.mapping b/mappings/net/minecraft/datafixer/fix/BitStorageAlignFix.mapping
index dc743dcaf7..08bf136485 100644
--- a/mappings/net/minecraft/datafixer/fix/BitStorageAlignFix.mapping
+++ b/mappings/net/minecraft/datafixer/fix/BitStorageAlignFix.mapping
@@ -1,3 +1,47 @@
 CLASS net/minecraft/class_5196 net/minecraft/datafixer/fix/BitStorageAlignFix
+	FIELD field_29863 ELEMENT_BIT_SHIFT I
+	FIELD field_29864 CHUNK_WIDTH I
+	FIELD field_29865 CHUNK_LENGTH I
+	FIELD field_29866 MAX_BLOCK_STATE_ID I
+	FIELD field_29867 HEIGHT_VALUE_BITS I
+	FIELD field_29868 MAX_HEIGHT_VALUE I
 	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
 		ARG 1 outputSchema
+	METHOD method_27288 resizePackedIntArray (II[J)[J
+		ARG 0 maxValue
+		ARG 1 elementBits
+		ARG 2 elements
+	METHOD method_27292 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
+		ARG 5 chunk
+	METHOD method_27293 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
+		ARG 4 level
+	METHOD method_27294 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
+		ARG 2 levelSection
+	METHOD method_27295 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
+		ARG 1 section
+	METHOD method_27296 (Ljava/util/List;)Ljava/lang/Integer;
+		ARG 0 palette
+	METHOD method_27769 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 levelDynamic
+	METHOD method_27772 fixBitStorageArray (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;II)Lcom/mojang/serialization/Dynamic;
+		ARG 0 sectionDynamic
+		ARG 1 statesDynamic
+		ARG 2 maxValue
+		ARG 3 elementBits
+	METHOD method_27773 (Lcom/mojang/serialization/Dynamic;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair;
+		ARG 1 heightmap
+	METHOD method_27774 fixLevel (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
+		ARG 0 levelSectionsFinder
+		ARG 1 sectionFinder
+		ARG 2 paletteFinder
+		ARG 3 level
+	METHOD method_27775 fixHeightmaps (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
+		ARG 1 fixedLevel
+	METHOD method_28172 (ILcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 1 sectionDynamic
+	METHOD method_28173 (Lcom/mojang/serialization/Dynamic;ILcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 2 statesDynamic
+	METHOD method_28174 (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 1 heightmapsDynamic
+	METHOD method_28175 (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 1 heightmapDynamic
diff --git a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping
index d5a13905a9..9eb622e881 100644
--- a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping
+++ b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping
@@ -3,6 +3,21 @@ CLASS net/minecraft/class_3508 net/minecraft/util/collection/PackedIntegerArray
 	FIELD field_15632 size I
 	FIELD field_15633 elementBits I
 	FIELD field_15634 maxValue J
+	FIELD field_24078 INDEX_PARAMETERS [I
+		COMMENT Magic constants for faster integer division by a constant.
+		COMMENT
+		COMMENT <p>This is computed as {@code (n * scale + offset) >> (32 + shift)}. For a divisor n,
+		COMMENT the constants are stored as such:
+		COMMENT
+		COMMENT <ul>
+		COMMENT <li>scale at 3 * (n - 1)</li>
+		COMMENT <li>offset at 3 * (n - 1) + 1</li>
+		COMMENT <li>shift at 3 * (n - 1) + 2</li>
+		COMMENT </ul>
+	FIELD field_24079 elementsPerLong I
+	FIELD field_24080 indexScale I
+	FIELD field_24081 indexOffset I
+	FIELD field_24082 indexShift I
 	METHOD <init> (II)V
 		ARG 1 elementBits
 		ARG 2 size
@@ -22,4 +37,6 @@ CLASS net/minecraft/class_3508 net/minecraft/util/collection/PackedIntegerArray
 	METHOD method_15215 getSize ()I
 	METHOD method_21739 forEach (Ljava/util/function/IntConsumer;)V
 		ARG 1 consumer
+	METHOD method_27284 getStorageIndex (I)I
+		ARG 1 index
 	METHOD method_34896 getElementBits ()I