merge improve-block+604

supersaiyansubtlety · Jul 6, 2024 · 836d516 · 836d516
2 parents ff7cf6d + e54abd2
commit 836d516
Show file tree

Hide file tree

Showing 78 changed files with 252 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,14 @@ maven { url = "https://maven.quiltmc.org/repository/release/" }
 QM versions are named after the Minecraft version they target, followed by `+build.x`,
 with `x` being a number that increments with each new build of QM for that Minecraft version.
 For example, `1.18.2+build.1` is the first build of QM for Minecraft `1.18.2`. You can see additional
-information and see what the latest QM build for each Minecraft version is with [LambdAurora's import tool](https://lambdaurora.dev/tools/import_quilt.html).
+information and see what the latest QM build for each Minecraft version is with the [quilt import tool][quilt-import-tool].
+(For automatic queries, try the [versions API][quilt-meta-api-mappings-version-by-game-version].)
+
+  [quilt-import-tool]: https://quiltmc.org/en/usage/latest-versions/
+  [quilt-meta-api-mappings-version-by-game-version]: https://meta.quiltmc.org/#/v3/get_v3_versions_quilt_mappings__game_version_
+
+
+
 
 ## Contributing to QM
 

diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping
@@ -265,7 +265,7 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block
 		ARG 1 side
 	METHOD m_xfcybcsi appendTooltip (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz;Ljava/util/List;Lnet/minecraft/unmapped/C_taebrtdw;)V
 		ARG 1 stack
-		ARG 2 context
+		ARG 2 tooltipContext
 		ARG 3 tooltip
 		ARG 4 options
 	METHOD m_yobbjtvm getJumpVelocityMultiplier ()F

diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping
@@ -39,10 +39,14 @@ CLASS net/minecraft/unmapped/C_jricjyva net/minecraft/block/Blocks
 	METHOD m_tetaodtf rebuildShapeCache ()V
 	METHOD m_tobwsgju waterlogMapColor (Lnet/minecraft/unmapped/C_mlrprqox;)Ljava/util/function/Function;
 		ARG 0 color
+	METHOD m_tldmwsps (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Z
+		ARG 3 entityType
 	METHOD m_uvuszloo logOf (Lnet/minecraft/unmapped/C_mlrprqox;Lnet/minecraft/unmapped/C_mlrprqox;Lnet/minecraft/unmapped/C_aevintex;)Lnet/minecraft/unmapped/C_mmxmpdoq;
 		ARG 0 topColor
 		ARG 1 sideColor
 		ARG 2 soundGroup
+	METHOD m_viaczyyb (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Z
+		ARG 3 entityType
 	METHOD m_wgtmwkrm bedOf (Lnet/minecraft/unmapped/C_arllgqae;)Lnet/minecraft/unmapped/C_mmxmpdoq;
 		ARG 0 color
 	METHOD m_wjfyifdb nonSolid (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z

diff --git a/mappings/net/minecraft/block/FlowerBlock.mapping b/mappings/net/minecraft/block/FlowerBlock.mapping
@@ -6,3 +6,4 @@ CLASS net/minecraft/unmapped/C_zhojkkij net/minecraft/block/FlowerBlock
 	FIELD f_lmxyscfa SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
 	METHOD m_eohzikrf getEffects (Lnet/minecraft/unmapped/C_cjzoxshv;F)Lnet/minecraft/unmapped/C_ceasgpks;
 		ARG 0 effect
+		ARG 1 duration
diff --git a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping
@@ -3,6 +3,7 @@ CLASS net/minecraft/unmapped/C_buvdtidq net/minecraft/block/ShulkerBoxBlock
 	FIELD f_bceivsho DOWN_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
 	FIELD f_brmygmwh SOUTH_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
 	FIELD f_emzoruxq UP_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
+	FIELD f_ihshplar UNKNOWN_CONTENTS_TEXT Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_ldgxzhyg EAST_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
 	FIELD f_lkgtjife CODEC Lcom/mojang/serialization/MapCodec;
 	FIELD f_mlenspkr SHAPES_BY_DIRECTION Ljava/util/Map;

diff --git a/mappings/net/minecraft/block/dispenser/DispenserBlock.mapping b/mappings/net/minecraft/block/dispenser/DispenserBlock.mapping
@@ -11,15 +11,15 @@ CLASS net/minecraft/unmapped/C_sridforj net/minecraft/block/dispenser/DispenserB
 		ARG 0 provider
 		ARG 1 behavior
 	METHOD m_kmtowdxh getDispensePos (Lnet/minecraft/unmapped/C_wzdnszcs;DLnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_ogbhoqwb;
-		ARG 0 pointer
+		ARG 0 block
 		ARG 1 baseOffsetFactor
 		ARG 3 offset
 	METHOD m_omkokomw registerBehavior (Lnet/minecraft/unmapped/C_gmbqjnle;)V
 		ARG 0 item
 	METHOD m_rdzqftrz (Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;)V
 		ARG 0 map
 	METHOD m_tfzksanp getDispensePos (Lnet/minecraft/unmapped/C_wzdnszcs;)Lnet/minecraft/unmapped/C_ogbhoqwb;
-		ARG 0 pointer
+		ARG 0 block
 	METHOD m_xmkonidr dispense (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;)V
 		ARG 1 world
 		ARG 3 pos
diff --git a/mappings/net/minecraft/block/dispenser/ProjectileDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/ProjectileDispenserBehavior.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/unmapped/C_bcbkqaaq net/minecraft/block/dispenser/ProjectileDispenserBehavior
 	FIELD f_lnvxbzxz projectile Lnet/minecraft/unmapped/C_dokwmwgh;
-	FIELD f_uupspuna config Lnet/minecraft/unmapped/C_dokwmwgh$C_jscrvllj;
+	FIELD f_uupspuna dispenserConfig Lnet/minecraft/unmapped/C_dokwmwgh$C_jscrvllj;
 	METHOD <init> (Lnet/minecraft/unmapped/C_vorddnax;)V
 		ARG 1 item
diff --git a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping
@@ -3,7 +3,7 @@ CLASS net/minecraft/unmapped/C_mwamopji net/minecraft/block/entity/BannerBlockEn
 	FIELD f_ejwtyvwp PATTERNS_KEY Ljava/lang/String;
 	FIELD f_rkjwxvms baseColor Lnet/minecraft/unmapped/C_arllgqae;
 	FIELD f_ufvgulvv customName Lnet/minecraft/unmapped/C_rdaqiwdt;
-	FIELD f_yqkmzniy patterns Lnet/minecraft/unmapped/C_wwbphpbp;
+	FIELD f_yqkmzniy defaultPatternComponent Lnet/minecraft/unmapped/C_wwbphpbp;
 	METHOD <init> (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V
 		ARG 1 pos
 		ARG 2 state
@@ -13,7 +13,7 @@ CLASS net/minecraft/unmapped/C_mwamopji net/minecraft/block/entity/BannerBlockEn
 		ARG 3 baseColor
 	METHOD m_bxugddgd getPickStack ()Lnet/minecraft/unmapped/C_sddaxwyk;
 	METHOD m_igihlswz applyComponentsAndColor (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_arllgqae;)V
-		ARG 2 baseColor
+		ARG 2 dyeColor
 	METHOD m_kmayejyb getPatterns ()Lnet/minecraft/unmapped/C_wwbphpbp;
 	METHOD m_kveaxwty (Lnet/minecraft/unmapped/C_wwbphpbp;)V
 		ARG 1 patterns

diff --git a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/unmapped/C_lmihmwvx net/minecraft/client/gui/screen/AccessibilityOnboardingScreen
 	FIELD f_bhahzogu PADDING I
+	FIELD f_epugxraq ONBOARDING_SCREEN_TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_ftruajer onClose Ljava/lang/Runnable;
 	FIELD f_gfojumgu narratorAvailable Z
 	FIELD f_iurilbsf narratorPromptTimer F

diff --git a/mappings/net/minecraft/client/gui/screen/realms/RealmsBackupScreen.mapping b/mappings/net/minecraft/client/gui/screen/realms/RealmsBackupScreen.mapping
@@ -21,6 +21,7 @@ CLASS net/minecraft/unmapped/C_jyywrsnb net/minecraft/client/gui/screen/realms/R
 	METHOD m_zqolbjnm (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
 	CLASS C_kneakrny BackupObjectEntryListWidget
+		FIELD f_rpsgdrtc ENTRY_HEIGHT I
 		METHOD m_uauvvjwq addEntry (Lnet/minecraft/unmapped/C_iyfhccqr;)V
 			ARG 1 backup
 	CLASS C_mhlryytr

diff --git a/mappings/net/minecraft/client/gui/screen/realms/RealmsClientOutdatedScreen.mapping b/mappings/net/minecraft/client/gui/screen/realms/RealmsClientOutdatedScreen.mapping
@@ -1,5 +1,8 @@
 CLASS net/minecraft/unmapped/C_wymgylgm net/minecraft/client/gui/screen/realms/RealmsClientOutdatedScreen
+	FIELD f_fceomdkp OUTDATED_STABLE_VERSION Lnet/minecraft/unmapped/C_rdaqiwdt;
+	FIELD f_twydutnj UNSUPPORTED_SNAPSHOT_VERSION Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_ueezamsx parent Lnet/minecraft/unmapped/C_wrmtlwqx;
+	FIELD f_uzbpabbi VERSION_NAME_TEXT Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_wxwqglki INCOMPATIBLE_TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
 	METHOD m_zmanudwr (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
diff --git a/mappings/net/minecraft/client/gui/screen/realms/RealmsInviteScreen.mapping b/mappings/net/minecraft/client/gui/screen/realms/RealmsInviteScreen.mapping
@@ -9,6 +9,7 @@ CLASS net/minecraft/unmapped/C_mxnuwmrp net/minecraft/client/gui/screen/realms/R
 	FIELD f_qcjnkeuf serverData Lnet/minecraft/unmapped/C_pwmwypfb;
 	FIELD f_ulhcvksb INVITING_PLAYERS Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_xhtxffug PLAYER_ERROR Lnet/minecraft/unmapped/C_rdaqiwdt;
+	FIELD f_zvyeivwb INVITE_BUTTON Lnet/minecraft/unmapped/C_rdaqiwdt;
 	METHOD <init> (Lnet/minecraft/unmapped/C_knluxkhz;Lnet/minecraft/unmapped/C_wrmtlwqx;Lnet/minecraft/unmapped/C_pwmwypfb;)V
 		ARG 1 configureScreen
 		ARG 2 parent

diff --git a/mappings/net/minecraft/client/gui/screen/realms/RealmsPlayerScreen.mapping b/mappings/net/minecraft/client/gui/screen/realms/RealmsPlayerScreen.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/unmapped/C_owmmvzoi net/minecraft/client/gui/screen/realms/RealmsPlayerScreen
+	FIELD f_azlybfyt PLAYERS_TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_dwmjjlji QUESTION Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_idnwbdmb stateChanged Z
 	FIELD f_lxdgfyqe serverData Lnet/minecraft/unmapped/C_pwmwypfb;

diff --git a/mappings/net/minecraft/component/type/ContainerContentsComponent.mapping b/mappings/net/minecraft/component/type/ContainerContentsComponent.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/unmapped/C_tmeipioo net/minecraft/component/type/ContainerContentsComponent
 	FIELD f_azpkkvlz MAX_SLOTS I
+	FIELD f_dxbajxgt hashCode I
 	FIELD f_oswdeltn NO_SLOT I
 	FIELD f_poyutggn DEFAULT Lnet/minecraft/unmapped/C_tmeipioo;
 	FIELD f_ydquxind stacks Lnet/minecraft/unmapped/C_rnrfftze;

diff --git a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping
@@ -22,6 +22,8 @@ CLASS net/minecraft/unmapped/C_qlclfxvn net/minecraft/component/type/ItemEnchant
 	METHOD m_szyctegw getEnchantmentEntries ()Ljava/util/Set;
 		COMMENT @return a map with enchantments as keys and their levels as values
 	METHOD m_ucwxfcxd withShownInTooltip (Z)Lnet/minecraft/unmapped/C_qlclfxvn;
+	METHOD m_ugcgsgdf (Lnet/minecraft/unmapped/C_cjzoxshv;)I
+		ARG 1 enchantmentHolder
 	METHOD m_ylenfqyd (Lnet/minecraft/unmapped/C_qlclfxvn;)Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;
 		ARG 0 component
 	CLASS C_vbojeisc Builder

diff --git a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping
@@ -41,3 +41,4 @@ CLASS net/minecraft/unmapped/C_cfvrpkog net/minecraft/data/client/ItemModelGener
 		ARG 3 model
 	METHOD m_zkttuqam register ()V
 	CLASS C_cutcputf TrimModelData
+		METHOD m_gdhujqwf material (Lnet/minecraft/unmapped/C_cjzoxshv;)Ljava/lang/String;
diff --git a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping
@@ -77,6 +77,7 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta
 		ARG 6 topLeftHingeOpenModelId
 		ARG 7 topRightHingeClosedModelId
 		ARG 8 topRightHingeOpenModelId
+	METHOD m_cbfmkwcm registerVault ()V
 	METHOD m_cerawgvb getTurtleEggModel (ILjava/lang/String;Lnet/minecraft/unmapped/C_pgmmajlq;)Lnet/minecraft/unmapped/C_ncpywfca;
 		ARG 1 eggs
 		ARG 2 prefix
@@ -258,6 +259,8 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta
 	METHOD m_kugbqgue (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/lang/Boolean;Lnet/minecraft/unmapped/C_wqmdpcsg;)Lnet/minecraft/unmapped/C_yigsfouo;
 		ARG 6 powered
 		ARG 7 straightShape
+	METHOD m_lcwrxfms (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_yigsfouo;
+		ARG 0 model
 	METHOD m_ldjkenju ([ILnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ysvjbfkt$C_mqnwzrnb;Ljava/lang/Integer;)Lnet/minecraft/unmapped/C_yigsfouo;
 		ARG 4 stage
 	METHOD m_lhjyqfue registerPressurePlate (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V

diff --git a/mappings/net/minecraft/data/client/model/Texture.mapping b/mappings/net/minecraft/data/client/model/Texture.mapping
@@ -68,6 +68,11 @@ CLASS net/minecraft/unmapped/C_pgmmajlq net/minecraft/data/client/model/Texture
 		ARG 0 item
 	METHOD m_iyxovfay layer0 (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq;
 		ARG 0 id
+	METHOD m_jizlqyhw vault (Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/unmapped/C_pgmmajlq;
+		ARG 1 front
+		ARG 2 side
+		ARG 3 top
+		ARG 4 bottom
 	METHOD m_jsbgkmgq layer0 (Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_pgmmajlq;
 		ARG 0 item
 	METHOD m_kjojfkfg getTexture (Lnet/minecraft/unmapped/C_pixosdqo;)Lnet/minecraft/unmapped/C_ncpywfca;

diff --git a/mappings/net/minecraft/data/server/LootTablesProvider.mapping b/mappings/net/minecraft/data/server/LootTablesProvider.mapping
@@ -1,8 +1,13 @@
 CLASS net/minecraft/unmapped/C_rriyyrek net/minecraft/data/server/LootTablesProvider
+	FIELD f_hwfthond lootTableProviderFuture Ljava/util/concurrent/CompletableFuture;
 	FIELD f_khsnzwsn lootTypeGenerators Ljava/util/List;
 	FIELD f_umgzdmcg LOGGER Lorg/slf4j/Logger;
 	FIELD f_xcjyrvon lootTableIds Ljava/util/Set;
 	FIELD f_xiwpsgvz pathResolver Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc;
+	METHOD <init> (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/Set;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)V
+		ARG 1 dataPackOutput
+	METHOD m_cvuljxmh (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 writer
 	METHOD m_wtovnwug (Ljava/util/Map;Lnet/minecraft/unmapped/C_rriyyrek$C_ujsjtlmo;Lnet/minecraft/unmapped/C_eexxncvi;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu;)V
 		ARG 1 entry
 	CLASS C_ujsjtlmo GeneratorEntry
diff --git a/mappings/net/minecraft/data/server/RecipesProvider.mapping b/mappings/net/minecraft/data/server/RecipesProvider.mapping
@@ -1,7 +1,10 @@
 CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvider
 	FIELD f_dkgabfry recipesPathResolver Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc;
 	FIELD f_gkpbaybx advancementsPathResolver Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc;
+	FIELD f_hmgeaffs recipeProviderFuture Ljava/util/concurrent/CompletableFuture;
 	FIELD f_ysgqrakl VARIANT_FACTORIES Ljava/util/Map;
+	METHOD <init> (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V
+		ARG 1 dataPackOutput
 	METHOD m_acjyothp generateFamily (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_eonlnchv;Lnet/minecraft/unmapped/C_czxxrbcp;)V
 		ARG 1 family
 		ARG 2 featureFlags

diff --git a/mappings/net/minecraft/data/server/VanillaLootTableProvider.mapping b/mappings/net/minecraft/data/server/VanillaLootTableProvider.mapping
@@ -1,3 +1,4 @@
 CLASS net/minecraft/unmapped/C_vfvrndvd net/minecraft/data/server/VanillaLootTableProvider
 	METHOD m_anouxifk create (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/unmapped/C_rriyyrek;
 		ARG 0 output
+		ARG 1 lootTableProviderFuture
diff --git a/mappings/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.mapping b/mappings/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.mapping
@@ -25,6 +25,7 @@ CLASS net/minecraft/unmapped/C_unbelsbg net/minecraft/data/server/advancement/Ad
 		ARG 1 entityPredicate
 	METHOD m_mgvgqwrb appendEnterAllBiomesCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Ljava/util/List;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;
 		ARG 0 task
+		ARG 1 biomeProvider
 		ARG 2 biomes
 	METHOD m_pyldeoxx buildAdventuringTime (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_unoypvme;Lnet/minecraft/unmapped/C_xmtsvelx$C_jgklgqjr;)V
 		ARG 1 exporter

diff --git a/mappings/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.mapping b/mappings/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.mapping
@@ -9,6 +9,9 @@ CLASS net/minecraft/unmapped/C_vfenxpjt net/minecraft/data/server/advancement/Hu
 		ARG 0 task
 		ARG 1 instantBreedingAnimals
 		ARG 2 eggLayingAnimals
+	METHOD m_bqvinwli appendTameAllWolfVariantsCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;
+		ARG 0 task
+		ARG 1 variantProvider
 	METHOD m_fehmbxhu appendEatAllFoodCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;
 		ARG 0 task
 	METHOD m_fqhhoyxq appendTameAllCatVariantsCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;

diff --git a/mappings/net/minecraft/data/server/tag/EnchantmentTagProvider.mapping b/mappings/net/minecraft/data/server/tag/EnchantmentTagProvider.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/unmapped/C_vkynrwhu net/minecraft/data/server/tag/EnchantmentTagProvider
diff --git a/mappings/net/minecraft/datafixer/TypeReferences.mapping b/mappings/net/minecraft/datafixer/TypeReferences.mapping
@@ -57,3 +57,5 @@ CLASS net/minecraft/unmapped/C_rodgceaz net/minecraft/datafixer/TypeReferences
 	FIELD f_yrwdjncz UNTAGGED_SPAWNER Lcom/mojang/datafixers/DSL$TypeReference;
 	FIELD f_yxxgexah PLAYER Lcom/mojang/datafixers/DSL$TypeReference;
 		COMMENT A type reference which refers to a player.
+	METHOD m_asfwfitz createTypeReference (Ljava/lang/String;)Lcom/mojang/datafixers/DSL$TypeReference;
+		ARG 0 typeName
diff --git a/mappings/net/minecraft/datafixer/fix/ArrowStoredWeaponFix.mapping b/mappings/net/minecraft/datafixer/fix/ArrowStoredWeaponFix.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/unmapped/C_sjuegdjy net/minecraft/datafixer/fix/ArrowStoredWeaponFix
+	METHOD m_vmdiafis (Ljava/lang/String;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;)Ljava/util/function/Function;
+		ARG 0 name
diff --git a/mappings/net/minecraft/datafixer/fix/AttributeIdFix.mapping b/mappings/net/minecraft/datafixer/fix/AttributeIdFix.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/unmapped/C_zjsuejaf net/minecraft/datafixer/fix/AttributeIdFix
diff --git a/mappings/net/minecraft/datafixer/fix/ParticleUnflatteningFix.mapping b/mappings/net/minecraft/datafixer/fix/ParticleUnflatteningFix.mapping
@@ -1,2 +1,4 @@
 CLASS net/minecraft/unmapped/C_asohzhmn net/minecraft/datafixer/fix/ParticleUnflatteningFix
+	METHOD m_llilnhnp parseTag (Ljava/lang/String;)Lnet/minecraft/unmapped/C_hhlwcnih;
+		ARG 0 tag
 	METHOD makeRule makeRule ()Lcom/mojang/datafixers/TypeRewriteRule;
diff --git a/mappings/net/minecraft/datafixer/fix/RemoveEmptyItemInSuspiciousBlockFix.mapping b/mappings/net/minecraft/datafixer/fix/RemoveEmptyItemInSuspiciousBlockFix.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/unmapped/C_dxtlxcwy net/minecraft/datafixer/fix/RemoveEmptyItemInSuspiciousBlockFix
diff --git a/mappings/net/minecraft/datafixer/schema/Schema3818v5.mapping b/mappings/net/minecraft/datafixer/schema/Schema3818v5.mapping
@@ -1 +1,4 @@
 CLASS net/minecraft/unmapped/C_orxszuap net/minecraft/datafixer/schema/Schema3818v5
+	METHOD registerTypes registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V
+		ARG 2 entityTypes
+		ARG 3 blockEntityTypes
diff --git a/mappings/net/minecraft/datafixer/schema/Schema3938.mapping b/mappings/net/minecraft/datafixer/schema/Schema3938.mapping
@@ -1 +1,2 @@
 CLASS net/minecraft/unmapped/C_hwfxjmrq net/minecraft/datafixer/schema/Schema3938
+	METHOD registerEntities registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map;
diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping
@@ -1,12 +1,32 @@
 CLASS net/minecraft/unmapped/C_jxtrubuh net/minecraft/enchantment/Enchantment
+	FIELD f_cvunyugc HOLDER_CODEC Lcom/mojang/serialization/Codec;
+	FIELD f_cytkilek properties Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
+	FIELD f_yozrarfo CODEC Lcom/mojang/serialization/Codec;
+	METHOD m_ajxstdmb properties (Lnet/minecraft/unmapped/C_odfnijdo;Lnet/minecraft/unmapped/C_odfnijdo;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;I[Lnet/minecraft/unmapped/C_qfoqahef;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
+	METHOD m_chvflatp (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_iakykpgh;
+		ARG 2 item
+	METHOD m_ciojbccw (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_iakykpgh;
+		ARG 2 entity
+		ARG 3 origin
 	METHOD m_glfcpyqa getMaxLevel ()I
 		COMMENT Sets the maximum number of levels, such as Sharpness which has a maximum 5 levels, the enchantment has. Default: 1.
+	METHOD m_iarnlloo isSupported (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
 	METHOD m_igxrorrr getMinLevel ()I
 		COMMENT Sets the minimum number of levels, such as Sharpness which has a minimum of 1 level, the enchantment has. Default: 1.
+	METHOD m_jhglsmkm (Lnet/minecraft/unmapped/C_yuycoehb;)Z
+		ARG 1 equipmentSlot
+	METHOD m_kevrabge (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
+		ARG 2 level
 	METHOD m_khmhdqpw isAcceptableItem (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
 		COMMENT {@return the type of item ({@code stack}) that can have this applied to it}
 		ARG 1 stack
 	METHOD m_lcxutjum getWeight ()I
+	METHOD m_nfuegjdm (Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
+		ARG 0 properties
+	METHOD m_npijgbpy getSupportedItems ()Lnet/minecraft/unmapped/C_odfnijdo;
+	METHOD m_qirqbtfb (Ljava/util/List;Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/function/Consumer;)V
+		ARG 1 lootContext
+	METHOD m_rftiggzk properties (Lnet/minecraft/unmapped/C_odfnijdo;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;I[Lnet/minecraft/unmapped/C_qfoqahef;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
 	METHOD m_rtwmhoyh getMinPower (I)I
 		COMMENT {@return the minimum level required to by the player for the enchantment to be shown in the enchantment table.}
 		COMMENT It is not a 1:1 ratio. The majority of enchantments return something similar to `10 * level`, often with different scales depending on the maximum level and rarity of the enchantment.
@@ -16,9 +36,21 @@ CLASS net/minecraft/unmapped/C_jxtrubuh net/minecraft/enchantment/Enchantment
 	METHOD m_vjzmieep cost (I)Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;
 	METHOD m_xaezlmue getAnvilCost ()I
 	METHOD m_ygnxsicw cost (II)Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;
+	METHOD m_yyvgkyyg (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)Lnet/minecraft/unmapped/C_iakykpgh;
+		ARG 1 level
+		ARG 2 entity
+		ARG 3 damageSource
+	METHOD m_zjsipvve (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Z)Lnet/minecraft/unmapped/C_iakykpgh;
+		ARG 1 level
+		ARG 2 entity
+		ARG 3 isActive
 	METHOD m_ztycenho getMaxPower (I)I
 		COMMENT {@return the maximum level a Player is allowed before the enchant is not shown in the enchantment table}
 		COMMENT The default return is the minimum power level + 5.
 		ARG 1 level
+	CLASS C_epmoqirc
+		FIELD f_fmooecif builder Lnet/minecraft/unmapped/C_kouhnfig$C_vfzyoahz;
+		FIELD f_radrlqvu properties Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
+		FIELD f_ykzrjano enchantmentHolder Lnet/minecraft/unmapped/C_odfnijdo;
 	CLASS C_jkttgiwc Cost
 	CLASS C_ryljcnwe Properties
diff --git a/mappings/net/minecraft/enchantment/EnchantmentLevelEntry.mapping b/mappings/net/minecraft/enchantment/EnchantmentLevelEntry.mapping
@@ -9,3 +9,4 @@ CLASS net/minecraft/unmapped/C_gsnkkurc net/minecraft/enchantment/EnchantmentLev
 	COMMENT
 	COMMENT <p>This class is immutable. It does not override hashCode or equals.
 	FIELD f_otdtqrqd level I
+	FIELD f_ykbaoghe enchantmentHolder Lnet/minecraft/unmapped/C_cjzoxshv;