1.21-pre1 more stuff (#3886)

* 1.21-pre1 more stuff * Apply suggestions from code review Co-authored-by: Shnupbups <[email protected]> --------- Co-authored-by: Shnupbups <[email protected]>
FabricMC · May 31, 2024 · ae461fc · ae461fc
1 parent 0c1edce
commit ae461fc
Show file tree

Hide file tree

Showing 60 changed files with 365 additions and 39 deletions.
diff --git a/mappings/net/minecraft/class_9820.mapping b/mappings/net/minecraft/class_9820.mapping
diff --git a/mappings/net/minecraft/class_9824.mapping b/mappings/net/minecraft/class_9824.mapping
diff --git a/mappings/net/minecraft/client/gui/screen/ConfirmLinkScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConfirmLinkScreen.mapping
@@ -12,13 +12,25 @@ CLASS net/minecraft/class_407 net/minecraft/client/gui/screen/ConfirmLinkScreen
 		ARG 2 title
 		ARG 3 link
 		ARG 4 linkTrusted
+	METHOD <init> (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_2561;Ljava/net/URI;Z)V
+		ARG 1 callback
+		ARG 2 title
+		ARG 3 link
+		ARG 4 linkTrusted
 	METHOD <init> (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/lang/String;Lnet/minecraft/class_2561;Z)V
 		ARG 1 callback
 		ARG 2 title
 		ARG 3 message
 		ARG 4 link
 		ARG 5 noText
 		ARG 6 linkTrusted
+	METHOD <init> (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/net/URI;Lnet/minecraft/class_2561;Z)V
+		ARG 1 callback
+		ARG 2 title
+		ARG 3 message
+		ARG 4 link
+		ARG 5 noText
+		ARG 6 linkTrusted
 	METHOD method_19795 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_19796 (Lnet/minecraft/class_4185;)V
@@ -54,7 +66,25 @@ CLASS net/minecraft/class_407 net/minecraft/client/gui/screen/ConfirmLinkScreen
 		ARG 0 parent
 		ARG 1 url
 		ARG 2 linkTrusted
-	METHOD method_60867 createOpenPressAction (Lnet/minecraft/class_437;Ljava/lang/String;Z)Lnet/minecraft/class_4185$class_4241;
+	METHOD method_60867 opening (Lnet/minecraft/class_437;Ljava/lang/String;Z)Lnet/minecraft/class_4185$class_4241;
 		ARG 0 parent
 		ARG 1 url
 		ARG 2 linkTrusted
+	METHOD method_61033 open (Lnet/minecraft/class_437;Ljava/net/URI;)V
+		ARG 0 parent
+		ARG 1 uri
+	METHOD method_61034 open (Lnet/minecraft/class_437;Ljava/net/URI;Z)V
+		ARG 0 parent
+		ARG 1 uri
+		ARG 2 linkTrusted
+	METHOD method_61035 (Lnet/minecraft/class_437;Ljava/net/URI;ZLnet/minecraft/class_4185;)V
+		ARG 3 button
+	METHOD method_61036 (Ljava/net/URI;Lnet/minecraft/class_310;Lnet/minecraft/class_437;Z)V
+		ARG 3 confirmed
+	METHOD method_61037 opening (Lnet/minecraft/class_437;Ljava/net/URI;)Lnet/minecraft/class_4185$class_4241;
+		ARG 0 parent
+		ARG 1 uri
+	METHOD method_61038 opening (Lnet/minecraft/class_437;Ljava/net/URI;Z)Lnet/minecraft/class_4185$class_4241;
+		ARG 0 parent
+		ARG 1 uri
+		ARG 2 linkTrusted
diff --git a/mappings/net/minecraft/client/gui/screen/DisconnectedScreen.mapping b/mappings/net/minecraft/client/gui/screen/DisconnectedScreen.mapping
@@ -29,5 +29,9 @@ CLASS net/minecraft/class_419 net/minecraft/client/gui/screen/DisconnectedScreen
 		ARG 1 button
 	METHOD method_51256 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
+	METHOD method_60868 (Ljava/net/URI;)V
+		ARG 1 uri
 	METHOD method_60869 (Ljava/nio/file/Path;Lnet/minecraft/class_4185;)V
 		ARG 1 button
+	METHOD method_60870 (Ljava/nio/file/Path;)V
+		ARG 1 path
diff --git a/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping b/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping
@@ -34,6 +34,7 @@ CLASS net/minecraft/class_433 net/minecraft/client/gui/screen/GameMenuScreen
 	METHOD method_47899 createUrlButton (Lnet/minecraft/class_437;Lnet/minecraft/class_2561;Ljava/net/URI;)Lnet/minecraft/class_4185;
 		ARG 0 parent
 		ARG 1 text
+		ARG 2 uri
 	METHOD method_47900 createButton (Lnet/minecraft/class_2561;Ljava/util/function/Supplier;)Lnet/minecraft/class_4185;
 		ARG 1 text
 		ARG 2 screenSupplier

diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping
@@ -29,6 +29,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 	FIELD field_49896 FOOTER_SEPARATOR_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_49897 INWORLD_HEADER_SEPARATOR_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_49898 INWORLD_FOOTER_SEPARATOR_TEXTURE Lnet/minecraft/class_2960;
+	FIELD field_52252 narratorToggleButton Lnet/minecraft/class_5676;
 	METHOD <init> (Lnet/minecraft/class_2561;)V
 		ARG 1 title
 	METHOD method_25393 tick ()V
@@ -192,6 +193,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 	METHOD method_59840 clearTooltip ()V
 	METHOD method_61039 (Ljava/net/URI;Z)V
 		ARG 2 confirmed
+	METHOD method_61040 refreshNarrator (Z)V
+		ARG 1 previouslyDisabled
 	CLASS class_6390 SelectedElementNarrationData
 		FIELD field_33825 selectable Lnet/minecraft/class_6379;
 		FIELD field_33826 index I

diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping
@@ -22,6 +22,7 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc
 	METHOD <init> (Lnet/minecraft/class_454;Lnet/minecraft/class_310;Lnet/minecraft/class_8781;Lnet/minecraft/class_185;)V
 		ARG 1 tab
 		ARG 2 client
+		ARG 3 advancement
 		ARG 4 display
 	METHOD method_2322 addChild (Lnet/minecraft/class_456;)V
 		ARG 1 widget
@@ -60,3 +61,4 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc
 		ARG 0 textHandler
 		ARG 1 lines
 	METHOD method_35737 getWidth ()I
+	METHOD method_61041 getProgressWidth ()I
diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping
@@ -7,7 +7,9 @@ CLASS net/minecraft/class_491 net/minecraft/client/gui/screen/ingame/HorseScreen
 	FIELD field_45473 CHEST_SLOTS_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_45474 SADDLE_SLOT_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_45475 LLAMA_ARMOR_SLOT_TEXTURE Lnet/minecraft/class_2960;
+	FIELD field_52253 slotColumnCount I
 	METHOD <init> (Lnet/minecraft/class_1724;Lnet/minecraft/class_1661;Lnet/minecraft/class_1496;I)V
 		ARG 1 handler
 		ARG 2 inventory
 		ARG 3 entity
+		ARG 4 slotColumnCount
diff --git a/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping
@@ -48,3 +48,5 @@ CLASS net/minecraft/class_3742 net/minecraft/client/gui/screen/ingame/JigsawBloc
 		ARG 2 keepJigsaws
 	METHOD method_54800 parseInt (Ljava/lang/String;)I
 		ARG 1 value
+	METHOD method_61042 isValidId (Ljava/lang/String;)Z
+		ARG 0 id
diff --git a/mappings/net/minecraft/client/gui/screen/world/SymlinkWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/SymlinkWarningScreen.mapping
@@ -10,6 +10,7 @@ CLASS net/minecraft/class_8669 net/minecraft/client/gui/screen/world/SymlinkWarn
 	METHOD <init> (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/net/URI;Ljava/lang/Runnable;)V
 		ARG 1 title
 		ARG 2 message
+		ARG 3 link
 		ARG 4 onClose
 	METHOD method_52747 (Lnet/minecraft/class_4185;)V
 		ARG 1 button

diff --git a/mappings/net/minecraft/client/render/VertexConsumer.mapping b/mappings/net/minecraft/client/render/VertexConsumer.mapping
@@ -195,3 +195,6 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer
 		COMMENT
 		COMMENT @return this consumer, for chaining
 		ARG 1 rgb
+	METHOD method_61032 vertex (Lnet/minecraft/class_4587$class_4665;Lorg/joml/Vector3f;)Lnet/minecraft/class_4588;
+		ARG 1 matrix
+		ARG 2 vec
diff --git a/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping b/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping
@@ -26,6 +26,7 @@ CLASS net/minecraft/class_4597 net/minecraft/client/render/VertexConsumerProvide
 		COMMENT RenderLayer#TRANSLUCENT the translucent render layer} should be drawn in
 		COMMENT a later stage so the other things behind translucent objects are
 		COMMENT visible.
+		ARG 0 layerBuffers
 		ARG 1 fallbackBuffer
 	CLASS class_4598 Immediate
 		COMMENT A vertex consumer provider that immediately draws the current buffer

diff --git a/mappings/net/minecraft/client/render/model/BlockStatesLoader.mapping b/mappings/net/minecraft/client/render/model/BlockStatesLoader.mapping
@@ -0,0 +1,88 @@
+CLASS net/minecraft/class_9824 net/minecraft/client/render/model/BlockStatesLoader
+	FIELD field_52260 FINDER Lnet/minecraft/class_7654;
+	FIELD field_52261 LOGGER Lorg/slf4j/Logger;
+	FIELD field_52263 COMMA_SPLITTER Lcom/google/common/base/Splitter;
+	FIELD field_52264 EQUAL_SIGN_SPLITTER Lcom/google/common/base/Splitter;
+	FIELD field_52265 ITEM_FRAME_STATE_MANAGER Lnet/minecraft/class_2689;
+	FIELD field_52266 STATIC_DEFINITIONS Ljava/util/Map;
+	FIELD field_52267 blockStates Ljava/util/Map;
+	FIELD field_52268 profiler Lnet/minecraft/class_3695;
+	FIELD field_52269 blockColors Lnet/minecraft/class_324;
+	FIELD field_52270 onLoad Ljava/util/function/BiConsumer;
+	FIELD field_52271 lookupId I
+	FIELD field_52272 stateLookup Lit/unimi/dsi/fastutil/objects/Object2IntMap;
+	FIELD field_52273 missingModel Lnet/minecraft/class_9824$class_9825;
+	FIELD field_52274 context Lnet/minecraft/class_790$class_791;
+	METHOD <init> (Ljava/util/Map;Lnet/minecraft/class_3695;Lnet/minecraft/class_1100;Lnet/minecraft/class_324;Ljava/util/function/BiConsumer;)V
+		ARG 1 blockStates
+		ARG 2 profiler
+		ARG 3 missingModel
+		ARG 4 blockColors
+		ARG 5 onLoad
+	METHOD method_61051 load ()V
+	METHOD method_61052 (ILnet/minecraft/class_2680;)V
+		ARG 2 state
+	METHOD method_61053 loadBlockStates (Lnet/minecraft/class_2960;Lnet/minecraft/class_2689;)V
+		ARG 1 id
+		ARG 2 stateManager
+	METHOD method_61054 (Lnet/minecraft/class_2248;Ljava/util/Map;Lnet/minecraft/class_2680;)Z
+		ARG 2 state
+	METHOD method_61057 toStatePredicate (Lnet/minecraft/class_2689;Ljava/lang/String;)Ljava/util/function/Predicate;
+		ARG 0 stateManager
+		ARG 1 predicate
+	METHOD method_61058 parseProperty (Lnet/minecraft/class_2769;Ljava/lang/String;)Ljava/lang/Comparable;
+		ARG 0 property
+		ARG 1 value
+	METHOD method_61060 (Lnet/minecraft/class_9824$class_4455;)Ljava/util/Set;
+		ARG 0 definition
+	METHOD method_61061 (Lnet/minecraft/class_9824$class_4455;Ljava/util/Set;)V
+		ARG 1 definition
+		ARG 2 states
+	METHOD method_61062 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V
+		ARG 0 map
+	METHOD method_61063 addStates (Ljava/lang/Iterable;)V
+		ARG 1 states
+	METHOD method_61064 (Ljava/util/List;Lnet/minecraft/class_2689;Ljava/util/Map;Ljava/util/List;Lnet/minecraft/class_816;Lnet/minecraft/class_790;Lnet/minecraft/class_2960;Lnet/minecraft/class_9824$class_7777;Ljava/lang/String;Lnet/minecraft/class_807;)V
+		ARG 9 variant
+		ARG 10 model
+	METHOD method_61065 (Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_2680;)V
+		ARG 2 state
+	METHOD method_61066 (Ljava/util/Map;Lnet/minecraft/class_2960;Ljava/util/Map;Lnet/minecraft/class_1091;Lnet/minecraft/class_2680;)V
+		ARG 4 modelId
+		ARG 5 state
+	METHOD method_61067 (Ljava/util/Map;Lnet/minecraft/class_807;Ljava/util/List;Lnet/minecraft/class_816;Lnet/minecraft/class_790;Lnet/minecraft/class_2680;)V
+		ARG 6 state
+	METHOD method_61068 (Ljava/util/Map;Lnet/minecraft/class_816;Ljava/util/List;Lnet/minecraft/class_2680;)V
+		ARG 3 state
+	METHOD method_61069 getStateLookup ()Lit/unimi/dsi/fastutil/objects/Object2IntMap;
+	CLASS class_1089 ModelLoaderException
+		METHOD <init> (Ljava/lang/String;)V
+			ARG 1 message
+	CLASS class_4455 ModelDefinition
+		FIELD comp_2873 components Ljava/util/List;
+		FIELD comp_2874 values Ljava/util/List;
+		METHOD <init> (Ljava/util/List;Ljava/util/List;)V
+			ARG 1 components
+			ARG 2 values
+		METHOD comp_2873 components ()Ljava/util/List;
+		METHOD comp_2874 values ()Ljava/util/List;
+		METHOD equals (Ljava/lang/Object;)Z
+			ARG 1 o
+		METHOD method_21607 create (Lnet/minecraft/class_2680;Lnet/minecraft/class_816;Ljava/util/Collection;)Lnet/minecraft/class_9824$class_4455;
+			ARG 0 state
+			ARG 1 rawModel
+			ARG 2 properties
+		METHOD method_21608 create (Lnet/minecraft/class_2680;Lnet/minecraft/class_1100;Ljava/util/Collection;)Lnet/minecraft/class_9824$class_4455;
+			ARG 0 state
+			ARG 1 rawModel
+			ARG 2 properties
+		METHOD method_21609 getStateValues (Lnet/minecraft/class_2680;Ljava/util/Collection;)Ljava/util/List;
+			ARG 0 state
+			ARG 1 properties
+		METHOD method_21610 (Lnet/minecraft/class_2689;Lnet/minecraft/class_2680;Lnet/minecraft/class_819;)Z
+			ARG 2 component
+	CLASS class_7777 SourceTrackedData
+		METHOD method_61071 readVariantMap (Lnet/minecraft/class_2960;Lnet/minecraft/class_790$class_791;)Lnet/minecraft/class_790;
+			ARG 1 id
+			ARG 2 context
+	CLASS class_9825 BlockModel
diff --git a/mappings/net/minecraft/client/render/model/ModelLoader.mapping b/mappings/net/minecraft/client/render/model/ModelLoader.mapping
@@ -12,6 +12,8 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader
 	FIELD field_32989 MISSING Ljava/lang/String;
 	FIELD field_40567 jsonUnbakedModels Ljava/util/Map;
 	FIELD field_40570 MODELS_FINDER Lnet/minecraft/class_7654;
+	FIELD field_52275 missingModel Lnet/minecraft/class_1100;
+	FIELD field_52276 MISSING_MODEL_ID Lnet/minecraft/class_1091;
 	FIELD field_5370 FIRE_1 Lnet/minecraft/class_4730;
 	FIELD field_5371 MISSING_DEFINITION Ljava/lang/String;
 	FIELD field_5374 MISSING_ID Lnet/minecraft/class_2960;
@@ -42,6 +44,7 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader
 	METHOD method_45875 (Lnet/minecraft/class_1100;)V
 		ARG 1 model
 	METHOD method_45876 bake (Lnet/minecraft/class_1088$class_9826;)V
+		ARG 1 spliteGetter
 	METHOD method_4718 loadModelFromJson (Lnet/minecraft/class_2960;)Lnet/minecraft/class_793;
 		ARG 1 id
 	METHOD method_4719 (Lnet/minecraft/class_793;)V
@@ -51,8 +54,30 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader
 	METHOD method_4726 getOrLoadModel (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1100;
 		ARG 1 id
 	METHOD method_4734 getBakedModelMap ()Ljava/util/Map;
+	METHOD method_60912 (Ljava/lang/String;)Ljava/lang/String;
+		ARG 0 path
+	METHOD method_61072 (Lnet/minecraft/class_1088$class_9826;Lnet/minecraft/class_1091;Lnet/minecraft/class_1100;)V
+		ARG 2 id
+		ARG 3 model
+	METHOD method_61073 loadItemModel (Lnet/minecraft/class_1091;)V
+		ARG 1 id
+	METHOD method_61074 add (Lnet/minecraft/class_1091;Lnet/minecraft/class_1100;)V
+		ARG 1 id
+		ARG 2 model
+	METHOD method_61075 loadInventoryVariantItemModel (Lnet/minecraft/class_2960;)V
+		ARG 1 id
+	METHOD method_61076 addModelToBake (Lnet/minecraft/class_1091;Lnet/minecraft/class_1100;)V
+		ARG 1 id
+		ARG 2 model
 	CLASS class_7776 BakedModelCacheKey
 	CLASS class_7778 BakerImpl
 		FIELD field_40572 textureGetter Ljava/util/function/Function;
 		METHOD method_45878 (Lnet/minecraft/class_1088$class_9826;Lnet/minecraft/class_1091;Lnet/minecraft/class_4730;)Lnet/minecraft/class_1058;
 			ARG 2 spriteId
+		METHOD method_61077 bake (Lnet/minecraft/class_1100;Lnet/minecraft/class_3665;)Lnet/minecraft/class_1087;
+			ARG 1 model
+			ARG 2 settings
+	CLASS class_9826 SpriteGetter
+		METHOD get (Lnet/minecraft/class_1091;Lnet/minecraft/class_4730;)Lnet/minecraft/class_1058;
+			ARG 1 modelId
+			ARG 2 spriteId
diff --git a/mappings/net/minecraft/client/session/Bans.mapping b/mappings/net/minecraft/client/session/Bans.mapping
@@ -21,6 +21,10 @@ CLASS net/minecraft/class_7588 net/minecraft/client/session/Bans
 		ARG 0 banDetails
 	METHOD method_53554 createSkinBanScreen (Ljava/lang/Runnable;)Lnet/minecraft/class_407;
 		ARG 0 onClose
+	METHOD method_53555 (Ljava/net/URI;Ljava/lang/Runnable;Z)V
+		ARG 2 confirmed
 	METHOD method_53556 createUsernameBanScreen (Ljava/lang/String;Ljava/lang/Runnable;)Lnet/minecraft/class_407;
 		ARG 0 username
 		ARG 1 onClose
+	METHOD method_53557 (Ljava/net/URI;Ljava/lang/Runnable;Z)V
+		ARG 2 confirmed
diff --git a/mappings/net/minecraft/command/EntitySelectorReader.mapping b/mappings/net/minecraft/command/EntitySelectorReader.mapping
@@ -31,7 +31,7 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader
 	FIELD field_10867 DEFAULT_SUGGESTION_PROVIDER Ljava/util/function/BiFunction;
 	FIELD field_10868 excludesTeam Z
 	FIELD field_10869 NEAREST Ljava/util/function/BiConsumer;
-	FIELD field_10870 predicate Ljava/util/List;
+	FIELD field_10870 predicates Ljava/util/List;
 	FIELD field_10871 excludesGameMode Z
 	FIELD field_10872 y Ljava/lang/Double;
 	FIELD field_10873 hasSorter Z
@@ -210,7 +210,7 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader
 	METHOD method_9913 setExcludesName (Z)V
 		ARG 1 excludesName
 	METHOD method_9915 readTagCharacter ()Z
-	METHOD method_9916 setPredicate (Ljava/util/function/Predicate;)V
+	METHOD method_9916 addPredicate (Ljava/util/function/Predicate;)V
 		ARG 1 predicate
 	METHOD method_9917 readAtVariable ()V
 	METHOD method_9918 setDz (D)V

diff --git a/mappings/net/minecraft/data/report/PacketReportProvider.mapping b/mappings/net/minecraft/data/report/PacketReportProvider.mapping
@@ -2,3 +2,12 @@ CLASS net/minecraft/class_9827 net/minecraft/data/report/PacketReportProvider
 	FIELD field_52278 output Lnet/minecraft/class_7784;
 	METHOD <init> (Lnet/minecraft/class_7784;)V
 		ARG 1 output
+	METHOD method_61083 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2539;Ljava/util/List;)V
+		ARG 1 phase
+		ARG 2 states
+	METHOD method_61084 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_9127$class_9128;)V
+		ARG 1 state
+	METHOD method_61085 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_9145;I)V
+		ARG 1 packetType
+		ARG 2 protocolId
+	METHOD method_61086 toJson ()Lcom/google/gson/JsonElement;
diff --git a/...nt/EnchantmentLevelBasedValueType.mapping → ...ntment/EnchantmentLevelBasedValue.mapping b/...nt/EnchantmentLevelBasedValueType.mapping → ...ntment/EnchantmentLevelBasedValue.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_9704 net/minecraft/enchantment/EnchantmentLevelBasedValueType
+CLASS net/minecraft/class_9704 net/minecraft/enchantment/EnchantmentLevelBasedValue
 	FIELD field_51689 BASE_CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_51690 CODEC Lcom/mojang/serialization/Codec;
 	METHOD method_60185 getCodec ()Lcom/mojang/serialization/MapCodec;

diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
@@ -2254,6 +2254,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 1 portal
 		ARG 2 pos
 	METHOD method_60698 tickPortalTeleportation ()V
+	METHOD method_60949 refreshPositionAndAngles (Lnet/minecraft/class_243;FF)V
+		ARG 1 pos
+		ARG 2 yaw
+		ARG 3 pitch
 	METHOD method_60950 addPortalChunkTicketAt (Lnet/minecraft/class_2338;)V
 		ARG 1 pos
 	METHOD method_60951 lerpYaw (F)F

diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping
@@ -279,6 +279,11 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 	METHOD method_59928 playAttackSound ()V
 	METHOD method_5993 getJumpControl ()Lnet/minecraft/class_1334;
 	METHOD method_5994 getAmbientSound ()Lnet/minecraft/class_3414;
+	METHOD method_60972 dropEquipment (Ljava/util/function/Predicate;)Ljava/util/Set;
+		ARG 1 dropPredicate
+	METHOD method_60973 dropAllEquipment ()V
+	METHOD method_60974 (Lnet/minecraft/class_1799;)Z
+		ARG 0 stack
 	METHOD method_6510 isAttacking ()Z
 	METHOD method_6773 isHorseArmor (Lnet/minecraft/class_1799;)Z
 		ARG 1 stack

diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping
@@ -19,6 +19,8 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity
 		ARG 1 profession
 	METHOD method_56681 (Lnet/minecraft/class_1916;)V
 		ARG 1 offerData
+	METHOD method_60978 (Lnet/minecraft/class_1799;)Z
+		ARG 0 stack
 	METHOD method_7194 getConversionRate ()I
 	METHOD method_7197 finishConversion (Lnet/minecraft/class_3218;)V
 		ARG 1 world