1.21.4-pre2

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

Hide file tree

Showing 6 changed files with 4 additions and 20 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }
 
-def minecraft_version = "1.21.4-pre1"
+def minecraft_version = "1.21.4-pre2"
 
 filament {
 	minecraftVersion = minecraft_version

diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping
@@ -1,13 +1,10 @@
 CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEntity
-	FIELD field_11980 fuelTime I
-	FIELD field_11981 burnTime I
 	FIELD field_11982 BOTTOM_SLOTS [I
 	FIELD field_11983 SIDE_SLOTS [I
 	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_11989 cookTime I
 	FIELD field_17374 propertyDelegate Lnet/minecraft/class_3913;
 	FIELD field_31286 INPUT_SLOT_INDEX I
 	FIELD field_31287 FUEL_SLOT_INDEX I

diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping
@@ -11,29 +11,22 @@ CLASS net/minecraft/class_4096 net/minecraft/entity/ai/brain/task/FindPointOfInt
 		ARG 1 poiPos
 	METHOD method_46878 (Lnet/minecraft/class_4140;Lnet/minecraft/class_7894;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App;
 		ARG 2 context
-	METHOD method_46879 (Lnet/minecraft/class_4140;ZLorg/apache/commons/lang3/mutable/MutableLong;Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;Ljava/util/function/Predicate;Ljava/util/Optional;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App;
+	METHOD method_46879 (Lnet/minecraft/class_4140;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_7898$class_7900;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 context
 	METHOD method_46880 (Lnet/minecraft/class_4153;Ljava/util/function/Predicate;Lnet/minecraft/class_2338;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Ljava/util/Optional;Lnet/minecraft/class_1314;Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;Lnet/minecraft/class_6880;)V
 		ARG 8 poiType
 	METHOD method_46882 (Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;JLnet/minecraft/class_2338;)Z
 		ARG 3 pos
-	METHOD method_46883 create (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;ZLjava/util/Optional;)Lnet/minecraft/class_7893;
+	METHOD method_46883 create (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;ZLjava/util/Optional;Ljava/util/function/BiPredicate;)Lnet/minecraft/class_7893;
 		ARG 0 poiPredicate
 		ARG 1 poiPosModule
 		ARG 2 potentialPoiPosModule
 		ARG 3 onlyRunIfChild
-		ARG 4 entityStatus
 	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;Lnet/minecraft/class_7906;Ljava/util/Optional;Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;J)Z
-		ARG 6 world
-		ARG 7 entity
-		ARG 8 time
-	METHOD method_46886 (ZLorg/apache/commons/lang3/mutable/MutableLong;Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;Ljava/util/function/Predicate;Ljava/util/Optional;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911;
-		ARG 5 queryResult
 	CLASS class_5397 RetryMarker
 		FIELD field_25600 random Lnet/minecraft/class_5819;
 		FIELD field_25601 previousAttemptAt J

diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping
@@ -35,7 +35,7 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory
 		ARG 1 entireStack
 	METHOD method_55753 contains (Ljava/util/function/Predicate;)Z
 		ARG 1 predicate
-	METHOD method_61494 getMatchingSlot (Lnet/minecraft/class_6880;)I
+	METHOD method_61494 getMatchingSlot (Lnet/minecraft/class_6880;Lnet/minecraft/class_1799;)I
 		ARG 1 item
 	METHOD method_61495 usableWhenFillingSlot (Lnet/minecraft/class_1799;)Z
 		ARG 0 stack

diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping
@@ -71,11 +71,6 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 		ARG 1 oldPlayer
 		ARG 2 alive
 	METHOD method_14206 getPlayerListName ()Lnet/minecraft/class_2561;
-	METHOD method_14207 handleFall (DDDZ)V
-		ARG 1 xDifference
-		ARG 3 yDifference
-		ARG 5 zDifference
-		ARG 7 onGround
 	METHOD method_14208 isInTeleportationState ()Z
 	METHOD method_14209 getIp ()Ljava/lang/String;
 	METHOD method_14210 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583;

diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping
@@ -78,7 +78,6 @@ 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