1.21.2-pre2

FabricMC · Oct 10, 2024 · d65eac4 · d65eac4
1 parent d2ecdba
commit d65eac4
Show file tree

Hide file tree

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

diff --git a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping
@@ -154,9 +154,8 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 0 size
 	METHOD setErrorCallback (Lorg/lwjgl/glfw/GLFWErrorCallbackI;)V
 		ARG 0 callback
-	METHOD setProjectionMatrix (Lorg/joml/Matrix4f;Lnet/minecraft/class_8251;)V
+	METHOD setProjectionMatrix (Lorg/joml/Matrix4f;Lnet/minecraft/class_10366;)V
 		ARG 0 projectionMatrix
-		ARG 1 vertexSorting
 	METHOD setShader (Lnet/minecraft/class_5944;)V
 		COMMENT Sets the {@code RenderSystem}'s global shader program.
 		COMMENT

diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping
@@ -209,7 +209,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
 		METHOD method_52653 play ()V
 		METHOD method_52654 createRealm ()V
 		METHOD method_54566 drawDescription (Lnet/minecraft/class_332;III)V
-			ARG 1 context
 			ARG 2 y
 			ARG 3 x
 			ARG 4 entryWidth
@@ -267,7 +266,7 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
 			ARG 2 y
 			ARG 3 x
 			ARG 4 server
-		METHOD method_64838 drawGameMode (Lnet/minecraft/class_4877;Lnet/minecraft/class_332;III)V
+		METHOD method_64838 drawGameMode (Lnet/minecraft/class_4877;Lnet/minecraft/class_332;III)I
 			ARG 1 server
 			ARG 2 context
 			ARG 3 x

diff --git a/mappings/net/minecraft/client/render/RenderPhase.mapping b/mappings/net/minecraft/client/render/RenderPhase.mapping
@@ -78,7 +78,6 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
 	FIELD field_29450 ENTITY_SOLID_PROGRAM Lnet/minecraft/class_4668$class_5942;
 	FIELD field_29451 ENTITY_CUTOUT_PROGRAM Lnet/minecraft/class_4668$class_5942;
 	FIELD field_29452 ENTITY_CUTOUT_NONULL_PROGRAM Lnet/minecraft/class_4668$class_5942;
-	FIELD field_32771 VIEW_OFFSET_Z_LAYERING_SCALE F
 	FIELD field_33628 TEXT_INTENSITY_PROGRAM Lnet/minecraft/class_4668$class_5942;
 	FIELD field_33629 TRANSPARENT_TEXT_INTENSITY_PROGRAM Lnet/minecraft/class_4668$class_5942;
 	FIELD field_38344 ENTITY_TRANSLUCENT_EMISSIVE_PROGRAM Lnet/minecraft/class_4668$class_5942;

diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
@@ -149,7 +149,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	FIELD field_44873 forceUpdateSupportingBlockPos Z
 	FIELD field_47742 stateAtPos Lnet/minecraft/class_2680;
 	FIELD field_51994 portalManager Lnet/minecraft/class_9787;
-	FIELD field_52442 collidedBlocks Ljava/util/Map;
+	FIELD field_52442 collidedBlocks Ljava/util/Set;
 	FIELD field_5951 ridingCooldown I
 	FIELD field_5952 onGround Z
 	FIELD field_5953 firstUpdate Z
@@ -212,7 +212,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	FIELD field_6037 velocityModified Z
 	FIELD field_6038 lastRenderX D
 	METHOD <init> (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V
-		ARG 1 type
 		ARG 2 world
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
@@ -1712,7 +1711,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 2 volume
 		ARG 3 pitch
 	METHOD method_5784 move (Lnet/minecraft/class_1313;Lnet/minecraft/class_243;)V
-		ARG 1 movementType
 		ARG 2 movement
 	METHOD method_5785 scheduleVelocityUpdate ()V
 	METHOD method_5786 saveSelfNbt (Lnet/minecraft/class_2487;)Z
@@ -2251,10 +2249,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	METHOD method_64166 tickBlockCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V
 		ARG 1 lastRenderPos
 		ARG 2 pos
-	METHOD method_64167 checkBlockCollision (Ljava/util/Map;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V
-		ARG 1 collidedBlocks
-		ARG 2 oldPos
-		ARG 3 newPos
 	METHOD method_64168 checkBlockCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V
 		ARG 1 oldPos
 		ARG 2 newPos

diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -518,7 +518,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_6060 knockback (Lnet/minecraft/class_1309;)V
 		ARG 1 target
 	METHOD method_6061 blockedByShield (Lnet/minecraft/class_1282;)Z
-		ARG 1 source
 	METHOD method_6062 isImmobile ()Z
 	METHOD method_6063 getMaxHealth ()F
 	METHOD method_6064 getNextAirOnLand (I)I

diff --git a/mappings/net/minecraft/item/AnimalArmorItem.mapping b/mappings/net/minecraft/item/AnimalArmorItem.mapping
@@ -4,10 +4,9 @@ CLASS net/minecraft/class_4059 net/minecraft/item/AnimalArmorItem
 		ARG 1 material
 		ARG 2 type
 		ARG 3 settings
-	METHOD <init> (Lnet/minecraft/class_1741;Lnet/minecraft/class_4059$class_9076;Lnet/minecraft/class_3414;ZLnet/minecraft/class_1792$class_1793;)V
+	METHOD <init> (Lnet/minecraft/class_1741;Lnet/minecraft/class_4059$class_9076;Lnet/minecraft/class_6880;ZLnet/minecraft/class_1792$class_1793;)V
 		ARG 1 material
 		ARG 2 type
-		ARG 3 equipSound
 		ARG 4 damageOnHurt
 		ARG 5 settings
 	CLASS class_9076 Type

diff --git a/mappings/net/minecraft/item/BlockPredicatesChecker.mapping b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping
@@ -24,10 +24,6 @@ CLASS net/minecraft/class_6538 net/minecraft/item/BlockPredicatesChecker
 	METHOD <init> (Ljava/util/List;Z)V
 		ARG 1 predicates
 		ARG 2 showInTooltip
-	METHOD <init> (Ljava/util/List;ZLjava/util/List;)V
-		ARG 1 predicates
-		ARG 2 showInTooltip
-		ARG 3 tooltipText
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
 	METHOD method_38070 check (Lnet/minecraft/class_2694;)Z

diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping
@@ -43,7 +43,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 	FIELD field_24093 holder Lnet/minecraft/class_1297;
 	FIELD field_24671 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_40211 DISABLED_TEXT Lnet/minecraft/class_2561;
-	FIELD field_47312 ITEM_CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_48349 PACKET_CODEC Lnet/minecraft/class_9139;
 	FIELD field_49266 OPTIONAL_CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_49267 REGISTRY_ENTRY_CODEC Lcom/mojang/serialization/Codec;
@@ -283,8 +282,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 		ARG 0 stack
 	METHOD method_57373 canBreak (Lnet/minecraft/class_2694;)Z
 		ARG 1 pos
-	METHOD method_57374 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/DataResult;
-		ARG 0 entry
 	METHOD method_57375 toNbtAllowEmpty (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2520;
 		ARG 1 registries
 	METHOD method_57376 toNbt (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520;

diff --git a/mappings/net/minecraft/item/equipment/ArmorMaterial.mapping b/mappings/net/minecraft/item/equipment/ArmorMaterial.mapping
@@ -11,8 +11,7 @@ CLASS net/minecraft/class_1741 net/minecraft/item/equipment/ArmorMaterial
 		ARG 2 allowedEntities
 	METHOD method_63993 createAttributeModifiers (Lnet/minecraft/class_8051;)Lnet/minecraft/class_9285;
 		ARG 1 equipmentType
-	METHOD method_64503 applyBodyArmorSettings (Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_3414;ZLnet/minecraft/class_6885;)Lnet/minecraft/class_1792$class_1793;
+	METHOD method_64503 applyBodyArmorSettings (Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_6880;ZLnet/minecraft/class_6885;)Lnet/minecraft/class_1792$class_1793;
 		ARG 1 settings
-		ARG 2 equipSound
 		ARG 3 damageOnHurt
 		ARG 4 allowedEntities
diff --git a/mappings/net/minecraft/sound/SoundEvent.mapping b/mappings/net/minecraft/sound/SoundEvent.mapping
@@ -1,17 +1,14 @@
 CLASS net/minecraft/class_3414 net/minecraft/sound/SoundEvent
-	FIELD field_14533 id Lnet/minecraft/class_2960;
-	FIELD field_38690 distanceToTravel F
-	FIELD field_38691 staticDistance Z
-	FIELD field_41661 DEFAULT_DISTANCE_TO_TRAVEL F
+	FIELD comp_3319 id Lnet/minecraft/class_2960;
+	FIELD comp_3320 getStaticDistanceToTravel Ljava/util/Optional;
 	FIELD field_41698 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_41699 ENTRY_CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_48278 PACKET_CODEC Lnet/minecraft/class_9139;
 	FIELD field_48279 ENTRY_PACKET_CODEC Lnet/minecraft/class_9139;
-	METHOD <init> (Lnet/minecraft/class_2960;FZ)V
+	METHOD <init> (Lnet/minecraft/class_2960;Ljava/util/Optional;)V
 		ARG 1 id
-		ARG 2 distanceToTravel
-		ARG 3 useStaticDistance
-	METHOD method_14833 getId ()Lnet/minecraft/class_2960;
+	METHOD comp_3319 id ()Lnet/minecraft/class_2960;
+	METHOD comp_3320 getStaticDistanceToTravel ()Ljava/util/Optional;
 	METHOD method_43044 getDistanceToTravel (F)F
 		ARG 1 volume
 	METHOD method_47908 of (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3414;
@@ -24,4 +21,3 @@ CLASS net/minecraft/class_3414 net/minecraft/sound/SoundEvent
 		ARG 1 distanceToTravel
 	METHOD method_47957 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
-	METHOD method_47959 getStaticDistanceToTravel ()Ljava/util/Optional;