1.21.4-pre2 stuff (#4058)

FabricMC · Nov 25, 2024 · ca04a1a · ca04a1a
1 parent 05f707b
commit ca04a1a
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 1 deletion.
diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping
@@ -4,7 +4,7 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn
 	FIELD field_11984 inventory Lnet/minecraft/class_2371;
 	FIELD field_11986 recipesUsed Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap;
 	FIELD field_11987 TOP_SLOTS [I
-	FIELD field_11988 cookTimeTotal I
+	FIELD field_11988 cookingTotalTime I
 	FIELD field_17374 propertyDelegate Lnet/minecraft/class_3913;
 	FIELD field_31286 INPUT_SLOT_INDEX I
 	FIELD field_31287 FUEL_SLOT_INDEX I
@@ -16,6 +16,9 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn
 	FIELD field_31293 PROPERTY_COUNT I
 	FIELD field_31294 DEFAULT_COOK_TIME I
 	FIELD field_38234 matchGetter Lnet/minecraft/class_1863$class_7266;
+	FIELD field_55574 litTimeRemaining I
+	FIELD field_55575 litTotalTime I
+	FIELD field_55576 cookingTimeSpent I
 	METHOD <init> (Lnet/minecraft/class_2591;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3956;)V
 		ARG 1 blockEntityType
 		ARG 2 pos

diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping
@@ -111,5 +111,6 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity
 	METHOD method_64376 getItemDropCooldown ()Lnet/minecraft/class_10222;
 	METHOD method_65525 isBlind ()Z
 	METHOD method_65813 isRidingCamel ()Z
+	METHOD method_65949 shouldStopSprinting ()Z
 	METHOD method_7290 dropSelectedItem (Z)Z
 		ARG 1 entireStack
diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityFurnaceBurnTimeFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityFurnaceBurnTimeFix.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_10553 net/minecraft/datafixer/fix/BlockEntityFurnaceBurnTimeFix
+	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)V
+		ARG 1 outputSchema
+		ARG 2 blockEntityId
+	METHOD method_65941 fix (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 1 dynamic
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
@@ -2309,6 +2309,11 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	METHOD method_65342 setMovement (ZLnet/minecraft/class_243;)V
 		ARG 1 onGround
 		ARG 2 movement
+	METHOD method_65942 handleFall (DDDZ)V
+		ARG 1 xDifference
+		ARG 3 yDifference
+		ARG 5 zDifference
+		ARG 7 onGround
 	METHOD method_7325 isSpectator ()Z
 		COMMENT {@return whether the entity is a spectator}
 		COMMENT

diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping
@@ -22,11 +22,28 @@ CLASS net/minecraft/class_4096 net/minecraft/entity/ai/brain/task/FindPointOfInt
 		ARG 1 poiPosModule
 		ARG 2 potentialPoiPosModule
 		ARG 3 onlyRunIfChild
+		ARG 4 entityStatus
+		ARG 5 worldPosBiPredicate
 	METHOD method_46884 create (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;ZLjava/util/Optional;)Lnet/minecraft/class_7893;
 		ARG 0 poiPredicate
 		ARG 1 poiPosModule
 		ARG 2 onlyRunIfChild
 		ARG 3 entityStatus
+	METHOD method_46885 (ZLorg/apache/commons/lang3/mutable/MutableLong;Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;Ljava/util/function/Predicate;Ljava/util/function/BiPredicate;Lnet/minecraft/class_7906;Ljava/util/Optional;Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;J)Z
+		ARG 7 world
+		ARG 8 entity
+		ARG 9 time
+	METHOD method_46886 (ZLorg/apache/commons/lang3/mutable/MutableLong;Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;Ljava/util/function/Predicate;Ljava/util/function/BiPredicate;Ljava/util/Optional;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911;
+		ARG 6 queryResult
+	METHOD method_65943 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z
+		ARG 0 world
+		ARG 1 pos
+	METHOD method_65945 create (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;ZLjava/util/Optional;Ljava/util/function/BiPredicate;)Lnet/minecraft/class_7893;
+		ARG 0 poiPredicate
+		ARG 1 poiPosModule
+		ARG 2 onlyRunIfChild
+		ARG 3 entityStatus
+		ARG 4 worldPosBiPredicate
 	CLASS class_5397 RetryMarker
 		FIELD field_25600 random Lnet/minecraft/class_5819;
 		FIELD field_25601 previousAttemptAt J

diff --git a/mappings/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.mapping
@@ -15,3 +15,6 @@ CLASS net/minecraft/class_4128 net/minecraft/entity/ai/brain/task/ForgetComplete
 	METHOD method_47190 create (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;)Lnet/minecraft/class_7893;
 		ARG 0 poiTypePredicate
 		ARG 1 poiPosModule
+	METHOD method_65946 isSleepingVillagerAt (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z
+		ARG 0 world
+		ARG 1 pos
diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping
@@ -45,3 +45,9 @@ CLASS net/minecraft/class_4129 net/minecraft/entity/ai/brain/task/VillagerTaskLi
 	METHOD method_47203 wonRaid (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Z
 		ARG 0 world
 		ARG 1 entity
+	METHOD method_65947 isUnoccupiedBedAt (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z
+		ARG 0 world
+		ARG 1 pos
+	METHOD method_65948 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z
+		ARG 0 world
+		ARG 1 pos
diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping
@@ -37,6 +37,7 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory
 		ARG 1 predicate
 	METHOD method_61494 getMatchingSlot (Lnet/minecraft/class_6880;Lnet/minecraft/class_1799;)I
 		ARG 1 item
+		ARG 2 stack
 	METHOD method_61495 usableWhenFillingSlot (Lnet/minecraft/class_1799;)Z
 		ARG 0 stack
 	METHOD method_61496 setSelectedSlot (I)V

diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping
@@ -78,6 +78,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk
 	METHOD method_12041 removeBlockEntity (Lnet/minecraft/class_2338;)V
 		ARG 1 pos
 	METHOD method_12042 addPendingBlockEntityNbt (Lnet/minecraft/class_2487;)V
+		ARG 1 nbt
 	METHOD method_12044 needsSaving ()Z
 	METHOD method_12228 areSectionsEmptyBetween (II)Z
 		ARG 1 lowerHeight