diff --git a/.editorconfig b/.editorconfig
index 870b721cce..35161774b1 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,2 +1,2 @@
-[*.{gradle,mapping}]
+[*.{gradle,mapping,unpick}]
 indent_style = tab
diff --git a/unpick-definitions/biome_ids.unpick b/unpick-definitions/biome_ids.unpick
new file mode 100644
index 0000000000..bc95bef3f5
--- /dev/null
+++ b/unpick-definitions/biome_ids.unpick
@@ -0,0 +1,115 @@
+v2
+
+constant biome_ids net/minecraft/world/biome/BiomeIds BIRCH_FOREST
+constant biome_ids net/minecraft/world/biome/BiomeIds BIRCH_FOREST_HILLS
+constant biome_ids net/minecraft/world/biome/BiomeIds DARK_FOREST
+constant biome_ids net/minecraft/world/biome/BiomeIds SNOWY_TAIGA
+constant biome_ids net/minecraft/world/biome/BiomeIds SNOWY_TAIGA_HILLS
+constant biome_ids net/minecraft/world/biome/BiomeIds GIANT_TREE_TAIGA
+constant biome_ids net/minecraft/world/biome/BiomeIds GIANT_TREE_TAIGA_HILLS
+constant biome_ids net/minecraft/world/biome/BiomeIds WOODED_MOUNTAINS
+constant biome_ids net/minecraft/world/biome/BiomeIds SAVANNA
+constant biome_ids net/minecraft/world/biome/BiomeIds SAVANNA_PLATEAU
+constant biome_ids net/minecraft/world/biome/BiomeIds BADLANDS
+constant biome_ids net/minecraft/world/biome/BiomeIds WOODED_BADLANDS_PLATEAU
+constant biome_ids net/minecraft/world/biome/BiomeIds BADLANDS_PLATEAU
+constant biome_ids net/minecraft/world/biome/BiomeIds WARM_OCEAN
+constant biome_ids net/minecraft/world/biome/BiomeIds LUKEWARM_OCEAN
+constant biome_ids net/minecraft/world/biome/BiomeIds COLD_OCEAN
+constant biome_ids net/minecraft/world/biome/BiomeIds DEEP_WARM_OCEAN
+constant biome_ids net/minecraft/world/biome/BiomeIds DEEP_LUKEWARM_OCEAN
+constant biome_ids net/minecraft/world/biome/BiomeIds DEEP_COLD_OCEAN
+constant biome_ids net/minecraft/world/biome/BiomeIds DEEP_FROZEN_OCEAN
+constant biome_ids net/minecraft/world/biome/BiomeIds SUNFLOWER_PLAINS
+constant biome_ids net/minecraft/world/biome/BiomeIds DESERT_LAKES
+constant biome_ids net/minecraft/world/biome/BiomeIds GRAVELLY_MOUNTAINS
+constant biome_ids net/minecraft/world/biome/BiomeIds FLOWER_FOREST
+constant biome_ids net/minecraft/world/biome/BiomeIds TAIGA_MOUNTAINS
+constant biome_ids net/minecraft/world/biome/BiomeIds SWAMP_HILLS
+constant biome_ids net/minecraft/world/biome/BiomeIds ICE_SPIKES
+constant biome_ids net/minecraft/world/biome/BiomeIds MODIFIED_JUNGLE
+constant biome_ids net/minecraft/world/biome/BiomeIds MODIFIED_JUNGLE_EDGE
+constant biome_ids net/minecraft/world/biome/BiomeIds TALL_BIRCH_FOREST
+constant biome_ids net/minecraft/world/biome/BiomeIds TALL_BIRCH_HILLS
+constant biome_ids net/minecraft/world/biome/BiomeIds DARK_FOREST_HILLS
+constant biome_ids net/minecraft/world/biome/BiomeIds SNOWY_TAIGA_MOUNTAINS
+constant biome_ids net/minecraft/world/biome/BiomeIds GIANT_SPRUCE_TAIGA
+constant biome_ids net/minecraft/world/biome/BiomeIds GIANT_SPRUCE_TAIGA_HILLS
+constant biome_ids net/minecraft/world/biome/BiomeIds MODIFIED_GRAVELLY_MOUNTAINS
+constant biome_ids net/minecraft/world/biome/BiomeIds SHATTERED_SAVANNA
+constant biome_ids net/minecraft/world/biome/BiomeIds SHATTERED_SAVANNA_PLATEAU
+constant biome_ids net/minecraft/world/biome/BiomeIds ERODED_BADLANDS
+constant biome_ids net/minecraft/world/biome/BiomeIds MODIFIED_WOODED_BADLANDS_PLATEAU
+constant biome_ids net/minecraft/world/biome/BiomeIds MODIFIED_BADLANDS_PLATEAU
+constant biome_ids net/minecraft/world/biome/BiomeIds BAMBOO_JUNGLE
+constant biome_ids net/minecraft/world/biome/BiomeIds BAMBOO_JUNGLE_HILLS
+constant biome_ids net/minecraft/world/biome/BiomeIds OCEAN
+constant biome_ids net/minecraft/world/biome/BiomeIds PLAINS
+constant biome_ids net/minecraft/world/biome/BiomeIds DESERT
+constant biome_ids net/minecraft/world/biome/BiomeIds MOUNTAINS
+constant biome_ids net/minecraft/world/biome/BiomeIds FOREST
+constant biome_ids net/minecraft/world/biome/BiomeIds TAIGA
+constant biome_ids net/minecraft/world/biome/BiomeIds SWAMP
+constant biome_ids net/minecraft/world/biome/BiomeIds RIVER
+constant biome_ids net/minecraft/world/biome/BiomeIds FROZEN_OCEAN
+constant biome_ids net/minecraft/world/biome/BiomeIds FROZEN_RIVER
+constant biome_ids net/minecraft/world/biome/BiomeIds SNOWY_TUNDRA
+constant biome_ids net/minecraft/world/biome/BiomeIds SNOWY_MOUNTAINS
+constant biome_ids net/minecraft/world/biome/BiomeIds MUSHROOM_FIELDS
+constant biome_ids net/minecraft/world/biome/BiomeIds MUSHROOM_FIELD_SHORE
+constant biome_ids net/minecraft/world/biome/BiomeIds BEACH
+constant biome_ids net/minecraft/world/biome/BiomeIds DESERT_HILLS
+constant biome_ids net/minecraft/world/biome/BiomeIds WOODED_HILLS
+constant biome_ids net/minecraft/world/biome/BiomeIds TAIGA_HILLS
+constant biome_ids net/minecraft/world/biome/BiomeIds MOUNTAIN_EDGE
+constant biome_ids net/minecraft/world/biome/BiomeIds JUNGLE
+constant biome_ids net/minecraft/world/biome/BiomeIds JUNGLE_HILLS
+constant biome_ids net/minecraft/world/biome/BiomeIds JUNGLE_EDGE
+constant biome_ids net/minecraft/world/biome/BiomeIds DEEP_OCEAN
+constant biome_ids net/minecraft/world/biome/BiomeIds STONE_SHORE
+constant biome_ids net/minecraft/world/biome/BiomeIds SNOWY_BEACH
+
+# Registration
+target_method net/minecraft/world/biome/BuiltinBiomes register (ILnet/minecraft/util/registry/RegistryKey;Lnet/minecraft/world/biome/Biome;)Lnet/minecraft/world/biome/Biome;
+	param 0 biome_ids
+target_method net/minecraft/world/biome/BuiltinBiomes fromRawId (I)Lnet/minecraft/util/registry/RegistryKey;
+	param 0 biome_ids
+
+# Biome layers
+target_method net/minecraft/world/biome/layer/type/CrossSamplingLayer sample (Lnet/minecraft/world/biome/layer/util/LayerRandomnessSource;IIIII)I
+	param 1 biome_ids
+	param 2 biome_ids
+	param 3 biome_ids
+	param 4 biome_ids
+	param 5 biome_ids
+	return biome_ids
+target_method net/minecraft/world/biome/layer/type/DiagonalCrossSamplingLayer sample (Lnet/minecraft/world/biome/layer/util/LayerRandomnessSource;IIIII)I
+	param 1 biome_ids
+	param 2 biome_ids
+   	param 3 biome_ids
+   	param 4 biome_ids
+	param 5 biome_ids
+	return biome_ids
+target_method net/minecraft/world/biome/layer/type/IdentitySamplingLayer sample (Lnet/minecraft/world/biome/layer/util/LayerRandomnessSource;I)I
+	param 1 biome_ids
+	return biome_ids
+target_method net/minecraft/world/biome/layer/type/InitLayer sample (Lnet/minecraft/world/biome/layer/util/LayerRandomnessSource;II)I
+	return biome_ids
+target_method net/minecraft/world/biome/layer/type/MergingLayer sample (Lnet/minecraft/world/biome/layer/util/LayerRandomnessSource;Lnet/minecraft/world/biome/layer/util/LayerSampler;Lnet/minecraft/world/biome/layer/util/LayerSampler;II)I
+	return biome_ids
+target_method net/minecraft/world/biome/layer/type/ParentedLayer sample (Lnet/minecraft/world/biome/layer/util/LayerRandomnessSource;Lnet/minecraft/world/biome/layer/util/LayerSampler;II)I
+	return biome_ids
+target_method net/minecraft/world/biome/layer/type/SouthEastSamplingLayer sample (Lnet/minecraft/world/biome/layer/util/LayerRandomnessSource;I)I
+	param 1 biome_ids
+	return biome_ids
+target_method net/minecraft/world/biome/layer/util/LayerSampler sample (II)I
+	return biome_ids
+target_method net/minecraft/world/biome/layer/BiomeLayers areSimilar (II)Z
+	param 0 biome_ids
+	param 1 biome_ids
+target_method net/minecraft/world/biome/layer/BiomeLayers putCategory (Lit/unimi/dsi/fastutil/ints/Int2IntOpenHashMap;Lnet/minecraft/world/biome/layer/BiomeLayers$Category;I)V
+	param 2 biome_ids
+target_method net/minecraft/world/biome/layer/BiomeLayers isOcean (I)Z
+	param 0 biome_ids
+target_method net/minecraft/world/biome/layer/BiomeLayers isShallowOcean (I)Z
+	param 0 biome_ids