diff --git a/build.gradle b/build.gradle index 32bad0353a..efc79bfe72 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "25w02a" +def minecraft_version = "25w03a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index c0b169b4a5..e48d449292 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -255,7 +255,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block METHOD method_9543 hasDynamicBounds ()Z METHOD method_9544 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V ARG 2 stack - METHOD method_9554 onLandedUpon (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;F)V + METHOD method_9554 onLandedUpon (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;D)V COMMENT Called when the entity lands on the block. COMMENT COMMENT

Default implementation deals fall damage to the entity. Blocks that increase or @@ -269,7 +269,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 state ARG 3 pos ARG 4 entity - ARG 5 fallDistance METHOD method_9556 afterBreak (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2586;Lnet/minecraft/class_1799;)V COMMENT Called server-side when the block is broken by the player using correct tool. COMMENT This is called after {@link #onBroken} but has the tool requirement. diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index 5887fc9d6c..da332d3b53 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -8,35 +8,18 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior ARG 0 pointer ARG 1 stack METHOD method_18346 registerDefaults ()V - CLASS 10 - METHOD method_58766 (Lnet/minecraft/class_1309;)Z - ARG 0 entity CLASS 11 - METHOD method_58767 (Lnet/minecraft/class_1492;)Z - ARG 0 entity CLASS 12 - FIELD field_54200 fallbackBehavior Lnet/minecraft/class_2347; CLASS 13 CLASS 14 - METHOD method_64102 (Lnet/minecraft/class_1792;)V - ARG 0 item - CLASS 15 CLASS 2 CLASS 3 CLASS 4 - METHOD method_64103 (Lnet/minecraft/class_4970$class_4971;)Z - ARG 0 state - METHOD method_64104 replace (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; - ARG 1 pointer - ARG 2 oldStack - ARG 3 newStack CLASS 5 CLASS 6 - METHOD method_58770 (Lnet/minecraft/class_1792;)V - ARG 0 item CLASS 7 - CLASS 8 FIELD field_49137 fallbackBehavior Lnet/minecraft/class_2347; - CLASS 9 + CLASS 8 METHOD method_58765 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1531;)V ARG 1 armorStand + CLASS 9 diff --git a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping index 1fd897a4ef..cd58d3291b 100644 --- a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping @@ -21,7 +21,6 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity ARG 2 state METHOD method_10936 setCustomName (Lnet/minecraft/class_2561;)V ARG 1 customName - METHOD method_10937 getBeamSegments ()Ljava/util/List; METHOD method_10938 playSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;)V ARG 0 world ARG 1 pos @@ -53,11 +52,3 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity ARG 2 effect METHOD method_55779 (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_5321;)V ARG 2 entryKey - CLASS class_2581 BeamSegment - FIELD field_11804 height I - FIELD field_11805 color I - METHOD (I)V - ARG 1 color - METHOD method_10942 increaseHeight ()V - METHOD method_10943 getHeight ()I - METHOD method_10944 getColor ()I diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index f605f60639..a355a397a3 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -218,7 +218,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT affects the saved NBT; otherwise, the game might not save the block entity. METHOD method_57567 addComponents (Lnet/minecraft/class_9323$class_9324;)V ARG 1 builder - METHOD method_57568 readComponents (Lnet/minecraft/class_2586$class_9473;)V + METHOD method_57568 readComponents (Lnet/minecraft/class_9473;)V ARG 1 components METHOD method_57569 removeFromCopiedStackNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt @@ -257,17 +257,10 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_61176 supports (Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_61177 getNameForReport ()Ljava/lang/String; - METHOD method_66473 onStateReplaced (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V + METHOD method_66473 onStateReplaced (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 oldState - ARG 3 moved METHOD method_66474 (Ljava/lang/String;)V ARG 0 error CLASS class_9472 Components FIELD field_50176 CODEC Lcom/mojang/serialization/Codec; - CLASS class_9473 ComponentsAccess - METHOD method_58694 get (Lnet/minecraft/class_9331;)Ljava/lang/Object; - ARG 1 type - METHOD method_58695 getOrDefault (Lnet/minecraft/class_9331;Ljava/lang/Object;)Ljava/lang/Object; - ARG 1 type - ARG 2 fallback diff --git a/mappings/net/minecraft/block/entity/ComponentsAccess.mapping b/mappings/net/minecraft/block/entity/ComponentsAccess.mapping new file mode 100644 index 0000000000..6fd988dca4 --- /dev/null +++ b/mappings/net/minecraft/block/entity/ComponentsAccess.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_9473 net/minecraft/block/entity/ComponentsAccess + METHOD method_58694 get (Lnet/minecraft/class_9331;)Ljava/lang/Object; + ARG 1 type + METHOD method_58695 getOrDefault (Lnet/minecraft/class_9331;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 type + ARG 2 fallback diff --git a/mappings/net/minecraft/class_10633.mapping b/mappings/net/minecraft/class_10633.mapping new file mode 100644 index 0000000000..c336d45c6f --- /dev/null +++ b/mappings/net/minecraft/class_10633.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_10633 + METHOD method_10937 getBeamSegments ()Ljava/util/List; + CLASS class_2581 BeamSegment + FIELD field_11804 height I + FIELD field_11805 color I + METHOD (I)V + ARG 1 color + METHOD method_10942 increaseHeight ()V + METHOD method_10943 getHeight ()I + METHOD method_10944 getColor ()I diff --git a/mappings/net/minecraft/client/gl/ShaderLoader.mapping b/mappings/net/minecraft/client/gl/ShaderLoader.mapping index 5df49fa65c..6a0efcd740 100644 --- a/mappings/net/minecraft/client/gl/ShaderLoader.mapping +++ b/mappings/net/minecraft/client/gl/ShaderLoader.mapping @@ -62,8 +62,6 @@ CLASS net/minecraft/class_10151 net/minecraft/client/gl/ShaderLoader METHOD method_62957 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; ARG 1 path CLASS class_10152 LoadException - METHOD (Ljava/lang/String;)V - ARG 1 message CLASS class_10153 Definitions FIELD field_53948 EMPTY Lnet/minecraft/class_10151$class_10153; CLASS class_10154 ShaderKey diff --git a/mappings/net/minecraft/client/realms/exception/upload/FailedRealmsUploadException.mapping b/mappings/net/minecraft/client/realms/exception/upload/FailedRealmsUploadException.mapping index 3c4adb1c2e..e5a41318a3 100644 --- a/mappings/net/minecraft/client/realms/exception/upload/FailedRealmsUploadException.mapping +++ b/mappings/net/minecraft/client/realms/exception/upload/FailedRealmsUploadException.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_10234 net/minecraft/client/realms/exception/upload/FailedRealmsUploadException FIELD field_54366 errorMessage Lnet/minecraft/class_2561; - METHOD (Ljava/lang/String;)V - ARG 1 errorMessage METHOD (Lnet/minecraft/class_2561;)V ARG 1 errorMessage diff --git a/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping index 6c8503fa1c..2c057675f2 100644 --- a/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping @@ -1,14 +1,7 @@ CLASS net/minecraft/class_838 net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer METHOD (Lnet/minecraft/class_5614$class_5615;)V ARG 1 ctx - METHOD method_3585 renderInvisibleBlocks (Lnet/minecraft/class_2633;Lnet/minecraft/class_4597;Lnet/minecraft/class_4587;)V - ARG 1 entity - ARG 2 vertexConsumers - ARG 3 matrices - METHOD method_61047 (Lnet/minecraft/class_2633;Lnet/minecraft/class_4588;Lnet/minecraft/class_4587;)V - ARG 1 entity - ARG 2 vertexConsumer - ARG 3 matrices + METHOD method_3585 renderInvisibleBlocks (Lnet/minecraft/class_2586;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_4597;Lnet/minecraft/class_4587;)V METHOD method_61048 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_2350;III)V ARG 4 direction ARG 5 x diff --git a/mappings/net/minecraft/client/render/entity/AbstractDonkeyEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/AbstractDonkeyEntityRenderer.mapping index 5d6e3c9876..4956e5140c 100644 --- a/mappings/net/minecraft/client/render/entity/AbstractDonkeyEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/AbstractDonkeyEntityRenderer.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/class_9991 net/minecraft/client/render/entity/AbstractDonkeyEntityRenderer - FIELD field_53184 DONKEY_TEXTURE Lnet/minecraft/class_2960; - FIELD field_53185 MULE_TEXTURE Lnet/minecraft/class_2960; FIELD field_53186 texture Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_5601;Lnet/minecraft/class_5601;Z)V + METHOD (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_9991$class_10650;)V ARG 1 context - ARG 2 layer - ARG 3 babyLayer - ARG 4 mule diff --git a/mappings/net/minecraft/client/render/entity/UndeadHorseEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/UndeadHorseEntityRenderer.mapping index 510c1b721b..135befd27d 100644 --- a/mappings/net/minecraft/client/render/entity/UndeadHorseEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/UndeadHorseEntityRenderer.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/class_961 net/minecraft/client/render/entity/UndeadHorseEntityRenderer - FIELD field_53201 ZOMBIE_HORSE_TEXTURE Lnet/minecraft/class_2960; - FIELD field_53202 SKELETON_HORSE_TEXTURE Lnet/minecraft/class_2960; FIELD field_53203 texture Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_5601;Lnet/minecraft/class_5601;Z)V + METHOD (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_961$class_10651;)V ARG 1 ctx - ARG 2 layer - ARG 3 babyLayer - ARG 4 skeleton diff --git a/mappings/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.mapping deleted file mode 100644 index 089525f815..0000000000 --- a/mappings/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_4073 net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer - FIELD field_53216 model Lnet/minecraft/class_9947; - FIELD field_53217 babyModel Lnet/minecraft/class_9947; - FIELD field_54182 equipmentRenderer Lnet/minecraft/class_10197; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_10197;)V - ARG 1 context - ARG 2 loader - ARG 3 equipmentRenderer diff --git a/mappings/net/minecraft/client/render/entity/feature/SaddleFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/SaddleFeatureRenderer.mapping deleted file mode 100644 index 81860f2231..0000000000 --- a/mappings/net/minecraft/client/render/entity/feature/SaddleFeatureRenderer.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS net/minecraft/class_992 net/minecraft/client/render/entity/feature/SaddleFeatureRenderer - FIELD field_4888 texture Lnet/minecraft/class_2960; - FIELD field_53222 model Lnet/minecraft/class_583; - FIELD field_53223 babyModel Lnet/minecraft/class_583; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_583;Lnet/minecraft/class_2960;)V - ARG 1 context - ARG 2 model - ARG 3 texture - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_583;Lnet/minecraft/class_583;Lnet/minecraft/class_2960;)V - ARG 1 context - ARG 2 model - ARG 3 babyModel - ARG 4 texture diff --git a/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping index 0de6a029ed..7a2311ea32 100644 --- a/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping @@ -10,13 +10,7 @@ CLASS net/minecraft/class_3885 net/minecraft/client/render/entity/feature/Villag ARG 3 entityType METHOD method_17152 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V ARG 0 levelToId - METHOD method_17153 getHatType (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Ljava/lang/String;Lnet/minecraft/class_7922;Ljava/lang/Object;)Lnet/minecraft/class_3888$class_3889; - ARG 1 hatLookUp - ARG 2 keyType - ARG 3 registry - ARG 4 key - METHOD method_17154 (Ljava/lang/String;Lnet/minecraft/class_7922;Ljava/lang/Object;Ljava/lang/Object;)Lnet/minecraft/class_3888$class_3889; - ARG 4 k + METHOD method_17153 getHatType (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Ljava/lang/String;Lnet/minecraft/class_6880;)Lnet/minecraft/class_3888$class_3889; METHOD method_17155 getTexture (Ljava/lang/String;Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; ARG 1 keyType ARG 2 keyId diff --git a/mappings/net/minecraft/client/render/entity/model/AbstractHorseEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/AbstractHorseEntityModel.mapping index 199e78979a..f7fd09167d 100644 --- a/mappings/net/minecraft/client/render/entity/model/AbstractHorseEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/AbstractHorseEntityModel.mapping @@ -10,23 +10,7 @@ CLASS net/minecraft/class_549 net/minecraft/client/render/entity/model/AbstractH FIELD field_32489 ANGRY_ANIMATION_BODY_PITCH_MULTIPLIER F FIELD field_32490 HEAD_TAIL_BASE_PITCH F FIELD field_32491 ANGRY_ANIMATION_HIND_LEG_PITCH_MULTIPLIER F - FIELD field_32496 SADDLE Ljava/lang/String; - COMMENT The key of the saddle mane model part, whose value is {@value}. - FIELD field_32497 LEFT_SADDLE_MOUTH Ljava/lang/String; - COMMENT The key of the left saddle mouth model part, whose value is {@value}. - FIELD field_32498 LEFT_SADDLE_LINE Ljava/lang/String; - COMMENT The key of the left saddle line model part, whose value is {@value}. - FIELD field_32499 RIGHT_SADDLE_MOUTH Ljava/lang/String; - COMMENT The key of the right saddle mouth model part, whose value is {@value}. - FIELD field_32500 RIGHT_SADDLE_LINE Ljava/lang/String; - COMMENT The key of the right saddle line model part, whose value is {@value}. - FIELD field_32501 HEAD_SADDLE Ljava/lang/String; - COMMENT The key of the head saddle model part, whose value is {@value}. - FIELD field_32502 MOUTH_SADDLE_WRAP Ljava/lang/String; - COMMENT The key of the mouth saddle wrap mane model part, whose value is {@value}. FIELD field_3300 tail Lnet/minecraft/class_630; - FIELD field_3301 straps [Lnet/minecraft/class_630; - FIELD field_3304 saddle [Lnet/minecraft/class_630; FIELD field_3305 body Lnet/minecraft/class_630; FIELD field_3307 head Lnet/minecraft/class_630; FIELD field_52854 BABY_TRANSFORMER Lnet/minecraft/class_9953; diff --git a/mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping index 86bc12b899..f7d17038bf 100644 --- a/mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping @@ -1,15 +1,8 @@ CLASS net/minecraft/class_7751 net/minecraft/client/render/entity/model/CamelEntityModel FIELD field_40459 LIMB_ANGLE_SCALE F - FIELD field_40460 SADDLE Ljava/lang/String; - FIELD field_40461 BRIDLE Ljava/lang/String; - FIELD field_40462 REINS Ljava/lang/String; FIELD field_40464 head Lnet/minecraft/class_630; - FIELD field_40465 saddleAndBridle [Lnet/minecraft/class_630; - FIELD field_40466 reins [Lnet/minecraft/class_630; FIELD field_42227 LIMB_DISTANCE_SCALE F FIELD field_52883 BABY_TRANSFORMER Lnet/minecraft/class_9953; - METHOD method_45704 updateVisibleParts (Lnet/minecraft/class_10007;)V - ARG 1 state METHOD method_45705 setHeadAngles (Lnet/minecraft/class_10007;FF)V ARG 1 state ARG 2 headYaw diff --git a/mappings/net/minecraft/client/render/entity/model/PigEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/PigEntityModel.mapping index 4bed6c5b13..6cd66654f6 100644 --- a/mappings/net/minecraft/client/render/entity/model/PigEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/PigEntityModel.mapping @@ -3,7 +3,5 @@ CLASS net/minecraft/class_587 net/minecraft/client/render/entity/model/PigEntity FIELD field_52925 BABY_TRANSFORMER Lnet/minecraft/class_9953; METHOD method_32025 getTexturedModelData (Lnet/minecraft/class_5605;)Lnet/minecraft/class_5607; ARG 0 dilation - METHOD method_66535 getSaddleTexturedModelData (Lnet/minecraft/class_5605;)Lnet/minecraft/class_5607; - ARG 0 dilation METHOD method_66536 getModelData (Lnet/minecraft/class_5605;)Lnet/minecraft/class_5609; ARG 0 dilation diff --git a/mappings/net/minecraft/client/render/entity/model/PolarBearEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/PolarBearEntityModel.mapping index c987dc71e7..0a22d1c794 100644 --- a/mappings/net/minecraft/client/render/entity/model/PolarBearEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/PolarBearEntityModel.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_590 net/minecraft/client/render/entity/model/PolarBearEntityModel FIELD field_52928 BABY_TRANSFORMER Lnet/minecraft/class_9953; - METHOD method_32029 getTexturedModelData ()Lnet/minecraft/class_5607; + METHOD method_32029 getTexturedModelData (Z)Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/state/CamelEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/CamelEntityRenderState.mapping index d2c9dbaa18..13d3a3540f 100644 --- a/mappings/net/minecraft/client/render/entity/state/CamelEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/entity/state/CamelEntityRenderState.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_10007 net/minecraft/client/render/entity/state/CamelEntityRenderState - FIELD field_53289 saddled Z FIELD field_53290 hasPassengers Z FIELD field_53291 jumpCooldown F FIELD field_53292 sittingTransitionAnimationState Lnet/minecraft/class_7094; diff --git a/mappings/net/minecraft/client/render/entity/state/LivingHorseEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/LivingHorseEntityRenderState.mapping index ed417e1c4d..3b94b33365 100644 --- a/mappings/net/minecraft/client/render/entity/state/LivingHorseEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/entity/state/LivingHorseEntityRenderState.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_10019 net/minecraft/client/render/entity/state/LivingHorseEntityRenderState - FIELD field_53346 saddled Z FIELD field_53347 hasPassengers Z FIELD field_53348 waggingTail Z FIELD field_53349 eatingGrassAnimationProgress F diff --git a/mappings/net/minecraft/client/render/entity/state/PigEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/PigEntityRenderState.mapping index f216cd88fb..22db9939f8 100644 --- a/mappings/net/minecraft/client/render/entity/state/PigEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/entity/state/PigEntityRenderState.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_10053 net/minecraft/client/render/entity/state/PigEntityRenderState - FIELD field_53515 saddled Z FIELD field_55877 variant Lnet/minecraft/class_10586; diff --git a/mappings/net/minecraft/client/render/entity/state/SaddleableRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/SaddleableRenderState.mapping deleted file mode 100644 index e22c2862b8..0000000000 --- a/mappings/net/minecraft/client/render/entity/state/SaddleableRenderState.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_10061 net/minecraft/client/render/entity/state/SaddleableRenderState - METHOD method_62616 isSaddled ()Z diff --git a/mappings/net/minecraft/client/render/entity/state/StriderEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/StriderEntityRenderState.mapping index 108d889e97..b9ab143124 100644 --- a/mappings/net/minecraft/client/render/entity/state/StriderEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/entity/state/StriderEntityRenderState.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_10070 net/minecraft/client/render/entity/state/StriderEntityRenderState - FIELD field_53585 saddled Z FIELD field_53586 cold Z FIELD field_53587 hasPassengers Z diff --git a/mappings/net/minecraft/client/render/item/property/select/SelectProperty.mapping b/mappings/net/minecraft/client/render/item/property/select/SelectProperty.mapping index 985380fb54..f2dedde6cd 100644 --- a/mappings/net/minecraft/client/render/item/property/select/SelectProperty.mapping +++ b/mappings/net/minecraft/client/render/item/property/select/SelectProperty.mapping @@ -10,9 +10,3 @@ CLASS net/minecraft/class_10494 net/minecraft/client/render/item/property/select METHOD method_65686 create (Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_10494$class_10495; ARG 0 propertyCodec ARG 1 valueCodec - METHOD method_65687 (Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 2 instance - METHOD method_65688 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; - ARG 0 cases - METHOD method_65690 (Lcom/google/common/collect/Multiset$Entry;)Z - ARG 0 entry diff --git a/mappings/net/minecraft/client/util/GlException.mapping b/mappings/net/minecraft/client/util/GlException.mapping index b093724840..55c6d673b9 100644 --- a/mappings/net/minecraft/client/util/GlException.mapping +++ b/mappings/net/minecraft/client/util/GlException.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_4718 net/minecraft/client/util/GlException - METHOD (Ljava/lang/String;)V - ARG 1 message METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 cause diff --git a/mappings/net/minecraft/command/argument/TestClassArgumentType.mapping b/mappings/net/minecraft/command/argument/TestClassArgumentType.mapping deleted file mode 100644 index 3f3111c8fd..0000000000 --- a/mappings/net/minecraft/command/argument/TestClassArgumentType.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_4526 net/minecraft/command/argument/TestClassArgumentType - FIELD field_20580 EXAMPLES Ljava/util/Collection; - METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 1 context - ARG 2 builder - METHOD method_22262 getTestClass (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/lang/String; - ARG 0 context - ARG 1 name - METHOD method_22370 testClass ()Lnet/minecraft/class_4526; - METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; - ARG 1 reader diff --git a/mappings/net/minecraft/command/argument/TestFunctionArgumentType.mapping b/mappings/net/minecraft/command/argument/TestFunctionArgumentType.mapping deleted file mode 100644 index e804275741..0000000000 --- a/mappings/net/minecraft/command/argument/TestFunctionArgumentType.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/class_4530 net/minecraft/command/argument/TestFunctionArgumentType - FIELD field_20589 EXAMPLES Ljava/util/Collection; - METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 1 context - ARG 2 builder - METHOD method_22303 getFunction (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_4529; - ARG 0 context - ARG 1 name - METHOD method_22371 testFunction ()Lnet/minecraft/class_4530; - METHOD method_56325 suggestTestNames (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 0 context - ARG 1 builder - METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; - ARG 1 reader diff --git a/mappings/net/minecraft/component/ComponentHolder.mapping b/mappings/net/minecraft/component/ComponentHolder.mapping index c892c0ee5f..cc498ff916 100644 --- a/mappings/net/minecraft/component/ComponentHolder.mapping +++ b/mappings/net/minecraft/component/ComponentHolder.mapping @@ -10,20 +10,6 @@ CLASS net/minecraft/class_9322 net/minecraft/component/ComponentHolder COMMENT @see ComponentMap COMMENT @see ComponentChanges METHOD method_57353 getComponents ()Lnet/minecraft/class_9323; - METHOD method_57824 get (Lnet/minecraft/class_9331;)Ljava/lang/Object; - COMMENT {@return the value for the component {@code type}, or {@code null} if the - COMMENT component is missing} - COMMENT - COMMENT

The returned value should never be mutated. - ARG 1 type - METHOD method_57825 getOrDefault (Lnet/minecraft/class_9331;Ljava/lang/Object;)Ljava/lang/Object; - COMMENT {@return the value for the component {@code type}, or {@code fallback} if the - COMMENT component is missing} - COMMENT - COMMENT

This method does not initialize the components with {@code fallback}. - COMMENT The returned value should never be mutated. - ARG 1 type - ARG 2 fallback METHOD method_57826 contains (Lnet/minecraft/class_9331;)Z COMMENT {@return whether the held components include {@code type}} COMMENT diff --git a/mappings/net/minecraft/component/ComponentMap.mapping b/mappings/net/minecraft/component/ComponentMap.mapping index 639fe72f36..8ef61b726b 100644 --- a/mappings/net/minecraft/component/ComponentMap.mapping +++ b/mappings/net/minecraft/component/ComponentMap.mapping @@ -4,17 +4,10 @@ CLASS net/minecraft/class_9323 net/minecraft/component/ComponentMap METHOD method_57827 builder ()Lnet/minecraft/class_9323$class_9324; METHOD method_57828 filtered (Ljava/util/function/Predicate;)Lnet/minecraft/class_9323; ARG 1 predicate - METHOD method_57829 get (Lnet/minecraft/class_9331;)Ljava/lang/Object; - ARG 1 type - METHOD method_57830 getOrDefault (Lnet/minecraft/class_9331;Ljava/lang/Object;)Ljava/lang/Object; - ARG 1 type - ARG 2 fallback METHOD method_57831 getTypes ()Ljava/util/Set; METHOD method_57832 contains (Lnet/minecraft/class_9331;)Z ARG 1 type METHOD method_57833 stream ()Ljava/util/stream/Stream; - METHOD method_57834 copy (Lnet/minecraft/class_9331;)Lnet/minecraft/class_9336; - ARG 1 type METHOD method_57835 size ()I METHOD method_57836 (Lnet/minecraft/class_9331;)Lnet/minecraft/class_9336; ARG 1 type diff --git a/mappings/net/minecraft/datafixer/fix/BannerPatternFormatFix.mapping b/mappings/net/minecraft/datafixer/fix/BannerPatternFormatFix.mapping index 35a2597d44..f01c4ca184 100644 --- a/mappings/net/minecraft/datafixer/fix/BannerPatternFormatFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BannerPatternFormatFix.mapping @@ -2,7 +2,5 @@ CLASS net/minecraft/class_9264 net/minecraft/datafixer/fix/BannerPatternFormatFi FIELD field_49187 OLD_TO_NEW_PATTERNS Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema - METHOD method_57192 getColorFromInt (I)Ljava/lang/String; - ARG 0 color METHOD method_57193 replacePatterns (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_57195 replacePatternAndColor (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/ChoiceWriteReadFix.mapping b/mappings/net/minecraft/datafixer/fix/ChoiceWriteReadFix.mapping index 8a1f8b752f..12fbdeda18 100644 --- a/mappings/net/minecraft/datafixer/fix/ChoiceWriteReadFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChoiceWriteReadFix.mapping @@ -4,10 +4,5 @@ CLASS net/minecraft/class_8877 net/minecraft/datafixer/fix/ChoiceWriteReadFix FIELD field_46775 type Lcom/mojang/datafixers/DSL$TypeReference; METHOD method_54447 transform (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 data - METHOD method_56641 makeRule (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/TypeRewriteRule; - ARG 1 inputType + METHOD method_56641 makeRule (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/OpticFinder;)Lcom/mojang/datafixers/TypeRewriteRule; ARG 2 outputType - ARG 4 outputSubtype - ARG 5 rewrittenType - METHOD method_56642 (Lcom/mojang/datafixers/types/Type;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;Ljava/lang/Object;)Ljava/lang/Object; - ARG 6 input diff --git a/mappings/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.mapping index e8bea4ef77..c4b3553642 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.mapping @@ -1,5 +1,2 @@ CLASS net/minecraft/class_3599 net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix - METHOD method_15700 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; - ARG 4 entityTyped - METHOD method_15703 fixEquipment (Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/TypeRewriteRule; - ARG 1 itemStackType + METHOD method_15703 fixEquipment (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/TypeRewriteRule; diff --git a/mappings/net/minecraft/datafixer/schema/Schema100.mapping b/mappings/net/minecraft/datafixer/schema/Schema100.mapping index 70633a683f..3757e596c6 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema100.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema100.mapping @@ -2,20 +2,6 @@ CLASS net/minecraft/class_1222 net/minecraft/datafixer/schema/Schema100 METHOD (ILcom/mojang/datafixers/schemas/Schema;)V ARG 1 versionKey ARG 2 parent - METHOD method_5195 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V - ARG 0 schema - ARG 1 map - ARG 2 entityId - METHOD method_5196 targetItems (Lcom/mojang/datafixers/schemas/Schema;)Lcom/mojang/datafixers/types/templates/TypeTemplate; - ARG 0 schema - METHOD method_5197 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; - ARG 1 name - METHOD method_5198 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; - ARG 1 name - METHOD method_5199 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; - ARG 1 name - METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; - ARG 1 schema METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V ARG 1 schema ARG 2 entityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema1460.mapping b/mappings/net/minecraft/datafixer/schema/Schema1460.mapping index cb46cefd5f..6356529227 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1460.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1460.mapping @@ -17,8 +17,6 @@ CLASS net/minecraft/class_1238 net/minecraft/datafixer/schema/Schema1460 ARG 1 name METHOD method_5246 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; ARG 1 name - METHOD method_5247 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; - ARG 1 name METHOD method_5249 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; ARG 1 name METHOD method_5250 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; @@ -41,10 +39,6 @@ CLASS net/minecraft/class_1238 net/minecraft/datafixer/schema/Schema1460 ARG 1 name METHOD method_5270 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; ARG 1 name - METHOD method_5271 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; - ARG 1 name - METHOD method_5272 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; - ARG 1 name METHOD method_5273 registerInventory (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V ARG 0 schema ARG 1 map diff --git a/mappings/net/minecraft/datafixer/schema/Schema701.mapping b/mappings/net/minecraft/datafixer/schema/Schema701.mapping index 5a89632d55..552f19c583 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema701.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema701.mapping @@ -2,9 +2,5 @@ CLASS net/minecraft/class_1249 net/minecraft/datafixer/schema/Schema701 METHOD (ILcom/mojang/datafixers/schemas/Schema;)V ARG 1 versionKey ARG 2 parent - METHOD method_5294 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V - ARG 0 schema - ARG 1 map - ARG 2 entityId METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema705.mapping b/mappings/net/minecraft/datafixer/schema/Schema705.mapping index 249c5aad2d..87f752231d 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema705.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema705.mapping @@ -40,14 +40,8 @@ CLASS net/minecraft/class_1253 net/minecraft/datafixer/schema/Schema705 ARG 2 entityId METHOD method_5331 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; ARG 1 name - METHOD method_5332 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; - ARG 1 name - METHOD method_5333 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; - ARG 1 name METHOD method_5334 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; ARG 1 name - METHOD method_5335 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; - ARG 1 name METHOD method_5337 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; ARG 1 name METHOD method_5338 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; diff --git a/mappings/net/minecraft/datafixer/schema/Schema99.mapping b/mappings/net/minecraft/datafixer/schema/Schema99.mapping index 9c99fa2063..0ae106c9e1 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema99.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema99.mapping @@ -4,10 +4,6 @@ CLASS net/minecraft/class_1254 net/minecraft/datafixer/schema/Schema99 METHOD (ILcom/mojang/datafixers/schemas/Schema;)V ARG 1 versionKey ARG 2 parent - METHOD method_5339 targetEquipment (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V - ARG 0 schema - ARG 1 map - ARG 2 entityId METHOD method_5340 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; ARG 1 name METHOD method_5342 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; @@ -22,8 +18,6 @@ CLASS net/minecraft/class_1254 net/minecraft/datafixer/schema/Schema99 ARG 1 name METHOD method_5351 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; ARG 1 name - METHOD method_5353 targetEquipment (Lcom/mojang/datafixers/schemas/Schema;)Lcom/mojang/datafixers/types/templates/TypeTemplate; - ARG 0 schema METHOD method_5354 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; ARG 1 name METHOD method_5356 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 96d09d8d7d..9af5fac10d 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -149,7 +149,6 @@ 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/List; FIELD field_54946 onFire Z FIELD field_54947 queuedCollisionChecks Ljava/util/List; FIELD field_54948 collidedBlockPositions Lit/unimi/dsi/fastutil/longs/LongSet; @@ -202,7 +201,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6011 dataTracker Lnet/minecraft/class_2945; FIELD field_6012 age I FIELD field_6014 lastX D - FIELD field_6017 fallDistance F + FIELD field_6017 fallDistance D FIELD field_6018 portalCooldown I FIELD field_6021 uuid Ljava/util/UUID; FIELD field_6025 NULL_BOX Lnet/minecraft/class_238; @@ -1489,7 +1488,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 3 tickDelta ARG 4 includeFluids METHOD method_5746 onSwimmingStart ()V - METHOD method_5747 handleFallDamage (FFLnet/minecraft/class_1282;)Z + METHOD method_5747 handleFallDamage (DFLnet/minecraft/class_1282;)Z COMMENT Called when an entity falls. COMMENT COMMENT

Flying mobs and mobs immune to fall damage should override this to do nothing. @@ -1499,9 +1498,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT COMMENT @return whether to play the sound when falling on honey block; {@code false} for all COMMENT entities except horses and llamas - ARG 1 fallDistance - ARG 2 damageMultiplier - ARG 3 damageSource METHOD method_5748 getMaxAir ()I COMMENT {@return the maximum amount of air the entity can hold, in ticks} COMMENT @@ -2186,11 +2182,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 tickDelta METHOD method_61416 isInSameTeam (Lnet/minecraft/class_1297;)Z ARG 1 other - METHOD method_63612 collides (Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_2338;Lnet/minecraft/class_265;)Z + METHOD method_63612 collides (Lnet/minecraft/class_243;Lnet/minecraft/class_243;Ljava/util/List;)Z ARG 1 oldPos ARG 2 newPos - ARG 3 blockPos - ARG 4 shape METHOD method_63613 updateLastPosition ()V METHOD method_63614 updateLastAngles ()V METHOD method_63615 setLastPositionAndAngles (Lnet/minecraft/class_243;FF)V @@ -2256,9 +2250,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_64615 onRemove (Lnet/minecraft/class_1297$class_5529;)V COMMENT Called when the entity is about to be removed. ARG 1 reason - METHOD method_65037 checkBlockCollision (Ljava/util/List;Ljava/util/List;)V + METHOD method_65037 checkBlockCollision (Ljava/util/List;Lnet/minecraft/class_1297$class_10629;)V ARG 1 queuedCollisionChecks - ARG 2 collidedBlocks METHOD method_65038 isControlledByPlayer ()Z METHOD method_65341 calculateDefaultBoundingBox (Lnet/minecraft/class_243;)Lnet/minecraft/class_238; ARG 1 pos diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index fefdda2df2..fbe68927d8 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -89,16 +89,11 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 0 world ARG 1 stack ARG 2 spawner - METHOD method_48010 (Lnet/minecraft/class_2561;Lnet/minecraft/class_1297;)V - ARG 1 entity METHOD method_48011 nbtCopier (Ljava/util/function/Consumer;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;)Ljava/util/function/Consumer; ARG 0 chained ARG 1 world ARG 2 stack ARG 3 spawner - METHOD method_48012 customNameCopier (Ljava/util/function/Consumer;Lnet/minecraft/class_1799;)Ljava/util/function/Consumer; - ARG 0 chained - ARG 1 stack METHOD method_48013 (Lnet/minecraft/class_1297;)V ARG 0 entity METHOD method_48156 copier (Ljava/util/function/Consumer;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;)Ljava/util/function/Consumer; diff --git a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping index c1946bd577..5a36a47c8b 100644 --- a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping +++ b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_1303 net/minecraft/entity/ExperienceOrbEntity FIELD field_30056 EXPENSIVE_UPDATE_INTERVAL I FIELD field_30058 MERGING_CHANCE_FRACTION I FIELD field_55662 interpolator Lnet/minecraft/class_10584; - FIELD field_6159 amount I FIELD field_6161 health I FIELD field_6162 target Lnet/minecraft/class_1657; FIELD field_6164 orbAge I diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index d65c04fb3d..235c957823 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -22,7 +22,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_42108 limbAnimator Lnet/minecraft/class_8080; FIELD field_45123 serverHeadYaw D FIELD field_45740 ACTIVE_EFFECTS_NBT_KEY Ljava/lang/String; - FIELD field_48826 syncedBodyArmorStack Lnet/minecraft/class_1799; FIELD field_49792 POTION_SWIRLS Lnet/minecraft/class_2940; FIELD field_51569 riptideAttackDamage F FIELD field_51570 riptideStack Lnet/minecraft/class_1799; @@ -46,7 +45,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6229 lastHandSwingProgress F FIELD field_6230 lastAttackedTime I FIELD field_6231 SPRINTING_SPEED_BOOST Lnet/minecraft/class_1322; - FIELD field_6234 syncedHandStacks Lnet/minecraft/class_2371; FIELD field_6235 hurtTime I FIELD field_6236 attacking Lnet/minecraft/class_1309; FIELD field_6238 playerHitTimer I @@ -55,7 +53,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6243 leaningPitch F FIELD field_6246 absorptionAmount F FIELD field_6247 HEALTH Lnet/minecraft/class_2940; - FIELD field_6248 syncedArmorStacks Lnet/minecraft/class_2371; FIELD field_6250 forwardSpeed F FIELD field_6251 handSwingProgress F FIELD field_6252 handSwinging Z @@ -142,9 +139,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_21755 setStingerCount (I)V ARG 1 stingerCount METHOD method_23328 playBlockFallSound ()V - METHOD method_23329 computeFallDamage (FF)I - ARG 1 fallDistance - ARG 2 damageMultiplier + METHOD method_23329 computeFallDamage (DF)I METHOD method_23667 swingHand (Lnet/minecraft/class_1268;Z)V ARG 1 hand ARG 2 fromServerPlayer @@ -219,27 +214,14 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 attackingPlayer ARG 2 playerHitTimer METHOD method_29920 shouldSwimInFluids ()Z - METHOD method_30120 (Ljava/util/List;Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V - ARG 2 slot - ARG 3 stack METHOD method_30121 checkHandStackSwap (Ljava/util/Map;)V COMMENT Notifies nearby players if the stacks in the hands have been swapped. ARG 1 equipmentChanges - METHOD method_30122 setSyncedArmorStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V - ARG 1 slot - ARG 2 armor METHOD method_30123 sendEquipmentChanges (Ljava/util/Map;)V COMMENT Sends equipment changes to nearby players. COMMENT COMMENT @see #sendEquipmentChanges() ARG 1 equipmentChanges - METHOD method_30124 setSyncedHandStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V - ARG 1 slot - ARG 2 stack - METHOD method_30125 getSyncedArmorStack (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1799; - ARG 1 slot - METHOD method_30126 getSyncedHandStack (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1799; - ARG 1 slot METHOD method_30127 swapHandStacks ()V METHOD method_30128 sendEquipmentChanges ()V COMMENT Sends equipment changes to nearby players. @@ -345,9 +327,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 sound METHOD method_56079 getSlotForHand (Lnet/minecraft/class_1268;)Lnet/minecraft/class_1304; ARG 0 hand - METHOD method_5661 getArmorItems ()Ljava/lang/Iterable; - METHOD method_56674 getAllArmorItems ()Ljava/lang/Iterable; - METHOD method_56675 getEquippedItems ()Ljava/lang/Iterable; METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack @@ -366,7 +345,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 2 amount ARG 3 slots METHOD method_58150 updatePotionSwirls ()V - METHOD method_5877 getHandItems ()Ljava/lang/Iterable; METHOD method_5936 canPickUpLoot ()Z METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type @@ -629,8 +607,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6115 isUsingItem ()Z METHOD method_6116 onEquipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V ARG 1 slot - ARG 2 oldStack - ARG 3 newStack METHOD method_6117 getLastAttackedTime ()I METHOD method_6118 getEquippedStack (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1799; ARG 1 slot diff --git a/mappings/net/minecraft/entity/Saddleable.mapping b/mappings/net/minecraft/entity/Saddleable.mapping deleted file mode 100644 index 997363041f..0000000000 --- a/mappings/net/minecraft/entity/Saddleable.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_5146 net/minecraft/entity/Saddleable - COMMENT Represents an entity that can be saddled, either by a player or a - COMMENT dispenser. - METHOD method_45328 getSaddleSound ()Lnet/minecraft/class_3414; - METHOD method_6576 saddle (Lnet/minecraft/class_1799;Lnet/minecraft/class_3419;)V - ARG 1 stack - ARG 2 soundCategory - METHOD method_6725 isSaddled ()Z - METHOD method_6765 canBeSaddled ()Z diff --git a/mappings/net/minecraft/entity/SaddledComponent.mapping b/mappings/net/minecraft/entity/SaddledComponent.mapping index 3ec623ccaf..d156b04134 100644 --- a/mappings/net/minecraft/entity/SaddledComponent.mapping +++ b/mappings/net/minecraft/entity/SaddledComponent.mapping @@ -3,22 +3,13 @@ CLASS net/minecraft/class_4980 net/minecraft/entity/SaddledComponent FIELD field_23216 boostedTime I FIELD field_23218 dataTracker Lnet/minecraft/class_2945; FIELD field_23219 boostTime Lnet/minecraft/class_2940; - FIELD field_23220 saddled Lnet/minecraft/class_2940; FIELD field_30060 MIN_BOOST_TIME I - METHOD (Lnet/minecraft/class_2945;Lnet/minecraft/class_2940;Lnet/minecraft/class_2940;)V + METHOD (Lnet/minecraft/class_2945;Lnet/minecraft/class_2940;)V ARG 1 dataTracker ARG 2 boostTime - ARG 3 saddled METHOD method_26307 boost ()V METHOD method_26308 boost (Lnet/minecraft/class_5819;)Z ARG 1 random - METHOD method_26309 writeNbt (Lnet/minecraft/class_2487;)V - ARG 1 nbt - METHOD method_26310 setSaddled (Z)V - ARG 1 saddled - METHOD method_26311 isSaddled ()Z - METHOD method_26312 readNbt (Lnet/minecraft/class_2487;)V - ARG 1 nbt METHOD method_49478 tickBoost ()V METHOD method_49479 getMovementSpeedMultiplier ()F METHOD method_49480 getBoostTime ()I diff --git a/mappings/net/minecraft/entity/VariantHolder.mapping b/mappings/net/minecraft/entity/VariantHolder.mapping deleted file mode 100644 index e0e7b3057f..0000000000 --- a/mappings/net/minecraft/entity/VariantHolder.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_7988 net/minecraft/entity/VariantHolder - METHOD method_47826 setVariant (Ljava/lang/Object;)V - ARG 1 variant - METHOD method_47827 getVariant ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/entity/ai/brain/task/UpdateJobSiteTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/UpdateJobSiteTask.mapping index efbae73621..1a9e049a1e 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/UpdateJobSiteTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/UpdateJobSiteTask.mapping @@ -9,11 +9,7 @@ CLASS net/minecraft/class_4114 net/minecraft/entity/ai/brain/task/UpdateJobSiteT ARG 3 world ARG 4 entity ARG 5 time - METHOD method_46891 (Lnet/minecraft/class_1646;Lnet/minecraft/class_3218;Lnet/minecraft/class_3852;)V - ARG 2 profession METHOD method_46892 (Lnet/minecraft/class_4208;Lnet/minecraft/class_3218;)Ljava/util/Optional; ARG 1 jobSiteWorld METHOD method_46893 (Lnet/minecraft/class_6880;)Ljava/util/Optional; ARG 0 poiType - METHOD method_46894 (Lnet/minecraft/class_6880;Lnet/minecraft/class_3852;)Z - ARG 1 profession diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping index 1779cf3ed2..73ff7764e4 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping @@ -1,33 +1,24 @@ CLASS net/minecraft/class_4129 net/minecraft/entity/ai/brain/task/VillagerTaskListProvider FIELD field_30189 JOB_WALKING_SPEED F - METHOD method_19020 createCoreTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; - ARG 0 profession + METHOD method_19020 createCoreTasks (Lnet/minecraft/class_6880;F)Lcom/google/common/collect/ImmutableList; ARG 1 speed - METHOD method_19021 createWorkTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; - ARG 0 profession + METHOD method_19021 createWorkTasks (Lnet/minecraft/class_6880;F)Lcom/google/common/collect/ImmutableList; ARG 1 speed - METHOD method_19022 createRestTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; - ARG 0 profession + METHOD method_19022 createRestTasks (Lnet/minecraft/class_6880;F)Lcom/google/common/collect/ImmutableList; ARG 1 speed - METHOD method_19023 createMeetTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; - ARG 0 profession + METHOD method_19023 createMeetTasks (Lnet/minecraft/class_6880;F)Lcom/google/common/collect/ImmutableList; ARG 1 speed - METHOD method_19024 createIdleTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; - ARG 0 profession + METHOD method_19024 createIdleTasks (Lnet/minecraft/class_6880;F)Lcom/google/common/collect/ImmutableList; ARG 1 speed - METHOD method_19025 createPanicTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; - ARG 0 profession + METHOD method_19025 createPanicTasks (Lnet/minecraft/class_6880;F)Lcom/google/common/collect/ImmutableList; ARG 1 speed METHOD method_19990 createPlayTasks (F)Lcom/google/common/collect/ImmutableList; ARG 0 speed - METHOD method_19991 createPreRaidTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; - ARG 0 profession + METHOD method_19991 createPreRaidTasks (Lnet/minecraft/class_6880;F)Lcom/google/common/collect/ImmutableList; ARG 1 speed - METHOD method_19992 createRaidTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; - ARG 0 profession + METHOD method_19992 createRaidTasks (Lnet/minecraft/class_6880;F)Lcom/google/common/collect/ImmutableList; ARG 1 speed - METHOD method_19993 createHideTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; - ARG 0 profession + METHOD method_19993 createHideTasks (Lnet/minecraft/class_6880;F)Lcom/google/common/collect/ImmutableList; ARG 1 speed METHOD method_20241 createFreeFollowTask ()Lcom/mojang/datafixers/util/Pair; METHOD method_20242 createBusyFollowTask ()Lcom/mojang/datafixers/util/Pair; diff --git a/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping index 3e60e6de71..2aed1997ad 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_5326 net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask - METHOD method_29253 isCompletedWorkStation (Lnet/minecraft/class_6880;Lnet/minecraft/class_3852;)Z + METHOD method_29253 isCompletedWorkStation (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Z ARG 0 poiType - ARG 1 profession METHOD method_29255 keepJobSiteForMoreExperiencedVillager (Lnet/minecraft/class_1646;Lnet/minecraft/class_1646;)Lnet/minecraft/class_1646; ARG 0 first ARG 1 second diff --git a/mappings/net/minecraft/entity/ai/goal/SitOnOwnerShoulderGoal.mapping b/mappings/net/minecraft/entity/ai/goal/SitOnOwnerShoulderGoal.mapping index b6ae2fcbc6..6f6952149a 100644 --- a/mappings/net/minecraft/entity/ai/goal/SitOnOwnerShoulderGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/SitOnOwnerShoulderGoal.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1360 net/minecraft/entity/ai/goal/SitOnOwnerShoulderGoal FIELD field_6478 tameable Lnet/minecraft/class_1471; - FIELD field_6479 owner Lnet/minecraft/class_3222; FIELD field_6480 mounted Z METHOD (Lnet/minecraft/class_1471;)V ARG 1 tameable diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping index 3c3e3c0cfa..b7276f1c87 100644 --- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping @@ -11,12 +11,10 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity FIELD field_7105 TRACKER_RIGHT_ARM_ROTATION Lnet/minecraft/class_2940; FIELD field_7106 bodyRotation Lnet/minecraft/class_2379; FIELD field_7107 ARMOR_STAND_FLAGS Lnet/minecraft/class_2940; - FIELD field_7108 armorItems Lnet/minecraft/class_2371; FIELD field_7110 leftLegRotation Lnet/minecraft/class_2379; FIELD field_7111 invisible Z FIELD field_7112 lastHitTime J FIELD field_7113 DEFAULT_HEAD_ROTATION Lnet/minecraft/class_2379; - FIELD field_7114 heldItems Lnet/minecraft/class_2371; FIELD field_7115 DEFAULT_RIGHT_ARM_ROTATION Lnet/minecraft/class_2379; FIELD field_7116 TRACKER_LEFT_ARM_ROTATION Lnet/minecraft/class_2940; FIELD field_7117 DEFAULT_RIGHT_LEG_ROTATION Lnet/minecraft/class_2379; diff --git a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping index 735eea18d6..f4425cf6ce 100644 --- a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1534 net/minecraft/entity/decoration/painting/PaintingEntity FIELD field_38941 VARIANT Lnet/minecraft/class_2940; - FIELD field_49238 VARIANT_MAP_CODEC Lcom/mojang/serialization/MapCodec; FIELD field_49239 VARIANT_ENTRY_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world diff --git a/mappings/net/minecraft/entity/mob/CreakingBrain.mapping b/mappings/net/minecraft/entity/mob/CreakingBrain.mapping index fe48da45ec..8b76344ad4 100644 --- a/mappings/net/minecraft/entity/mob/CreakingBrain.mapping +++ b/mappings/net/minecraft/entity/mob/CreakingBrain.mapping @@ -14,7 +14,5 @@ CLASS net/minecraft/class_10280 net/minecraft/entity/mob/CreakingBrain ARG 1 creaking METHOD method_64637 addIdleTasks (Lnet/minecraft/class_4095;)V ARG 0 brain - METHOD method_64638 addFightTasks (Lnet/minecraft/class_4095;)V - ARG 0 brain - METHOD method_64639 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; - ARG 0 brain + METHOD method_64638 addFightTasks (Lnet/minecraft/class_10275;Lnet/minecraft/class_4095;)V + METHOD method_64639 create (Lnet/minecraft/class_10275;Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 9d2662369e..5d4a5eeebf 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -26,7 +26,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity COMMENT @see MobEntity#initEquipment FIELD field_38386 ITEM_PICK_UP_RANGE_EXPANDER Lnet/minecraft/class_2382; FIELD field_45969 ATTACK_RANGE D - FIELD field_48829 bodyArmor Lnet/minecraft/class_1799; FIELD field_51997 RANDOM_SPAWN_BONUS_MODIFIER_ID Lnet/minecraft/class_2960; FIELD field_52221 leashData Lnet/minecraft/class_9817$class_9818; FIELD field_52448 EQUIPMENT_INIT_ORDER Ljava/util/List; @@ -43,7 +42,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity FIELD field_6191 ambientSoundChance I FIELD field_6193 MOB_FLAGS Lnet/minecraft/class_2940; FIELD field_6194 experiencePoints I - FIELD field_6195 handItems Lnet/minecraft/class_2371; FIELD field_6196 pathfindingPenalties Ljava/util/Map; FIELD field_6198 lootTable Ljava/util/Optional; FIELD field_6199 target Lnet/minecraft/class_1309; @@ -53,7 +51,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity COMMENT entity as determined during the {@link MobEntity#targetSelector}'s execution. FIELD field_6203 canPickUpLoot Z FIELD field_6204 jumpControl Lnet/minecraft/class_1334; - FIELD field_6205 armorItems Lnet/minecraft/class_2371; FIELD field_6206 lookControl Lnet/minecraft/class_1333; FIELD field_6207 moveControl Lnet/minecraft/class_1335; METHOD method_17326 cannotDespawn ()Z @@ -130,8 +127,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 3 localDifficulty METHOD method_35055 clearPositionTarget ()V METHOD method_35056 clearGoalsAndTasks ()V - METHOD method_37341 (Lnet/minecraft/class_1799;)V - ARG 0 stack METHOD method_42150 isInAttackRange (Lnet/minecraft/class_1309;)Z ARG 1 entity METHOD method_42646 getItemPickUpRangeExpander ()Lnet/minecraft/class_2382; diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index 3f46bbbe05..c06c00b5c5 100644 --- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity FIELD field_18118 PARENT_HORSE_PREDICATE Lnet/minecraft/class_4051; FIELD field_30419 TAMED_FLAG I - FIELD field_30420 SADDLED_FLAG I FIELD field_30421 BRED_FLAG I FIELD field_30422 EATING_GRASS_FLAG I FIELD field_30423 ANGRY_FLAG I @@ -12,7 +11,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity FIELD field_42644 MAX_JUMP_STRENGTH_BONUS F FIELD field_42645 MIN_HEALTH_BONUS F FIELD field_42646 MAX_HEALTH_BONUS F - FIELD field_48830 armorInventory Lnet/minecraft/class_1263; FIELD field_55705 ownerReference Lnet/minecraft/class_10583; FIELD field_6955 temper I FIELD field_6956 IS_BRED_HORSE Lnet/minecraft/class_4051$class_10254; @@ -72,8 +70,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity ARG 1 controllingPassenger METHOD method_49996 isWooden (Lnet/minecraft/class_2498;)Z ARG 1 soundGroup - METHOD method_56679 updateSaddledFlag ()V - METHOD method_56680 getArmorInventory ()Lnet/minecraft/class_1263; METHOD method_58392 (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_6001 initAttributes (Lnet/minecraft/class_5819;)V diff --git a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping index d932fd3874..c274584ea5 100644 --- a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping @@ -27,9 +27,8 @@ CLASS net/minecraft/class_1438 net/minecraft/entity/passive/MooshroomEntity FIELD field_18111 name Ljava/lang/String; FIELD field_18112 mushroom Lnet/minecraft/class_2680; FIELD field_41549 CODEC Lnet/minecraft/class_3542$class_7292; - METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_2680;)V + METHOD (Ljava/lang/String;ILjava/lang/String;ILnet/minecraft/class_2680;)V ARG 3 name - ARG 4 mushroom METHOD method_18437 getMushroomState ()Lnet/minecraft/class_2680; METHOD method_18441 fromName (Ljava/lang/String;)Lnet/minecraft/class_1438$class_4053; ARG 0 name diff --git a/mappings/net/minecraft/entity/passive/PigEntity.mapping b/mappings/net/minecraft/entity/passive/PigEntity.mapping index 2f9fff7f05..fd8c196cf1 100644 --- a/mappings/net/minecraft/entity/passive/PigEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PigEntity.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_1452 net/minecraft/entity/passive/PigEntity FIELD field_23230 saddledComponent Lnet/minecraft/class_4980; FIELD field_55679 VARIANT Lnet/minecraft/class_2940; FIELD field_6815 BOOST_TIME Lnet/minecraft/class_2940; - FIELD field_6816 SADDLED Lnet/minecraft/class_2940; METHOD method_26890 createPigAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_58372 (Lnet/minecraft/class_1799;)Z ARG 0 stack diff --git a/mappings/net/minecraft/entity/passive/SalmonEntity.mapping b/mappings/net/minecraft/entity/passive/SalmonEntity.mapping index 15c9122429..a4c6f8020a 100644 --- a/mappings/net/minecraft/entity/passive/SalmonEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SalmonEntity.mapping @@ -2,8 +2,6 @@ CLASS net/minecraft/class_1462 net/minecraft/entity/passive/SalmonEntity FIELD field_52469 VARIANT Lnet/minecraft/class_2940; FIELD field_55007 TYPE_KEY Ljava/lang/String; METHOD method_63008 getVariantScale ()F - METHOD method_63009 (Lnet/minecraft/class_2487;)V - ARG 1 nbt CLASS class_9869 Variant FIELD field_52473 CODEC Lnet/minecraft/class_3542$class_7292; FIELD field_52474 id Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/passive/StriderEntity.mapping b/mappings/net/minecraft/entity/passive/StriderEntity.mapping index dfbaa2855e..457edd37b4 100644 --- a/mappings/net/minecraft/entity/passive/StriderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/StriderEntity.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity FIELD field_23241 temptGoal Lnet/minecraft/class_1391; FIELD field_23245 BOOST_TIME Lnet/minecraft/class_2940; FIELD field_23246 COLD Lnet/minecraft/class_2940; - FIELD field_23247 SADDLED Lnet/minecraft/class_2940; FIELD field_30499 COLD_SADDLED_SPEED F FIELD field_30501 DEFAULT_SADDLED_SPEED F FIELD field_42981 SUFFOCATING_MODIFIER_ID Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping index d2b7a8a92f..b3c1279474 100644 --- a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1474 net/minecraft/entity/passive/TropicalFishEntity - FIELD field_30378 BUCKET_VARIANT_TAG_KEY Ljava/lang/String; FIELD field_41573 COMMON_VARIANTS Ljava/util/List; FIELD field_6874 VARIANT Lnet/minecraft/class_2940; FIELD field_6877 commonSpawn Z diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 1a82d15605..ddc05e125b 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -17,10 +17,9 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity FIELD field_25167 natural Z FIELD field_36335 LOGGER Lorg/slf4j/Logger; FIELD field_7445 VILLAGER_DATA Lnet/minecraft/class_2940; - METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;Lnet/minecraft/class_3854;)V + METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;Lnet/minecraft/class_6880;)V ARG 1 entityType ARG 2 world - ARG 3 type METHOD method_16917 setOffers (Lnet/minecraft/class_1916;)V ARG 1 offers METHOD method_16918 levelUp ()V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index e9a4007073..64f3284a7b 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -153,7 +153,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_58396 clearCurrentExplosion ()V METHOD method_58397 (Lnet/minecraft/class_243;)V ARG 1 currentExplosionImpactPos - METHOD method_59818 isSpaceAroundPlayerEmpty (DDF)Z + METHOD method_59818 isSpaceAroundPlayerEmpty (DDD)Z ARG 1 offsetX ARG 3 offsetZ METHOD method_59903 getDamageAgainst (Lnet/minecraft/class_1297;FLnet/minecraft/class_1282;)F diff --git a/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping index 18ac020ed5..b2ec5d8809 100644 --- a/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_1701 net/minecraft/entity/vehicle/TntMinecartEntity ARG 1 power METHOD method_55057 shouldDetonate (Lnet/minecraft/class_1282;)Z ARG 0 source - METHOD method_7575 prime ()V + METHOD method_7575 prime (Lnet/minecraft/class_1282;)V METHOD method_7576 explode (Lnet/minecraft/class_1282;D)V ARG 1 damageSource ARG 2 power diff --git a/mappings/net/minecraft/item/DecorationItem.mapping b/mappings/net/minecraft/item/DecorationItem.mapping index 251f991110..190b65b4e6 100644 --- a/mappings/net/minecraft/item/DecorationItem.mapping +++ b/mappings/net/minecraft/item/DecorationItem.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/class_1790 net/minecraft/item/DecorationItem METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1792$class_1793;)V ARG 1 type ARG 2 settings - METHOD method_48960 (Ljava/util/List;Lnet/minecraft/class_6880;)V - ARG 1 variant METHOD method_7834 canPlaceOn (Lnet/minecraft/class_1657;Lnet/minecraft/class_2350;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)Z ARG 1 player ARG 2 side diff --git a/mappings/net/minecraft/item/EntityBucketItem.mapping b/mappings/net/minecraft/item/EntityBucketItem.mapping index bfdb762d63..f696ec26a8 100644 --- a/mappings/net/minecraft/item/EntityBucketItem.mapping +++ b/mappings/net/minecraft/item/EntityBucketItem.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1785 net/minecraft/item/EntityBucketItem FIELD field_28356 emptyingSound Lnet/minecraft/class_3414; - FIELD field_49272 TROPICAL_FISH_VARIANT_MAP_CODEC Lcom/mojang/serialization/MapCodec; FIELD field_7991 entityType Lnet/minecraft/class_1299; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_3611;Lnet/minecraft/class_3414;Lnet/minecraft/class_1792$class_1793;)V ARG 1 type diff --git a/mappings/net/minecraft/item/ItemGroups.mapping b/mappings/net/minecraft/item/ItemGroups.mapping index e46bd318b9..d191f11044 100644 --- a/mappings/net/minecraft/item/ItemGroups.mapping +++ b/mappings/net/minecraft/item/ItemGroups.mapping @@ -64,8 +64,6 @@ CLASS net/minecraft/class_7706 net/minecraft/item/ItemGroups METHOD method_47344 getSearchGroup ()Lnet/minecraft/class_1761; METHOD method_48934 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;Lnet/minecraft/class_1799;)V ARG 2 stack - METHOD method_48935 (Lnet/minecraft/class_6903;Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;Lnet/minecraft/class_6880$class_6883;)V - ARG 3 paintingVariantEntry METHOD method_48937 addPaintings (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7225$class_7226;Ljava/util/function/Predicate;Lnet/minecraft/class_1761$class_7705;)V ARG 0 entries ARG 1 registries @@ -141,8 +139,6 @@ CLASS net/minecraft/class_7706 net/minecraft/item/ItemGroups METHOD method_51338 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V ARG 0 displayContext ARG 1 entries - METHOD method_58091 (Lnet/minecraft/class_2487;)V - ARG 0 nbt METHOD method_58650 (Lnet/minecraft/class_7699;Lnet/minecraft/class_6880$class_6883;)Z ARG 1 potionEntry METHOD method_58652 addOminousBottles (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;)V diff --git a/mappings/net/minecraft/item/SaddleItem.mapping b/mappings/net/minecraft/item/SaddleItem.mapping deleted file mode 100644 index e6120cf7d5..0000000000 --- a/mappings/net/minecraft/item/SaddleItem.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1816 net/minecraft/item/SaddleItem diff --git a/mappings/net/minecraft/nbt/NbtException.mapping b/mappings/net/minecraft/nbt/NbtException.mapping index e4fed00c49..d5f60b7edf 100644 --- a/mappings/net/minecraft/nbt/NbtException.mapping +++ b/mappings/net/minecraft/nbt/NbtException.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_8909 net/minecraft/nbt/NbtException - METHOD (Ljava/lang/String;)V - ARG 1 message diff --git a/mappings/net/minecraft/network/codec/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping index 478c8552d4..9a52b61243 100644 --- a/mappings/net/minecraft/network/codec/PacketCodec.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping @@ -203,7 +203,7 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec ARG 14 codec8 ARG 15 from8 ARG 16 to - CLASS 7 + CLASS 8 FIELD field_49712 codecSupplier Ljava/util/function/Supplier; CLASS class_9140 ResultFunction METHOD apply (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/predicate/ComponentPredicate.mapping b/mappings/net/minecraft/predicate/ComponentPredicate.mapping index b346d0c3a4..2f7b1f82e2 100644 --- a/mappings/net/minecraft/predicate/ComponentPredicate.mapping +++ b/mappings/net/minecraft/predicate/ComponentPredicate.mapping @@ -8,8 +8,6 @@ CLASS net/minecraft/class_9329 net/minecraft/predicate/ComponentPredicate METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_57862 builder ()Lnet/minecraft/class_9329$class_9330; - METHOD method_57864 test (Lnet/minecraft/class_9322;)Z - ARG 1 holder METHOD method_57865 of (Lnet/minecraft/class_9323;)Lnet/minecraft/class_9329; ARG 0 components METHOD method_57866 (Lnet/minecraft/class_9329;)Ljava/util/List; diff --git a/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping b/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping index 88a7cd3e05..e64552af63 100644 --- a/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping +++ b/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping @@ -1,93 +1,6 @@ CLASS net/minecraft/class_7378 net/minecraft/predicate/entity/EntitySubPredicateTypes - METHOD method_43100 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_43102 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47829 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47830 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47831 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47832 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47833 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47834 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47835 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47836 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47837 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47839 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_58153 catVariant (Lnet/minecraft/class_6880;)Lnet/minecraft/class_7376; - ARG 0 catVariant - METHOD method_58154 frogVariant (Lnet/minecraft/class_6880;)Lnet/minecraft/class_7376; - ARG 0 frogVariant - METHOD method_58155 register (Ljava/lang/String;Lnet/minecraft/class_7378$class_7380;)Lnet/minecraft/class_7378$class_7380; - ARG 0 id - ARG 1 type METHOD method_58156 register (Ljava/lang/String;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec; ARG 0 id ARG 1 codec METHOD method_58157 getDefault (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/MapCodec; ARG 0 registry - METHOD method_58351 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_58352 register (Ljava/lang/String;Lnet/minecraft/class_7378$class_9419;)Lnet/minecraft/class_7378$class_9419; - ARG 0 id - ARG 1 type - METHOD method_59667 wolfVariant (Lnet/minecraft/class_6885;)Lnet/minecraft/class_7376; - ARG 0 wolfVariant - METHOD method_64175 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_66289 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - CLASS class_7380 VariantType - FIELD field_38741 variantGetter Ljava/util/function/Function; - FIELD field_49794 codec Lcom/mojang/serialization/MapCodec; - METHOD (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)V - ARG 1 variantCodec - ARG 2 variantGetter - METHOD method_43115 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 2 instance - METHOD method_43116 create (Lnet/minecraft/class_2378;Ljava/util/function/Function;)Lnet/minecraft/class_7378$class_7380; - ARG 0 registry - ARG 1 variantGetter - METHOD method_43117 createPredicate (Ljava/lang/Object;)Lnet/minecraft/class_7376; - ARG 1 variant - METHOD method_47840 create (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lnet/minecraft/class_7378$class_7380; - ARG 0 codec - ARG 1 variantGetter - METHOD method_58158 (Lnet/minecraft/class_7378$class_7380$class_9353;)Ljava/lang/Object; - ARG 0 predicate - METHOD method_58159 (Ljava/lang/Object;)Lnet/minecraft/class_7378$class_7380$class_9353; - ARG 1 variant - CLASS class_9353 VariantPredicate - FIELD field_49796 variant Ljava/lang/Object; - METHOD (Lnet/minecraft/class_7378$class_7380;Ljava/lang/Object;)V - ARG 2 variant - CLASS class_9419 DynamicVariantType - FIELD field_49974 codec Lcom/mojang/serialization/MapCodec; - FIELD field_49975 variantGetter Ljava/util/function/Function; - METHOD (Lnet/minecraft/class_5321;Ljava/util/function/Function;)V - ARG 1 registryRef - ARG 2 variantGetter - METHOD method_58353 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 2 instance - METHOD method_58354 create (Lnet/minecraft/class_5321;Ljava/util/function/Function;)Lnet/minecraft/class_7378$class_9419; - ARG 0 registryRef - ARG 1 variantGetter - METHOD method_58355 (Lnet/minecraft/class_7378$class_9419$class_9420;)Lnet/minecraft/class_6885; - ARG 0 type - METHOD method_58356 createPredicate (Lnet/minecraft/class_6885;)Lnet/minecraft/class_7376; - ARG 1 variants - METHOD method_58357 (Lnet/minecraft/class_6885;)Lnet/minecraft/class_7378$class_9419$class_9420; - ARG 1 entries - CLASS class_9420 DynamicPredicate - FIELD field_49977 variants Lnet/minecraft/class_6885; - METHOD (Lnet/minecraft/class_7378$class_9419;Lnet/minecraft/class_6885;)V - ARG 2 variants diff --git a/mappings/net/minecraft/predicate/entity/SheepPredicate.mapping b/mappings/net/minecraft/predicate/entity/SheepPredicate.mapping index feecdd88f9..6ccddf1d37 100644 --- a/mappings/net/minecraft/predicate/entity/SheepPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/SheepPredicate.mapping @@ -2,5 +2,4 @@ CLASS net/minecraft/class_10168 net/minecraft/predicate/entity/SheepPredicate FIELD field_54004 CODEC Lcom/mojang/serialization/MapCodec; METHOD method_63497 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_63498 unsheared (Lnet/minecraft/class_1767;)Lnet/minecraft/class_10168; - ARG 0 color + METHOD method_63498 unsheared ()Lnet/minecraft/class_10168; diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping index 7b8c3a7721..158162ce89 100644 --- a/mappings/net/minecraft/registry/Registries.mapping +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -84,10 +84,6 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries FIELD field_54874 RECIPE_DISPLAY Lnet/minecraft/class_2378; FIELD field_54927 RECIPE_BOOK_CATEGORY Lnet/minecraft/class_2378; FIELD field_55881 TICKET_TYPE Lnet/minecraft/class_2378; - METHOD method_47450 (Lnet/minecraft/class_2378;)Ljava/lang/Object; - ARG 0 registry - METHOD method_47451 (Lnet/minecraft/class_2378;)Ljava/lang/Object; - ARG 0 registry METHOD method_47452 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry METHOD method_47453 (Lnet/minecraft/class_2378;)Ljava/lang/Object; @@ -197,8 +193,6 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries ARG 0 registry METHOD method_47514 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47515 (Lnet/minecraft/class_2378;)Ljava/lang/Object; - ARG 0 registry METHOD method_49927 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry METHOD method_53495 createIntrusive (Lnet/minecraft/class_5321;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_2378; diff --git a/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping index 552e6965ab..4abc1ab8bd 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping @@ -19,8 +19,6 @@ CLASS net/minecraft/class_7665 net/minecraft/resource/DefaultResourcePackBuilder ARG 2 path METHOD method_45202 (Lnet/minecraft/class_7665;)V ARG 0 builder - METHOD method_45203 toPath (Ljava/net/URI;)Ljava/nio/file/Path; - ARG 0 uri METHOD method_45204 withRoot (Ljava/nio/file/Path;)Lnet/minecraft/class_7665; ARG 1 root METHOD method_45205 reverse (Ljava/util/Collection;)Ljava/util/List; diff --git a/mappings/net/minecraft/screen/HorseScreenHandler.mapping b/mappings/net/minecraft/screen/HorseScreenHandler.mapping index 7faa452b02..5a50672269 100644 --- a/mappings/net/minecraft/screen/HorseScreenHandler.mapping +++ b/mappings/net/minecraft/screen/HorseScreenHandler.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1724 net/minecraft/screen/HorseScreenHandler - FIELD field_48834 horseArmorInventory Lnet/minecraft/class_1263; FIELD field_55026 EMPTY_SADDLE_SLOT_TEXTURE Lnet/minecraft/class_2960; FIELD field_55027 EMPTY_LLAMA_ARMOR_SLOT_TEXTURE Lnet/minecraft/class_2960; FIELD field_55028 EMPTY_HORSE_ARMOR_SLOT_TEXTURE Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/server/ServerConfigHandler.mapping b/mappings/net/minecraft/server/ServerConfigHandler.mapping index cf77071298..eeb14ce03a 100644 --- a/mappings/net/minecraft/server/ServerConfigHandler.mapping +++ b/mappings/net/minecraft/server/ServerConfigHandler.mapping @@ -69,8 +69,6 @@ CLASS net/minecraft/class_3321 net/minecraft/server/ServerConfigHandler METHOD onProfileLookupFailed (Ljava/lang/String;Ljava/lang/Exception;)V ARG 2 exception CLASS class_3322 ServerConfigException - METHOD (Ljava/lang/String;)V - ARG 1 message METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 cause diff --git a/mappings/net/minecraft/server/command/CloneCommand.mapping b/mappings/net/minecraft/server/command/CloneCommand.mapping index b0ad4cc1a1..3f921062b8 100644 --- a/mappings/net/minecraft/server/command/CloneCommand.mapping +++ b/mappings/net/minecraft/server/command/CloneCommand.mapping @@ -21,25 +21,25 @@ CLASS net/minecraft/class_3023 net/minecraft/server/command/CloneCommand METHOD method_13099 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 maxCount ARG 1 count - METHOD method_48035 createModeArgs (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;ZLcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + METHOD method_48035 createModeArgs (Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;ZLcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 beginPosGetter ARG 1 endPosGetter ARG 2 destinationPosGetter ARG 3 filterGetter ARG 4 strict ARG 5 builder - METHOD method_48036 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;ZLcom/mojang/brigadier/context/CommandContext;)I + METHOD method_48036 (Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;ZLcom/mojang/brigadier/context/CommandContext;)I ARG 5 context METHOD method_48040 createDimensionalPos (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3218;Ljava/lang/String;)Lnet/minecraft/class_3023$class_8010; ARG 0 context ARG 1 world ARG 2 name - METHOD method_48042 createSourceArgs (Lnet/minecraft/class_7157;Lnet/minecraft/class_3023$class_8009;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + METHOD method_48042 createSourceArgs (Lnet/minecraft/class_7157;Lnet/minecraft/class_10618;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 commandRegistryAccess ARG 1 worldGetter - METHOD method_48044 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;ZLcom/mojang/brigadier/context/CommandContext;)I + METHOD method_48044 (Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;ZLcom/mojang/brigadier/context/CommandContext;)I ARG 5 context - METHOD method_48049 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;ZLcom/mojang/brigadier/context/CommandContext;)I + METHOD method_48049 (Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;ZLcom/mojang/brigadier/context/CommandContext;)I ARG 5 context METHOD method_48055 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3218; ARG 0 context @@ -49,36 +49,36 @@ CLASS net/minecraft/class_3023 net/minecraft/server/command/CloneCommand ARG 0 context METHOD method_48058 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3218; ARG 0 context - METHOD method_65973 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;ZLcom/mojang/brigadier/context/CommandContext;)I + METHOD method_65973 (Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;ZLcom/mojang/brigadier/context/CommandContext;)I ARG 4 context - METHOD method_65974 (Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3023$class_8010; + METHOD method_65974 (Lnet/minecraft/class_10618;Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3023$class_8010; ARG 1 context METHOD method_65975 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; ARG 0 context METHOD method_65976 (Lnet/minecraft/class_2694;)Z ARG 0 pos - METHOD method_65977 createDestinationArgs (Lnet/minecraft/class_7157;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + METHOD method_65977 createDestinationArgs (Lnet/minecraft/class_7157;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 registries ARG 1 currentWorldGetter ARG 2 targetWorldGetter - METHOD method_65978 appendMode (Lnet/minecraft/class_7157;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;ZLcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + METHOD method_65978 appendMode (Lnet/minecraft/class_7157;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;ZLcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 registries ARG 1 beginPosGetter ARG 2 endPosGetter ARG 3 destinationPosGetter ARG 4 strict ARG 5 builder - METHOD method_65979 (Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3023$class_8010; + METHOD method_65979 (Lnet/minecraft/class_10618;Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3023$class_8010; ARG 1 context METHOD method_65980 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; ARG 0 context METHOD method_65981 (Lnet/minecraft/class_2694;)Z ARG 0 pos - METHOD method_65982 (Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3023$class_8010; + METHOD method_65982 (Lnet/minecraft/class_10618;Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3023$class_8010; ARG 1 context METHOD method_65983 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; ARG 0 context - METHOD method_65984 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;ZLcom/mojang/brigadier/context/CommandContext;)I + METHOD method_65984 (Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;ZLcom/mojang/brigadier/context/CommandContext;)I ARG 5 context CLASS class_3024 BlockInfo FIELD comp_2539 pos Lnet/minecraft/class_2338; @@ -93,9 +93,6 @@ CLASS net/minecraft/class_3023 net/minecraft/server/command/CloneCommand METHOD (Ljava/lang/String;IZ)V ARG 3 allowsOverlap METHOD method_13109 allowsOverlap ()Z - CLASS class_8009 ArgumentGetter - METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; - ARG 1 value CLASS class_8010 DimensionalPos CLASS class_9450 BlockEntityInfo FIELD comp_2537 nbt Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index 6ec0182cb9..cb9c71064c 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -254,7 +254,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand METHOD method_54263 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 function ARG 1 message - METHOD method_54264 enqueueExecutions (Lnet/minecraft/class_8839;Ljava/util/List;Ljava/util/function/Function;Ljava/util/function/IntPredicate;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_2487;Lnet/minecraft/class_8855;Lnet/minecraft/class_3050$class_8830;Lnet/minecraft/class_8936;)V + METHOD method_54264 enqueueExecutions (Lnet/minecraft/class_8839;Ljava/util/List;Ljava/util/function/Function;Ljava/util/function/IntPredicate;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_2487;Lnet/minecraft/class_8855;Lnet/minecraft/class_10618;Lnet/minecraft/class_8936;)V ARG 0 baseSource ARG 1 sources ARG 2 functionSourceGetter @@ -287,9 +287,6 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand CLASS class_3052 Condition METHOD test (Lcom/mojang/brigadier/context/CommandContext;)Z ARG 1 context - CLASS class_8830 FunctionNamesGetter - METHOD get (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object; - ARG 1 context CLASS class_8831 IfUnlessRedirector FIELD field_46643 predicate Ljava/util/function/IntPredicate; METHOD (Z)V diff --git a/mappings/net/minecraft/server/command/FillCommand.mapping b/mappings/net/minecraft/server/command/FillCommand.mapping index 064335019c..0df1145a2d 100644 --- a/mappings/net/minecraft/server/command/FillCommand.mapping +++ b/mappings/net/minecraft/server/command/FillCommand.mapping @@ -21,30 +21,30 @@ CLASS net/minecraft/class_3057 net/minecraft/server/command/FillCommand ARG 3 mode ARG 4 filter ARG 5 strict - METHOD method_65985 (Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I + METHOD method_65985 (Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I ARG 4 context METHOD method_65986 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_65987 buildModeTree (Lnet/minecraft/class_7157;Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10557;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + METHOD method_65987 buildModeTree (Lnet/minecraft/class_7157;Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_3057$class_10557;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 registries ARG 1 argumentBuilder ARG 2 from ARG 3 to ARG 4 state ARG 5 filter - METHOD method_65988 (Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I + METHOD method_65988 (Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I ARG 4 context METHOD method_65989 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; ARG 0 context - METHOD method_65990 (Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I + METHOD method_65990 (Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I ARG 4 context METHOD method_65991 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2247; ARG 0 context - METHOD method_65992 (Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I + METHOD method_65992 (Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I ARG 4 context METHOD method_65993 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2338; ARG 0 context - METHOD method_65994 (Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I + METHOD method_65994 (Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_10618;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I ARG 4 context METHOD method_65995 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2338; ARG 0 context @@ -64,7 +64,6 @@ CLASS net/minecraft/class_3057 net/minecraft/server/command/FillCommand METHOD method_66000 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos - CLASS class_10556 ArgumentResolver CLASS class_10557 OptionalArgumentResolver CLASS class_3058 Mode FIELD field_13654 filter Lnet/minecraft/class_3057$class_3120; diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index 817f15bded..7a394fc33f 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -1,201 +1,59 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand - FIELD field_45665 LOGGER Lorg/slf4j/Logger; - FIELD field_48504 BLOCK_ENTITY_NOT_FOUND_TEXT Ljava/lang/String; - FIELD field_48505 RUNNERS Lnet/minecraft/class_9123$class_9124; - METHOD method_22263 (Ljava/lang/String;Lnet/minecraft/class_124;Lnet/minecraft/class_3222;)V - ARG 2 player METHOD method_22264 executePos (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source ARG 1 variableName - METHOD method_22268 executeCreate (Lnet/minecraft/class_2168;Ljava/lang/String;III)I + METHOD method_22268 executeCreate (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;III)I ARG 0 source - ARG 1 testName ARG 2 x ARG 3 y ARG 4 z - METHOD method_22270 register (Lcom/mojang/brigadier/CommandDispatcher;)V - ARG 0 dispatcher - METHOD method_22275 sendMessage (Lnet/minecraft/class_3218;Ljava/lang/String;Lnet/minecraft/class_124;)V - ARG 0 world - ARG 1 message - ARG 2 formatting - METHOD method_22276 (Lnet/minecraft/class_3222;)Z - ARG 0 player - METHOD method_22278 sendMessage (Lnet/minecraft/class_2168;Ljava/lang/String;)V + METHOD method_22270 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V + METHOD method_22282 executeExport (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880;)I ARG 0 source - ARG 1 message - METHOD method_22282 executeExport (Lnet/minecraft/class_2168;Ljava/lang/String;)I - ARG 0 source - ARG 1 testName - METHOD method_22283 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_22285 executeImport (Lnet/minecraft/class_2168;Ljava/lang/String;)I - ARG 0 source - ARG 1 testName - METHOD method_22286 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_22287 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context METHOD method_22288 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_22289 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_22290 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context METHOD method_23648 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_54850 getStructurePos (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2338; ARG 0 source - METHOD method_54904 checkStructure (Lnet/minecraft/class_3218;Ljava/lang/String;)Z - ARG 0 world - ARG 1 templateId - METHOD method_54905 export (Lnet/minecraft/class_2168;Lnet/minecraft/class_2633;)I - ARG 0 source - ARG 1 blockEntity + METHOD method_54904 checkStructure (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;)Z METHOD method_56254 stop ()I - METHOD method_56255 (ILnet/minecraft/class_2168;Lnet/minecraft/class_9118;Lnet/minecraft/class_4529;)Lnet/minecraft/class_4517; - ARG 3 testFunction METHOD method_56256 (Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 extraConfigAdder - METHOD method_56257 testAttemptConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Ljava/util/function/Function;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + METHOD method_56257 testAttemptConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_10618;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 builder - ARG 1 callback - METHOD method_56258 testAttemptConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + METHOD method_56258 testAttemptConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_10618;Ljava/util/function/Function;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 builder - ARG 1 callback ARG 2 extraConfigAdder - METHOD method_56259 start (Lnet/minecraft/class_2168;Lnet/minecraft/class_3218;Lnet/minecraft/class_4520;)I + METHOD method_56259 start (Lnet/minecraft/class_2168;Lnet/minecraft/class_4520;)I ARG 0 source - ARG 1 world - ARG 2 context METHOD method_56260 (Lnet/minecraft/class_2168;Lnet/minecraft/class_9118;Lnet/minecraft/class_2338;)Ljava/util/Optional; ARG 2 pos - METHOD method_56261 stream (Lnet/minecraft/class_2168;Lnet/minecraft/class_9118;Lnet/minecraft/class_9119;)Ljava/util/stream/Stream; + METHOD method_56261 stream (Lnet/minecraft/class_2168;Lnet/minecraft/class_9118;Lnet/minecraft/class_10675;)Ljava/util/stream/Stream; ARG 0 source ARG 1 config ARG 2 finder - METHOD method_56262 stream (Lnet/minecraft/class_2168;Lnet/minecraft/class_9118;Lnet/minecraft/class_9125;I)Ljava/util/stream/Stream; + METHOD method_56262 stream (Lnet/minecraft/class_2168;Lnet/minecraft/class_9118;Lnet/minecraft/class_10674;I)Ljava/util/stream/Stream; ARG 0 source ARG 1 config ARG 2 finder ARG 3 rotationSteps - METHOD method_56263 (Lnet/minecraft/class_2168;Lnet/minecraft/class_4529;)Z - ARG 1 testFunction - METHOD method_56264 find (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_9118;)Ljava/util/Optional; + METHOD method_56264 find (Lnet/minecraft/class_2338;Lnet/minecraft/class_2168;Lnet/minecraft/class_9118;)Ljava/util/Optional; ARG 0 pos - ARG 1 world ARG 2 config - METHOD method_56265 (Ljava/util/function/Function;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; - ARG 1 extraConfigAdder - METHOD method_56266 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)I - ARG 1 context - METHOD method_56267 reset (Lnet/minecraft/class_4517;)I - ARG 0 state - METHOD method_56268 testAttemptAndPlacementConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Ljava/util/function/Function;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + METHOD method_56267 reset (Lnet/minecraft/class_2168;Lnet/minecraft/class_4517;)I + METHOD method_56268 testAttemptAndPlacementConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_10618;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 builder - ARG 1 callback - METHOD method_56269 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)I - ARG 1 context METHOD method_56270 (Lnet/minecraft/class_4517;)V ARG 0 state - METHOD method_56271 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)I - ARG 1 context - METHOD method_56272 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)I - ARG 1 context - METHOD method_56273 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)I - ARG 1 context METHOD method_56274 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_56275 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_56276 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_56277 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_56278 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_56279 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_56280 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_56281 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_56282 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_56283 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_56284 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_56285 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_4527$class_9121; - ARG 0 context - METHOD method_56286 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_4527$class_9121; - ARG 0 context - METHOD method_56287 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_4527$class_9121; - ARG 0 context METHOD method_57105 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_57106 (Lnet/minecraft/class_1297;)V - ARG 0 entity - METHOD method_57963 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_57964 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_59786 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_61102 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_61103 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context CLASS class_4528 Listener - FIELD comp_2216 world Lnet/minecraft/class_3218; FIELD comp_2217 tests Lnet/minecraft/class_4524; - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_4524;)V - ARG 1 world + METHOD (Lnet/minecraft/class_2168;Lnet/minecraft/class_4524;)V ARG 2 tests - METHOD comp_2216 world ()Lnet/minecraft/class_3218; METHOD comp_2217 tests ()Lnet/minecraft/class_4524; - METHOD method_56304 onFinished (Lnet/minecraft/class_3218;Lnet/minecraft/class_4524;)V - ARG 0 world - ARG 1 tests - CLASS class_9121 Runner - FIELD field_48506 finder Lnet/minecraft/class_9123; - METHOD (Lnet/minecraft/class_9123;)V - ARG 1 finder - METHOD method_56288 reset ()I - METHOD method_56289 runOnce (I)I - ARG 1 rotationSteps - METHOD method_56290 runOnce (II)I - ARG 1 rotationSteps - ARG 2 testsPerRow - METHOD method_56292 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)I - ARG 1 pos - METHOD method_56293 (Lnet/minecraft/class_3218;Lorg/apache/commons/lang3/mutable/MutableBoolean;Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;)I - ARG 3 pos - METHOD method_56294 (Lnet/minecraft/class_2168;Ljava/lang/Integer;)V - ARG 1 count - METHOD method_56295 forEach (Ljava/util/stream/Stream;Ljava/util/function/ToIntFunction;Ljava/lang/Runnable;Ljava/util/function/Consumer;)V - ARG 1 finder - ARG 2 consumer - ARG 3 emptyCallback - ARG 4 finishCallback - METHOD method_56296 run (Lnet/minecraft/class_9118;)I - ARG 1 config - METHOD method_56297 run (Lnet/minecraft/class_9118;I)I - ARG 1 config - ARG 2 rotationSteps - METHOD method_56298 start (Lnet/minecraft/class_9118;II)I - ARG 1 config - ARG 2 rotationSteps - ARG 3 testsPerRow - METHOD method_56299 clear ()I - METHOD method_56301 (Lnet/minecraft/class_2168;Ljava/lang/Integer;)V - ARG 1 count - METHOD method_56302 export ()I - METHOD method_56303 runOnce ()I - METHOD method_59787 (Lnet/minecraft/class_2338;Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_2338;)V - ARG 3 pos - METHOD method_59788 (Ljava/lang/String;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; - ARG 1 style - METHOD method_59790 locate ()I - METHOD method_61104 verify ()I + METHOD method_56304 onFinished ()V CLASS class_9122 ReportingBatchListener diff --git a/mappings/net/minecraft/server/command/TestFinder.mapping b/mappings/net/minecraft/server/command/TestFinder.mapping index e808a2cd92..7eedf952c5 100644 --- a/mappings/net/minecraft/server/command/TestFinder.mapping +++ b/mappings/net/minecraft/server/command/TestFinder.mapping @@ -1,65 +1,33 @@ CLASS net/minecraft/class_9123 net/minecraft/server/command/TestFinder - FIELD field_48507 NOOP_TEST_FUNCTION_FINDER Lnet/minecraft/class_9125; - FIELD field_48508 NOOP_STRUCTURE_BLOCK_FINDER Lnet/minecraft/class_9119; - FIELD field_48509 testFunctionFinder Lnet/minecraft/class_9125; - FIELD field_48510 structureBlockPosFinder Lnet/minecraft/class_9119; + FIELD field_48507 NOOP_TEST_FUNCTION_FINDER Lnet/minecraft/class_10674; + FIELD field_48508 NOOP_STRUCTURE_BLOCK_FINDER Lnet/minecraft/class_10675; FIELD field_48511 commandSource Lnet/minecraft/class_2168; - FIELD field_48512 runnerFactory Ljava/util/function/Function; - METHOD (Lnet/minecraft/class_2168;Ljava/util/function/Function;Lnet/minecraft/class_9125;Lnet/minecraft/class_9119;)V + METHOD (Lnet/minecraft/class_2168;Lnet/minecraft/class_10674;Lnet/minecraft/class_10675;)V ARG 1 commandSource - ARG 2 runnerFactory - ARG 3 testFunctionFinder - ARG 4 structureBlockPosFinder METHOD method_56305 getCommandSource ()Lnet/minecraft/class_2168; - METHOD method_56306 createRunner ()Ljava/lang/Object; CLASS class_9124 Runners - FIELD field_48513 runnerFactory Ljava/util/function/Function; - FIELD field_49663 testFunctionsSupplierMapper Ljava/util/function/UnaryOperator; FIELD field_49664 structurePosSupplierMapper Ljava/util/function/UnaryOperator; - METHOD (Ljava/util/function/Function;)V - ARG 1 runnerFactory - METHOD (Ljava/util/function/Function;Ljava/util/function/UnaryOperator;Ljava/util/function/UnaryOperator;)V - ARG 1 runnerFactory + METHOD (Ljava/util/function/UnaryOperator;Ljava/util/function/UnaryOperator;)V ARG 2 testFunctionsSupplierMapper - ARG 3 structurePosSupplierMapper - METHOD method_56309 nearest (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object; + METHOD method_56309 nearest (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_9123; ARG 1 context - METHOD method_56310 surface (Lcom/mojang/brigadier/context/CommandContext;I)Ljava/lang/Object; + METHOD method_56310 surface (Lcom/mojang/brigadier/context/CommandContext;I)Lnet/minecraft/class_9123; ARG 1 context ARG 2 radius - METHOD method_56311 in (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/lang/Object; - ARG 1 context - ARG 2 testClass - METHOD method_56312 failed (Lcom/mojang/brigadier/context/CommandContext;Z)Ljava/lang/Object; + METHOD method_56312 failed (Lcom/mojang/brigadier/context/CommandContext;Z)Lnet/minecraft/class_9123; ARG 1 context ARG 2 onlyRequired - METHOD method_56317 (ZLnet/minecraft/class_4529;)Z - ARG 1 function - METHOD method_56318 allStructures (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object; - ARG 1 context - METHOD method_56319 functionNamed (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/lang/Object; + METHOD method_56318 allStructures (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_9123; ARG 1 context - ARG 2 name - METHOD method_56321 targeted (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object; + METHOD method_56321 targeted (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_9123; ARG 1 context - METHOD method_56323 allTestFunctions (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object; - ARG 1 context - METHOD method_56324 failed (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object; + METHOD method_56324 failed (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_9123; ARG 1 context METHOD method_57965 repeat (I)Lnet/minecraft/class_9123$class_9124; ARG 1 count METHOD method_57966 (ILjava/util/function/Supplier;)Ljava/util/function/Supplier; ARG 1 supplier - METHOD method_57967 createRunner (Lnet/minecraft/class_2168;Lnet/minecraft/class_9125;Lnet/minecraft/class_9119;)Ljava/lang/Object; + METHOD method_57967 createRunner (Lnet/minecraft/class_2168;Lnet/minecraft/class_10674;Lnet/minecraft/class_10675;)Lnet/minecraft/class_9123; ARG 1 source - ARG 2 testFunctionFinder - ARG 3 structureBlockFinder - METHOD method_57968 (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; - ARG 0 structurePosSupplier METHOD method_57970 repeating (I)Ljava/util/function/UnaryOperator; ARG 0 count - METHOD method_57971 (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; - ARG 0 testFunctionsSupplier - METHOD method_59792 structureNamed (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/lang/Object; - ARG 1 context - ARG 2 name diff --git a/mappings/net/minecraft/server/filter/AbstractTextFilterer.mapping b/mappings/net/minecraft/server/filter/AbstractTextFilterer.mapping index 09b1ee93e7..35e5787c70 100644 --- a/mappings/net/minecraft/server/filter/AbstractTextFilterer.mapping +++ b/mappings/net/minecraft/server/filter/AbstractTextFilterer.mapping @@ -83,8 +83,6 @@ CLASS net/minecraft/class_9847 net/minecraft/server/filter/AbstractTextFilterer METHOD method_33809 (Ljava/lang/Throwable;)Ljava/util/List; ARG 0 throwable CLASS class_5517 FailedHttpRequestException - METHOD (Ljava/lang/String;)V - ARG 1 message CLASS class_7242 MessageEncoder METHOD encode (Lcom/mojang/authlib/GameProfile;Ljava/lang/String;)Lcom/google/gson/JsonObject; ARG 1 gameProfile diff --git a/mappings/net/minecraft/test/AfterBatch.mapping b/mappings/net/minecraft/test/AfterBatch.mapping deleted file mode 100644 index 1ca672b675..0000000000 --- a/mappings/net/minecraft/test/AfterBatch.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_6300 net/minecraft/test/AfterBatch - COMMENT {@code AfterBatch} methods are ran once the batch specified has finished. - COMMENT - COMMENT

{@code AfterBatch} methods must take 1 parameter of {@link net.minecraft.server.world.ServerWorld}. - METHOD method_35930 batchId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/test/Batches.mapping b/mappings/net/minecraft/test/Batches.mapping index c5c376696d..6d23d43949 100644 --- a/mappings/net/minecraft/test/Batches.mapping +++ b/mappings/net/minecraft/test/Batches.mapping @@ -1,32 +1,14 @@ CLASS net/minecraft/class_9113 net/minecraft/test/Batches FIELD field_48467 BATCH_SIZE I METHOD method_56188 defaultBatcher ()Lnet/minecraft/class_4520$class_9116; - METHOD method_56189 (Lnet/minecraft/class_3218;Ljava/lang/String;Ljava/util/List;J)Lnet/minecraft/class_4514; - ARG 2 states - ARG 3 index - METHOD method_56190 (Lnet/minecraft/class_3218;Ljava/util/Map$Entry;)Ljava/util/stream/Stream; - ARG 1 entry - METHOD method_56191 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4529;)Lnet/minecraft/class_4517; - ARG 1 testFunction - METHOD method_56192 (Ljava/lang/String;Ljava/util/List;J)Lnet/minecraft/class_4514; + METHOD method_56192 (Lnet/minecraft/class_6880;Ljava/util/List;J)Lnet/minecraft/class_4514; ARG 1 states ARG 2 index METHOD method_56193 (ILjava/util/Collection;)Ljava/util/Collection; ARG 1 states - METHOD method_56194 createBatches (Ljava/util/Collection;Lnet/minecraft/class_3218;)Ljava/util/Collection; - ARG 0 testFunctions - ARG 1 world - METHOD method_56195 create (Ljava/util/Collection;Ljava/lang/String;J)Lnet/minecraft/class_4514; + METHOD method_56195 create (Ljava/util/Collection;Lnet/minecraft/class_6880;I)Lnet/minecraft/class_4514; ARG 0 states - ARG 1 batchId - ARG 2 index METHOD method_56196 (ILjava/util/Map$Entry;)Ljava/util/stream/Stream; ARG 1 entry - METHOD method_56197 (Lnet/minecraft/class_4517;)Ljava/lang/String; - ARG 0 state - METHOD method_56198 createState (Lnet/minecraft/class_4529;ILnet/minecraft/class_3218;)Lnet/minecraft/class_4517; - ARG 0 testFunction - ARG 1 rotationSteps - ARG 2 world METHOD method_61092 batcher (I)Lnet/minecraft/class_4520$class_9116; ARG 0 batchSize diff --git a/mappings/net/minecraft/test/BeforeBatch.mapping b/mappings/net/minecraft/test/BeforeBatch.mapping deleted file mode 100644 index c5ac4eaf46..0000000000 --- a/mappings/net/minecraft/test/BeforeBatch.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_6301 net/minecraft/test/BeforeBatch - COMMENT {@code BeforeBatch} methods are ran before the batch specified has started. - COMMENT - COMMENT

{@code BeforeBatch} methods must take 1 parameter of {@link net.minecraft.server.world.ServerWorld}. - METHOD method_35931 batchId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/test/CustomTestProvider.mapping b/mappings/net/minecraft/test/CustomTestProvider.mapping deleted file mode 100644 index 20eba85047..0000000000 --- a/mappings/net/minecraft/test/CustomTestProvider.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_6303 net/minecraft/test/CustomTestProvider - COMMENT {@code CustomTestProvider} methods return a {@code Collection}. diff --git a/mappings/net/minecraft/test/GameTest.mapping b/mappings/net/minecraft/test/GameTest.mapping deleted file mode 100644 index 6f0ec3370e..0000000000 --- a/mappings/net/minecraft/test/GameTest.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/class_6302 net/minecraft/test/GameTest - COMMENT {@code GameTest} is used to tell the test framework that the annotated method is a test. - COMMENT - COMMENT

{@code GameTest} methods must take 1 parameter of {@link net.minecraft.test.TestContext} - METHOD method_35932 tickLimit ()I - METHOD method_35933 batchId ()Ljava/lang/String; - METHOD method_35934 rotation ()I - METHOD method_35935 required ()Z - METHOD method_35936 templateName ()Ljava/lang/String; - METHOD method_35937 duration ()J - METHOD method_35938 maxAttempts ()I - METHOD method_35939 requiredSuccesses ()I - METHOD method_57098 skyAccess ()Z - METHOD method_57962 manualOnly ()Z diff --git a/mappings/net/minecraft/test/GameTestBatch.mapping b/mappings/net/minecraft/test/GameTestBatch.mapping index 7c4bc1bbee..0c37033d22 100644 --- a/mappings/net/minecraft/test/GameTestBatch.mapping +++ b/mappings/net/minecraft/test/GameTestBatch.mapping @@ -1,11 +1,5 @@ CLASS net/minecraft/class_4514 net/minecraft/test/GameTestBatch - FIELD comp_2209 id Ljava/lang/String; FIELD comp_2210 states Ljava/util/Collection; - FIELD field_33145 DEFAULT_BATCH Ljava/lang/String; - METHOD (Ljava/lang/String;Ljava/util/Collection;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V - ARG 1 id + METHOD (ILjava/util/Collection;Lnet/minecraft/class_6880;)V ARG 2 testFunctions - ARG 3 beforeBatchConsumer - ARG 4 afterBatchConsumer - METHOD comp_2209 id ()Ljava/lang/String; METHOD comp_2210 states ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/test/GameTestException.mapping b/mappings/net/minecraft/test/GameTestException.mapping index 8b5ff6215a..33de015f60 100644 --- a/mappings/net/minecraft/test/GameTestException.mapping +++ b/mappings/net/minecraft/test/GameTestException.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_4512 net/minecraft/test/GameTestException - METHOD (Ljava/lang/String;)V - ARG 1 message diff --git a/mappings/net/minecraft/test/GameTestState.mapping b/mappings/net/minecraft/test/GameTestState.mapping index 9bbc033403..607c52c7e2 100644 --- a/mappings/net/minecraft/test/GameTestState.mapping +++ b/mappings/net/minecraft/test/GameTestState.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState - FIELD field_20559 testFunction Lnet/minecraft/class_4529; - FIELD field_20560 pos Lnet/minecraft/class_2338; FIELD field_20561 world Lnet/minecraft/class_3218; FIELD field_20562 listeners Ljava/util/Collection; FIELD field_20563 tickLimit I @@ -9,18 +7,12 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState FIELD field_20569 throwable Ljava/lang/Throwable; FIELD field_21452 timedTaskRunners Ljava/util/Collection; FIELD field_21453 ticksByRunnables Lit/unimi/dsi/fastutil/objects/Object2LongMap; - FIELD field_21454 startTime J - FIELD field_21455 tick J + FIELD field_21455 tick I FIELD field_21456 stopwatch Lcom/google/common/base/Stopwatch; - FIELD field_25301 rotation Lnet/minecraft/class_2470; - FIELD field_27805 structureBlockEntity Lnet/minecraft/class_2633; - FIELD field_47172 initialDelay I FIELD field_47173 initialized Z FIELD field_47174 tickedOnce Z - FIELD field_48468 boxMinPos Lnet/minecraft/class_2338; FIELD field_48469 testAttemptConfig Lnet/minecraft/class_9118; - METHOD (Lnet/minecraft/class_4529;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_9118;)V - ARG 1 testFunction + METHOD (Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_9118;)V ARG 2 rotation ARG 3 world ARG 4 testAttemptConfig @@ -31,12 +23,9 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState ARG 1 listener METHOD method_22168 fail (Ljava/lang/Throwable;)V ARG 1 throwable - METHOD method_22169 getTemplatePath ()Ljava/lang/String; METHOD method_22171 (Lnet/minecraft/class_4520;Lnet/minecraft/class_4518;)V ARG 2 listener METHOD method_22172 getPos ()Lnet/minecraft/class_2338; - METHOD method_22175 (Lnet/minecraft/class_4518;)V - ARG 1 listener METHOD method_22176 getWorld ()Lnet/minecraft/class_3218; METHOD method_22177 isPassed ()Z METHOD method_22178 isFailed ()Z @@ -47,45 +36,34 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState METHOD method_22184 isOptional ()Z METHOD method_23634 startCountdown (I)Lnet/minecraft/class_4517; ARG 1 additionalExpectedStopTime - METHOD method_23635 setPos (Lnet/minecraft/class_2338;)V - ARG 1 pos METHOD method_23636 (Lnet/minecraft/class_4693;)V ARG 1 runner METHOD method_23637 (Lnet/minecraft/class_4693;)V ARG 1 runner - METHOD method_23638 getTemplateName ()Ljava/lang/String; METHOD method_23639 start ()V METHOD method_23640 complete ()V METHOD method_29402 getRotation ()Lnet/minecraft/class_2470; - METHOD method_29403 getTestFunction ()Lnet/minecraft/class_4529; METHOD method_32241 isFlaky ()Z METHOD method_32242 getMaxAttempts ()I METHOD method_32243 getRequiredSuccesses ()I METHOD method_33315 tickTests ()V METHOD method_33316 (Lnet/minecraft/class_4520;Lnet/minecraft/class_4518;)V ARG 2 listener - METHOD method_36059 getStructureBlockBlockEntity ()Lnet/minecraft/class_2633; METHOD method_36060 runAtTick (JLjava/lang/Runnable;)V ARG 1 tick ARG 3 runnable METHOD method_36062 getBoundingBox ()Lnet/minecraft/class_238; METHOD method_36063 getElapsedMilliseconds ()J METHOD method_36064 completeIfSuccessful ()V - METHOD method_36065 getTick ()J + METHOD method_36065 getTick ()I METHOD method_36066 createTimedTaskRunner ()Lnet/minecraft/class_4693; METHOD method_36067 getTickLimit ()I METHOD method_54434 (Lnet/minecraft/class_1297;)V ARG 0 entity METHOD method_54435 (Lnet/minecraft/class_1297;)Z ARG 0 entity - METHOD method_54900 (Lnet/minecraft/class_1923;)Z - ARG 1 chunkPos METHOD method_56209 streamListeners ()Ljava/util/stream/Stream; METHOD method_56210 copy ()Lnet/minecraft/class_4517; - METHOD method_56211 initialize ()Z - METHOD method_56212 getBoxMinPos ()Lnet/minecraft/class_2338; - METHOD method_56213 initializeImmediately ()Lnet/minecraft/class_4517; - METHOD method_56214 setBoxMinPos (Lnet/minecraft/class_2338;)V - ARG 1 boxMinPos + METHOD method_56213 initializeImmediately ()V METHOD method_56215 getTestAttemptConfig ()Lnet/minecraft/class_9118; METHOD method_64385 getOrigin ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/test/PositionedException.mapping b/mappings/net/minecraft/test/PositionedException.mapping index d9fea0911d..72577cb4f4 100644 --- a/mappings/net/minecraft/test/PositionedException.mapping +++ b/mappings/net/minecraft/test/PositionedException.mapping @@ -1,12 +1,9 @@ CLASS net/minecraft/class_4513 net/minecraft/test/PositionedException FIELD field_20541 pos Lnet/minecraft/class_2338; FIELD field_20542 relativePos Lnet/minecraft/class_2338; - FIELD field_21449 tick J - METHOD (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;J)V - ARG 1 message + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;I)V ARG 2 pos ARG 3 relativePos - ARG 4 tick METHOD method_22150 getDebugMessage ()Ljava/lang/String; METHOD method_22151 getPos ()Lnet/minecraft/class_2338; METHOD method_35940 getRelativePos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/test/StructureBlockFinder.mapping b/mappings/net/minecraft/test/StructureBlockFinder.mapping deleted file mode 100644 index 3f65fa11f6..0000000000 --- a/mappings/net/minecraft/test/StructureBlockFinder.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_9119 net/minecraft/test/StructureBlockFinder diff --git a/mappings/net/minecraft/test/StructureTestListener.mapping b/mappings/net/minecraft/test/StructureTestListener.mapping index a40041c1dc..f44beab3dd 100644 --- a/mappings/net/minecraft/test/StructureTestListener.mapping +++ b/mappings/net/minecraft/test/StructureTestListener.mapping @@ -13,24 +13,12 @@ CLASS net/minecraft/class_5624 net/minecraft/test/StructureTestListener ARG 0 player METHOD method_32250 (Ljava/lang/String;Lnet/minecraft/class_124;Lnet/minecraft/class_3222;)V ARG 2 player - METHOD method_32251 createBookWithText (Ljava/lang/String;ZLjava/lang/String;)Lnet/minecraft/class_1799; - ARG 0 text - ARG 1 required - ARG 2 output - METHOD method_32252 (Ljava/lang/StringBuffer;Ljava/lang/String;)V - ARG 1 line - METHOD method_32253 visualizeTest (Lnet/minecraft/class_4517;Lnet/minecraft/class_2248;)V - ARG 0 test - ARG 1 block METHOD method_32254 failTest (Lnet/minecraft/class_4517;Ljava/lang/Throwable;)V ARG 0 test ARG 1 output METHOD method_32255 finishFailedTest (Lnet/minecraft/class_4517;Ljava/lang/Throwable;)V ARG 0 test ARG 1 output - METHOD method_32256 createTestOutputLectern (Lnet/minecraft/class_4517;Ljava/lang/String;)V - ARG 0 test - ARG 1 output METHOD method_33320 passTest (Lnet/minecraft/class_4517;Ljava/lang/String;)V ARG 0 test ARG 1 output @@ -41,8 +29,3 @@ CLASS net/minecraft/class_5624 net/minecraft/test/StructureTestListener ARG 1 state ARG 2 context ARG 3 lastPassed - METHOD method_61099 getBeaconPos (Lnet/minecraft/class_4517;)Lnet/minecraft/class_2338; - ARG 0 state - METHOD method_61100 placeAboveBeacon (Lnet/minecraft/class_4517;Lnet/minecraft/class_2248;)V - ARG 0 state - ARG 1 block diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 2f978f7601..833e0f1c24 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -1,17 +1,12 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil - FIELD field_20579 testStructuresDirectoryName Ljava/lang/String; - FIELD field_27813 LOGGER Lorg/slf4j/Logger; + FIELD field_20579 testStructuresDirectoryName Ljava/nio/file/Path; FIELD field_33173 TEST_STRUCTURES_DIRECTORY_NAME Ljava/lang/String; METHOD method_22241 (Lnet/minecraft/class_1297;)Z ARG 0 entity - METHOD method_22242 getStructureBoundingBox (Lnet/minecraft/class_2633;)Lnet/minecraft/class_238; - ARG 0 structureBlockEntity METHOD method_22244 findContainingStructureBlock (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/Optional; ARG 0 pos ARG 1 radius ARG 2 world - METHOD method_22245 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)I - ARG 1 posx METHOD method_22246 clearArea (Lnet/minecraft/class_3341;Lnet/minecraft/class_3218;)V ARG 0 area ARG 1 world @@ -19,33 +14,12 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 structureBlockPos ARG 1 pos ARG 2 world - METHOD method_22248 placeStartButton (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V - ARG 0 pos - ARG 1 relativePos - ARG 2 rotation - ARG 3 world - METHOD method_22249 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z - ARG 2 structureBlockPos - METHOD method_22251 createTestArea (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V - ARG 0 testName - ARG 1 pos - ARG 2 relativePos - ARG 3 rotation - ARG 4 world - METHOD method_22252 placeStructureTemplate (Lnet/minecraft/class_4517;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)Lnet/minecraft/class_2633; - ARG 0 state - ARG 1 pos - ARG 2 rotation - ARG 3 world METHOD method_22254 (ILnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 2 pos METHOD method_22255 findNearestStructureBlock (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/Optional; ARG 0 pos ARG 1 radius ARG 2 world - METHOD method_22256 forceLoadNearbyChunks (Lnet/minecraft/class_3341;Lnet/minecraft/class_3218;)V - ARG 0 box - ARG 1 world METHOD method_22258 findStructureBlocks (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/stream/Stream; ARG 0 pos ARG 1 radius @@ -60,59 +34,17 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 pos ARG 1 relativePos ARG 2 rotation - METHOD method_29410 getStructureBlockBox (Lnet/minecraft/class_2633;)Lnet/minecraft/class_3341; - ARG 0 structureBlockEntity METHOD method_36105 getRotationSteps (Lnet/minecraft/class_2470;)I ARG 0 rotation - METHOD method_54845 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z - ARG 1 p METHOD method_54847 getStructureBlockBoxCornerPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; ARG 0 pos ARG 1 size ARG 2 rotation - METHOD method_54849 getOrigin (Lnet/minecraft/class_2633;)Lnet/minecraft/class_2338; - ARG 0 structureBlockEntity - METHOD method_54901 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;)V - ARG 1 chunkPos - METHOD method_54903 initStructure (Lnet/minecraft/class_4517;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)Lnet/minecraft/class_2633; - ARG 0 state - ARG 1 pos - ARG 2 rotation - ARG 3 world - METHOD method_56250 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Ljava/util/Optional; - ARG 1 p - METHOD method_56251 (Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_2633;)Z - ARG 2 blockEntity METHOD method_56252 findTargetedStructureBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;)Ljava/util/stream/Stream; ARG 0 pos ARG 1 entity ARG 2 world - METHOD method_57101 clearBarrierBox (Lnet/minecraft/class_238;Lnet/minecraft/class_3218;)V - ARG 0 box - ARG 1 world - METHOD method_57102 placeBarrierBox (Lnet/minecraft/class_238;Lnet/minecraft/class_3218;Z)V - ARG 0 box - ARG 1 world - ARG 2 noSkyAccess - METHOD method_57103 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V - ARG 3 pos - METHOD method_57104 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V - ARG 4 pos - METHOD method_59782 findStructureBlocks (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;Ljava/lang/String;)Ljava/util/stream/Stream; - ARG 0 pos - ARG 1 radius - ARG 2 world - ARG 3 templateName - METHOD method_59783 (Ljava/lang/String;Lnet/minecraft/class_2633;)Z - ARG 1 blockEntity - METHOD method_59784 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2633; - ARG 1 posx METHOD method_59785 createBox (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Lnet/minecraft/class_3341; ARG 0 pos ARG 1 radius ARG 2 world - METHOD method_62774 getPlacementPos (Lnet/minecraft/class_4517;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)Lnet/minecraft/class_2338; - ARG 0 state - ARG 1 pos - ARG 2 rotation - ARG 3 world diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index 942e4b6f9e..dc444151e5 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -41,17 +41,12 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_35954 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z ARG 1 e METHOD method_35955 expectEntityAt (Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;)V - ARG 1 entity - ARG 2 pos - METHOD method_35957 testEntityProperty (Lnet/minecraft/class_1297;Ljava/util/function/Function;Ljava/lang/String;Ljava/lang/Object;)V + METHOD method_35957 testEntityProperty (Lnet/minecraft/class_1297;Ljava/util/function/Function;Ljava/lang/Object;Lnet/minecraft/class_2561;)V ARG 1 entity ARG 2 propertyGetter - ARG 3 propertyName - ARG 4 expectedValue - METHOD method_35958 testEntity (Lnet/minecraft/class_1297;Ljava/util/function/Predicate;Ljava/lang/String;)V + METHOD method_35958 testEntity (Lnet/minecraft/class_1297;Ljava/util/function/Predicate;Lnet/minecraft/class_2561;)V ARG 1 entity ARG 2 predicate - ARG 3 testName METHOD method_35959 expectEntity (Lnet/minecraft/class_1299;)V ARG 1 type METHOD method_35960 expectEntityToTouch (Lnet/minecraft/class_1299;DDD)V @@ -107,8 +102,6 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_35972 expectBlock (Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;)V ARG 1 block ARG 2 pos - METHOD method_35973 (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_35974 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Z ARG 2 block1 METHOD method_35977 expectSameStates (Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;)V @@ -142,37 +135,26 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_35987 expectBlockProperty (Lnet/minecraft/class_2338;Lnet/minecraft/class_2769;Ljava/lang/Comparable;)V ARG 1 pos ARG 2 property - ARG 3 value - METHOD method_35988 checkBlockProperty (Lnet/minecraft/class_2338;Lnet/minecraft/class_2769;Ljava/util/function/Predicate;Ljava/lang/String;)V + METHOD method_35988 checkBlockProperty (Lnet/minecraft/class_2338;Lnet/minecraft/class_2769;Ljava/util/function/Predicate;Lnet/minecraft/class_2561;)V ARG 1 pos ARG 2 property ARG 3 predicate - ARG 4 errorMessage METHOD method_35989 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;)V ARG 3 checkedPos METHOD method_35990 expectSameStates (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)V ARG 1 checkedPos ARG 2 correctStatePos - METHOD method_35991 checkBlock (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;Ljava/lang/String;)V + METHOD method_35992 checkBlock (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;Ljava/util/function/Function;)V ARG 1 pos ARG 2 predicate - ARG 3 errorMessage - METHOD method_35992 checkBlock (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;Ljava/util/function/Supplier;)V - ARG 1 pos - ARG 2 predicate - ARG 3 errorMessageSupplier METHOD method_35993 addFinalTask (Ljava/lang/Runnable;)V ARG 1 runnable METHOD method_35994 (Ljava/lang/Runnable;J)V ARG 2 tick - METHOD method_35995 throwGameTestException (Ljava/lang/String;)V - ARG 1 message - METHOD method_35996 throwPositionedException (Ljava/lang/String;Lnet/minecraft/class_1297;)V - ARG 1 message + METHOD method_35995 throwGameTestException (Lnet/minecraft/class_2561;)V + METHOD method_35996 throwPositionedException (Lnet/minecraft/class_2561;Lnet/minecraft/class_1297;)V ARG 2 entity - METHOD method_35997 throwPositionedException (Ljava/lang/String;Lnet/minecraft/class_2338;)V - ARG 1 message - ARG 2 pos + METHOD method_35997 throwPositionedException (Lnet/minecraft/class_2561;Lnet/minecraft/class_2338;)V METHOD method_35998 forEachRelativePos (Ljava/util/function/Consumer;)V ARG 1 posConsumer METHOD method_35999 (Ljava/util/function/Predicate;Lnet/minecraft/class_2680;)Z @@ -220,17 +202,15 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 2 pos METHOD method_36013 (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z ARG 1 entity - METHOD method_36014 getBlockEntity (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2586; + METHOD method_36014 getBlockEntity (Lnet/minecraft/class_2338;Ljava/lang/Class;)Lnet/minecraft/class_2586; ARG 1 pos METHOD method_36015 expectEntityWithDataEnd (Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;Ljava/util/function/Function;Ljava/lang/Object;)V ARG 1 pos ARG 2 type ARG 3 entityDataGetter ARG 4 data - METHOD method_36017 checkBlockState (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;Ljava/util/function/Supplier;)V - ARG 1 pos + METHOD method_36017 checkBlockState (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;Ljava/util/function/Function;)V ARG 2 predicate - ARG 3 errorMessageSupplier METHOD method_36018 addInstantFinalTask (Ljava/lang/Runnable;)V ARG 1 runnable METHOD method_36019 (Ljava/lang/Runnable;J)V @@ -325,14 +305,12 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 3 amount ARG 4 radius METHOD method_46224 expectEntityInside (Lnet/minecraft/class_1299;Lnet/minecraft/class_238;)V - ARG 1 type ARG 2 box METHOD method_46225 spawnItem (Lnet/minecraft/class_1792;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1542; ARG 1 item ARG 2 pos - METHOD method_46226 assertTrue (ZLjava/lang/String;)V + METHOD method_46226 assertTrue (ZLnet/minecraft/class_2561;)V ARG 1 condition - ARG 2 message METHOD method_46227 getRelative (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 1 pos METHOD method_46229 useBlock (Lnet/minecraft/class_2338;)V @@ -358,9 +336,8 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 1 pos ARG 2 entityType ARG 3 item - METHOD method_49994 assertFalse (ZLjava/lang/String;)V + METHOD method_49994 assertFalse (ZLnet/minecraft/class_2561;)V ARG 1 condition - ARG 2 message METHOD method_51821 setHealthLow (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1309; ARG 1 entity METHOD method_51891 createMockCreativeServerPlayerInWorld ()Lnet/minecraft/class_3222; @@ -372,7 +349,6 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 1 pos ARG 2 direction ARG 3 powerPredicate - ARG 4 errorMessage METHOD method_52889 expectEntityHasEffect (Lnet/minecraft/class_1309;Lnet/minecraft/class_6880;I)V ARG 1 entity ARG 2 effect @@ -414,10 +390,9 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 5 margin METHOD method_56208 getEntities (Lnet/minecraft/class_1299;)Ljava/util/List; ARG 1 type - METHOD method_56606 assertEquals (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V + METHOD method_56606 assertEquals (Ljava/lang/Object;Ljava/lang/Object;Lnet/minecraft/class_2561;)V ARG 1 value ARG 2 expected - ARG 3 name METHOD method_57099 setEntityPos (Lnet/minecraft/class_1308;FFF)V ARG 1 entity ARG 2 x @@ -429,15 +404,11 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_59872 dontExpectEntityBetween (Lnet/minecraft/class_1299;Lnet/minecraft/class_238;)V ARG 1 type ARG 2 box - METHOD method_60651 checkBlockEntity (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;Ljava/util/function/Supplier;)V - ARG 1 pos - ARG 2 predicate - ARG 3 errorMessageSupplier + METHOD method_60651 checkBlockEntity (Lnet/minecraft/class_2338;Ljava/lang/Class;Ljava/util/function/Predicate;Ljava/util/function/Supplier;)V METHOD method_61093 getRotation ()Lnet/minecraft/class_2470; - METHOD method_61173 expectEntityIn (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/lang/String;)V + METHOD method_61173 expectEntityIn (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Lnet/minecraft/class_2561;)V ARG 1 entity ARG 2 box - ARG 3 message METHOD method_62772 getAbsolute (Lnet/minecraft/class_238;)Lnet/minecraft/class_238; ARG 1 box METHOD method_62773 getRelative (Lnet/minecraft/class_238;)Lnet/minecraft/class_238; diff --git a/mappings/net/minecraft/test/TestFunction.mapping b/mappings/net/minecraft/test/TestFunction.mapping deleted file mode 100644 index 01de9d0fbe..0000000000 --- a/mappings/net/minecraft/test/TestFunction.mapping +++ /dev/null @@ -1,49 +0,0 @@ -CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction - FIELD comp_2218 batchId Ljava/lang/String; - FIELD comp_2219 templatePath Ljava/lang/String; - FIELD comp_2220 templateName Ljava/lang/String; - FIELD comp_2222 tickLimit I - FIELD comp_2227 starter Ljava/util/function/Consumer; - METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IJZLjava/util/function/Consumer;)V - ARG 1 batchId - ARG 2 templatePath - ARG 3 templateName - ARG 4 tickLimit - ARG 5 duration - ARG 7 required - ARG 8 starter - METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2470;IJZLjava/util/function/Consumer;)V - ARG 1 batchId - ARG 2 templatePath - ARG 3 templateName - ARG 4 rotation - ARG 5 tickLimit - ARG 6 setupTicks - ARG 8 required - ARG 9 starter - METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2470;IJZZIIZLjava/util/function/Consumer;)V - ARG 1 batchId - ARG 2 templatePath - ARG 3 templateName - ARG 4 rotation - ARG 5 tickLimit - ARG 6 duration - ARG 8 required - METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2470;IJZZLjava/util/function/Consumer;)V - ARG 1 batchId - ARG 2 templatePath - ARG 3 templateName - ARG 4 rotation - ARG 5 tickLimit - ARG 6 setupTicks - ARG 8 required - ARG 9 skyAccess - ARG 10 starter - METHOD comp_2218 batchId ()Ljava/lang/String; - METHOD comp_2219 templatePath ()Ljava/lang/String; - METHOD comp_2220 templateName ()Ljava/lang/String; - METHOD comp_2222 tickLimit ()I - METHOD comp_2227 starter ()Ljava/util/function/Consumer; - METHOD method_22297 start (Lnet/minecraft/class_4516;)V - ARG 1 context - METHOD method_32257 isFlaky ()Z diff --git a/mappings/net/minecraft/test/TestFunctionFinder.mapping b/mappings/net/minecraft/test/TestFunctionFinder.mapping deleted file mode 100644 index f28dcd5022..0000000000 --- a/mappings/net/minecraft/test/TestFunctionFinder.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_9125 net/minecraft/test/TestFunctionFinder diff --git a/mappings/net/minecraft/test/TestFunctions.mapping b/mappings/net/minecraft/test/TestFunctions.mapping deleted file mode 100644 index a867e213e1..0000000000 --- a/mappings/net/minecraft/test/TestFunctions.mapping +++ /dev/null @@ -1,52 +0,0 @@ -CLASS net/minecraft/class_4519 net/minecraft/test/TestFunctions - FIELD field_20570 TEST_FUNCTIONS Ljava/util/Collection; - FIELD field_20571 TEST_CLASSES Ljava/util/Set; - FIELD field_20572 BEFORE_BATCH_CONSUMERS Ljava/util/Map; - FIELD field_25302 FAILED_TEST_FUNCTIONS Ljava/util/Set; - FIELD field_27806 AFTER_BATCH_CONSUMERS Ljava/util/Map; - METHOD method_22191 getTestFunctions ()Ljava/util/Collection; - METHOD method_22192 isInClass (Lnet/minecraft/class_4529;Ljava/lang/String;)Z - ARG 0 testFunction - ARG 1 testClass - METHOD method_22193 getTestFunctions (Ljava/lang/String;)Ljava/util/stream/Stream; - ARG 0 testClass - METHOD method_22194 (Ljava/lang/String;Lnet/minecraft/class_4529;)Z - ARG 1 testFunction - METHOD method_22195 getTestClasses ()Ljava/util/Collection; - METHOD method_22196 testClassExists (Ljava/lang/String;)Z - ARG 0 testClass - METHOD method_22197 (Ljava/lang/String;Lnet/minecraft/class_4529;)Z - ARG 1 testFunction - METHOD method_22198 getBeforeBatchConsumer (Ljava/lang/String;)Ljava/util/function/Consumer; - ARG 0 batchId - METHOD method_22199 getTestFunction (Ljava/lang/String;)Ljava/util/Optional; - ARG 0 structurePath - METHOD method_22200 getTestFunctionOrThrow (Ljava/lang/String;)Lnet/minecraft/class_4529; - ARG 0 structurePath - METHOD method_29404 addFailedTestFunction (Lnet/minecraft/class_4529;)V - ARG 0 testFunction - METHOD method_29405 getFailedTestFunctions ()Ljava/util/stream/Stream; - METHOD method_29406 clearFailedTestFunctions ()V - METHOD method_32244 getAfterBatchConsumer (Ljava/lang/String;)Ljava/util/function/Consumer; - ARG 0 batchId - METHOD method_36068 register (Ljava/lang/Class;)V - ARG 0 testClass - METHOD method_36069 register (Ljava/lang/reflect/Method;)V - ARG 0 method - METHOD method_36070 registerBatchConsumers (Ljava/lang/reflect/Method;Ljava/lang/Class;Ljava/util/function/Function;Ljava/util/Map;)V - ARG 0 method - ARG 1 clazz - ARG 2 batchIdFunction - ARG 3 batchConsumerMap - METHOD method_36071 (Ljava/lang/reflect/Method;Ljava/lang/Object;)V - ARG 1 args - METHOD method_36072 getCustomTestFunctions (Ljava/lang/reflect/Method;)Ljava/util/Collection; - ARG 0 method - METHOD method_36073 getTestFunction (Ljava/lang/reflect/Method;)Lnet/minecraft/class_4529; - ARG 0 method - METHOD method_36074 getInvoker (Ljava/lang/reflect/Method;)Ljava/util/function/Consumer; - ARG 0 method - METHOD method_56217 (Lnet/minecraft/class_3218;)V - ARG 0 world - METHOD method_56218 (Lnet/minecraft/class_3218;)V - ARG 0 world diff --git a/mappings/net/minecraft/test/TestRunContext.mapping b/mappings/net/minecraft/test/TestRunContext.mapping index 0dd6ce1e3f..5953ceb377 100644 --- a/mappings/net/minecraft/test/TestRunContext.mapping +++ b/mappings/net/minecraft/test/TestRunContext.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestRunContext FIELD field_48476 toBeRetried Ljava/util/List; FIELD field_48477 batcher Lnet/minecraft/class_4520$class_9116; FIELD field_48478 stopped Z - FIELD field_48479 currentBatch Lnet/minecraft/class_4514; FIELD field_48480 reuseSpawner Lnet/minecraft/class_4520$class_9117; FIELD field_48481 initialSpawner Lnet/minecraft/class_4520$class_9117; FIELD field_52279 stopAfterFailure Z @@ -37,7 +36,7 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestRunContext METHOD method_56225 (Lnet/minecraft/class_4517;Lnet/minecraft/class_4517;Lnet/minecraft/class_4518;)V ARG 3 listener METHOD method_56226 start ()V - METHOD method_56227 (Lnet/minecraft/class_9114;)V + METHOD method_56227 (Lnet/minecraft/class_4514;Lnet/minecraft/class_9114;)V ARG 1 listener METHOD method_56228 prepareStructure (Lnet/minecraft/class_4517;)Ljava/util/Optional; ARG 1 oldState @@ -51,7 +50,7 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestRunContext METHOD method_56232 onFinished ()V METHOD method_56233 (J)V ARG 1 chunkPos - METHOD method_56234 (Lnet/minecraft/class_9114;)V + METHOD method_56234 (Lnet/minecraft/class_4514;Lnet/minecraft/class_9114;)V ARG 1 listener METHOD method_61094 (J)V ARG 1 chunkPos diff --git a/mappings/net/minecraft/test/TestServer.mapping b/mappings/net/minecraft/test/TestServer.mapping index 60abf491d4..4e525d9003 100644 --- a/mappings/net/minecraft/test/TestServer.mapping +++ b/mappings/net/minecraft/test/TestServer.mapping @@ -2,25 +2,18 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer FIELD field_33156 LOGGER Lorg/slf4j/Logger; FIELD field_33157 RESULT_STRING_LOG_INTERVAL I FIELD field_33158 batches Ljava/util/List; - FIELD field_33159 pos Lnet/minecraft/class_2338; - FIELD field_33160 GAME_RULES Lnet/minecraft/class_1928; FIELD field_33161 TEST_LEVEL Lnet/minecraft/class_5285; FIELD field_33162 testSet Lnet/minecraft/class_4524; FIELD field_39441 NONE_API_SERVICES Lnet/minecraft/class_7497; FIELD field_47175 TEST_POS_XZ_RANGE I - FIELD field_48493 testFunctions Ljava/util/List; FIELD field_48494 stopwatch Lcom/google/common/base/Stopwatch; FIELD field_48984 debugSampleLog Lnet/minecraft/class_9191; FIELD field_53734 ENABLED_FEATURES Lnet/minecraft/class_7699; - METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/util/Collection;Lnet/minecraft/class_2338;)V + METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/util/Optional;Z)V ARG 1 serverThread ARG 2 session ARG 3 dataPackManager ARG 4 saveLoader - ARG 5 testFunctions - ARG 6 pos - METHOD method_36094 (Lnet/minecraft/class_1928;)V - ARG 0 gameRules METHOD method_36095 (Lnet/minecraft/class_4517;)V ARG 0 test METHOD method_36096 runTestBatches (Lnet/minecraft/class_3218;)V @@ -30,11 +23,9 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer METHOD method_36098 isTesting ()Z METHOD method_40377 (Lnet/minecraft/class_1940;Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661; ARG 1 context - METHOD method_40378 create (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Ljava/util/Collection;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6306; + METHOD method_40378 create (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Ljava/util/Optional;Z)Lnet/minecraft/class_6306; ARG 0 thread ARG 1 session ARG 2 resourcePackManager - ARG 3 batches - ARG 4 pos METHOD method_43615 (Lnet/minecraft/class_7237$class_6906;Lnet/minecraft/class_1940;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 2 executor diff --git a/mappings/net/minecraft/test/TickLimitExceededException.mapping b/mappings/net/minecraft/test/TickLimitExceededException.mapping index 225451119d..183a174298 100644 --- a/mappings/net/minecraft/test/TickLimitExceededException.mapping +++ b/mappings/net/minecraft/test/TickLimitExceededException.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_4522 net/minecraft/test/TickLimitExceededException - METHOD (Ljava/lang/String;)V - ARG 1 message diff --git a/mappings/net/minecraft/test/TimedTaskRunner.mapping b/mappings/net/minecraft/test/TimedTaskRunner.mapping index 731971d64a..91177cb80a 100644 --- a/mappings/net/minecraft/test/TimedTaskRunner.mapping +++ b/mappings/net/minecraft/test/TimedTaskRunner.mapping @@ -1,15 +1,12 @@ CLASS net/minecraft/class_4693 net/minecraft/test/TimedTaskRunner FIELD field_21457 test Lnet/minecraft/class_4517; FIELD field_21458 tasks Ljava/util/List; - FIELD field_21459 tick J + FIELD field_21459 tick I METHOD (Lnet/minecraft/class_4517;)V ARG 1 gameTest - METHOD method_23643 runSilently (J)V - ARG 1 tick - METHOD method_23644 runReported (J)V - ARG 1 tick - METHOD method_23645 runTasks (J)V - ARG 1 tick + METHOD method_23643 runSilently (I)V + METHOD method_23644 runReported (I)V + METHOD method_23645 runTasks (I)V METHOD method_36075 completeIfSuccessful ()V METHOD method_36076 expectMinDuration (I)Lnet/minecraft/class_4693; ARG 1 minDuration @@ -32,8 +29,7 @@ CLASS net/minecraft/class_4693 net/minecraft/test/TimedTaskRunner METHOD method_36089 tryRun (Ljava/lang/Runnable;)V ARG 1 task CLASS class_6304 Trigger - FIELD field_33154 UNTRIGGERED_TICK J - FIELD field_33155 triggeredTick J + FIELD field_33154 UNTRIGGERED_TICK I + FIELD field_33155 triggeredTick I METHOD method_36092 checkTrigger ()V - METHOD method_36093 trigger (J)V - ARG 1 tick + METHOD method_36093 trigger (I)V diff --git a/mappings/net/minecraft/util/BlockRotation.mapping b/mappings/net/minecraft/util/BlockRotation.mapping index fcd7169345..5bd2db08b3 100644 --- a/mappings/net/minecraft/util/BlockRotation.mapping +++ b/mappings/net/minecraft/util/BlockRotation.mapping @@ -2,9 +2,6 @@ CLASS net/minecraft/class_2470 net/minecraft/util/BlockRotation FIELD field_23264 directionTransformation Lnet/minecraft/class_4990; FIELD field_39313 CODEC Lcom/mojang/serialization/Codec; FIELD field_39314 id Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_4990;)V - ARG 3 id - ARG 4 directionTransformation METHOD method_10501 rotate (Lnet/minecraft/class_2470;)Lnet/minecraft/class_2470; ARG 1 rotation METHOD method_10502 rotate (II)I diff --git a/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping b/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping index a6e248f2c4..fdcaa2b75d 100644 --- a/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping +++ b/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_2973 net/minecraft/util/InvalidHierarchicalFileExcepti COMMENT the invalid element in a hierarchical tree structure (such as JSON). FIELD field_13371 invalidFiles Ljava/util/List; FIELD field_13372 message Ljava/lang/String; - METHOD (Ljava/lang/String;)V - ARG 1 message METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 cause diff --git a/mappings/net/minecraft/util/InvalidIdentifierException.mapping b/mappings/net/minecraft/util/InvalidIdentifierException.mapping index 83dc7114f5..40ccbf5e94 100644 --- a/mappings/net/minecraft/util/InvalidIdentifierException.mapping +++ b/mappings/net/minecraft/util/InvalidIdentifierException.mapping @@ -2,7 +2,5 @@ CLASS net/minecraft/class_151 net/minecraft/util/InvalidIdentifierException COMMENT An exception thrown when parsing or constructing an {@link Identifier} COMMENT that contains an invalid character. This should not be caught, instead COMMENT {@link Identifier#tryParse} or {@link Identifier#of} should be used. - METHOD (Ljava/lang/String;)V - ARG 1 message METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message diff --git a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping index cc9dfed465..205b25cb3b 100644 --- a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping +++ b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping @@ -32,5 +32,3 @@ CLASS net/minecraft/class_3508 net/minecraft/util/collection/PackedIntegerArray METHOD method_27284 getStorageIndex (I)I ARG 1 index CLASS class_6685 InvalidLengthException - METHOD (Ljava/lang/String;)V - ARG 1 message diff --git a/mappings/net/minecraft/util/collection/Weighted.mapping b/mappings/net/minecraft/util/collection/Weighted.mapping index 201a1bdb1f..5c652407f4 100644 --- a/mappings/net/minecraft/util/collection/Weighted.mapping +++ b/mappings/net/minecraft/util/collection/Weighted.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_6010 net/minecraft/util/collection/Weighted COMMENT A data value with an associated weight. Weighted values are used in COMMENT {@linkplain Pool pools}. FIELD field_55645 LOGGER Lorg/slf4j/Logger; - METHOD (Ljava/lang/Object;I)V METHOD method_34981 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 dataCodec METHOD method_66211 createCodec (Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index bc2f43cccc..751d4e692e 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -119,10 +119,6 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 2 maxUses ARG 3 experience ARG 4 map - METHOD method_19201 (Lnet/minecraft/class_3854;)V - ARG 0 villagerType - METHOD method_19202 (Ljava/util/Map;Lnet/minecraft/class_3854;)Z - ARG 1 villagerType CLASS class_4163 SellEnchantedToolFactory FIELD field_18558 tool Lnet/minecraft/class_1799; FIELD field_18559 basePrice I @@ -282,11 +278,6 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers CLASS class_8640 TypedWrapperFactory FIELD comp_1962 typeToFactory Ljava/util/Map; METHOD comp_1962 typeToFactory ()Ljava/util/Map; - METHOD method_53833 (Lnet/minecraft/class_3853$class_1652;Lnet/minecraft/class_3854;)Lnet/minecraft/class_3853$class_1652; - ARG 1 type - METHOD method_53834 of (Lnet/minecraft/class_3853$class_1652;[Lnet/minecraft/class_3854;)Lnet/minecraft/class_3853$class_8640; + METHOD method_53834 of (Lnet/minecraft/class_3853$class_1652;[Lnet/minecraft/class_5321;)Lnet/minecraft/class_3853$class_8640; ARG 0 factory - ARG 1 types - METHOD method_53835 (Lnet/minecraft/class_3854;)Lnet/minecraft/class_3854; - ARG 0 type CLASS class_8793 EmptyFactory diff --git a/mappings/net/minecraft/village/VillagerData.mapping b/mappings/net/minecraft/village/VillagerData.mapping index a355a6e9b0..93bd5bd7bc 100644 --- a/mappings/net/minecraft/village/VillagerData.mapping +++ b/mappings/net/minecraft/village/VillagerData.mapping @@ -1,25 +1,21 @@ CLASS net/minecraft/class_3850 net/minecraft/village/VillagerData - FIELD field_17048 type Lnet/minecraft/class_3854; - FIELD field_17049 profession Lnet/minecraft/class_3852; - FIELD field_17050 level I + FIELD comp_3520 type Lnet/minecraft/class_6880; + FIELD comp_3521 profession Lnet/minecraft/class_6880; + FIELD comp_3522 level I FIELD field_18540 LEVEL_BASE_EXPERIENCE [I FIELD field_24669 CODEC Lcom/mojang/serialization/Codec; FIELD field_30613 MIN_LEVEL I FIELD field_30614 MAX_LEVEL I FIELD field_48345 PACKET_CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_3854;Lnet/minecraft/class_3852;I)V - ARG 1 type - ARG 2 profession + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;I)V ARG 3 level - METHOD method_16919 getType ()Lnet/minecraft/class_3854; + METHOD comp_3520 type ()Lnet/minecraft/class_6880; + METHOD comp_3521 profession ()Lnet/minecraft/class_6880; + METHOD comp_3522 level ()I METHOD method_16920 withLevel (I)Lnet/minecraft/class_3850; ARG 1 level - METHOD method_16921 withProfession (Lnet/minecraft/class_3852;)Lnet/minecraft/class_3850; - ARG 1 profession - METHOD method_16922 withType (Lnet/minecraft/class_3854;)Lnet/minecraft/class_3850; - ARG 1 type - METHOD method_16924 getProfession ()Lnet/minecraft/class_3852; - METHOD method_16925 getLevel ()I + METHOD method_16921 withProfession (Lnet/minecraft/class_6880;)Lnet/minecraft/class_3850; + METHOD method_16922 withType (Lnet/minecraft/class_6880;)Lnet/minecraft/class_3850; METHOD method_19194 getLowerLevelExperience (I)I ARG 0 level METHOD method_19195 getUpperLevelExperience (I)I @@ -30,13 +26,7 @@ CLASS net/minecraft/class_3850 net/minecraft/village/VillagerData ARG 0 data METHOD method_28372 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_28373 (Lnet/minecraft/class_3850;)Lnet/minecraft/class_3852; + METHOD method_28373 (Lnet/minecraft/class_3850;)Lnet/minecraft/class_6880; ARG 0 data - METHOD method_28374 (Lnet/minecraft/class_3850;)Lnet/minecraft/class_3854; - ARG 0 data - METHOD method_56089 (Lnet/minecraft/class_3850;)Ljava/lang/Integer; - ARG 0 data - METHOD method_56090 (Lnet/minecraft/class_3850;)Lnet/minecraft/class_3852; - ARG 0 data - METHOD method_56091 (Lnet/minecraft/class_3850;)Lnet/minecraft/class_3854; + METHOD method_28374 (Lnet/minecraft/class_3850;)Lnet/minecraft/class_6880; ARG 0 data diff --git a/mappings/net/minecraft/village/VillagerProfession.mapping b/mappings/net/minecraft/village/VillagerProfession.mapping index b598467d80..abacd78dac 100644 --- a/mappings/net/minecraft/village/VillagerProfession.mapping +++ b/mappings/net/minecraft/village/VillagerProfession.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3852 net/minecraft/village/VillagerProfession - FIELD comp_818 id Ljava/lang/String; + FIELD comp_818 id Lnet/minecraft/class_2561; FIELD comp_819 heldWorkstation Ljava/util/function/Predicate; COMMENT A predicate for the workstation currently held by the villager profession. FIELD comp_820 acquirableWorkstation Ljava/util/function/Predicate; @@ -8,40 +8,23 @@ CLASS net/minecraft/class_3852 net/minecraft/village/VillagerProfession FIELD comp_822 secondaryJobSites Lcom/google/common/collect/ImmutableSet; FIELD comp_823 workSound Lnet/minecraft/class_3414; FIELD field_39308 IS_ACQUIRABLE_JOB_SITE Ljava/util/function/Predicate; - METHOD (Ljava/lang/String;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)V - ARG 1 id - METHOD comp_818 id ()Ljava/lang/String; + METHOD comp_818 id ()Lnet/minecraft/class_2561; METHOD comp_819 heldWorkstation ()Ljava/util/function/Predicate; METHOD comp_820 acquirableWorkstation ()Ljava/util/function/Predicate; METHOD comp_821 gatherableItems ()Lcom/google/common/collect/ImmutableSet; METHOD comp_822 secondaryJobSites ()Lcom/google/common/collect/ImmutableSet; METHOD comp_823 workSound ()Lnet/minecraft/class_3414; - METHOD method_16926 register (Ljava/lang/String;Lnet/minecraft/class_5321;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; - ARG 0 id - ARG 1 heldWorkstation - ARG 2 workSound - METHOD method_19197 register (Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; - ARG 0 id - ARG 1 heldWorkstation - ARG 2 gatherableItems - ARG 3 secondaryJobSites - ARG 4 workSound + METHOD method_16926 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; + METHOD method_19197 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; METHOD method_44005 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;)Z ARG 1 entry METHOD method_44006 (Lnet/minecraft/class_6880;)Z ARG 0 poiType - METHOD method_44007 register (Ljava/lang/String;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; - ARG 0 id - ARG 1 heldWorkstation + METHOD method_44007 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; ARG 2 acquirableWorkstation - ARG 3 workSound - METHOD method_44008 register (Ljava/lang/String;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; - ARG 0 id - ARG 1 heldWorkstation + METHOD method_44008 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; ARG 2 acquirableWorkstation - ARG 3 gatherableItems ARG 4 secondaryJobSites - ARG 5 workSound METHOD method_44009 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;)Z ARG 1 entry METHOD method_44321 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;)Z diff --git a/mappings/net/minecraft/village/VillagerType.mapping b/mappings/net/minecraft/village/VillagerType.mapping index e7dee16c25..a77fd5e8da 100644 --- a/mappings/net/minecraft/village/VillagerType.mapping +++ b/mappings/net/minecraft/village/VillagerType.mapping @@ -1,18 +1,14 @@ CLASS net/minecraft/class_3854 net/minecraft/village/VillagerType - FIELD field_17071 DESERT Lnet/minecraft/class_3854; - FIELD field_17072 JUNGLE Lnet/minecraft/class_3854; - FIELD field_17073 PLAINS Lnet/minecraft/class_3854; - FIELD field_17074 SAVANNA Lnet/minecraft/class_3854; - FIELD field_17075 SNOW Lnet/minecraft/class_3854; - FIELD field_17076 SWAMP Lnet/minecraft/class_3854; - FIELD field_17077 TAIGA Lnet/minecraft/class_3854; + FIELD field_17071 DESERT Lnet/minecraft/class_5321; + FIELD field_17072 JUNGLE Lnet/minecraft/class_5321; + FIELD field_17073 PLAINS Lnet/minecraft/class_5321; + FIELD field_17074 SAVANNA Lnet/minecraft/class_5321; + FIELD field_17075 SNOW Lnet/minecraft/class_5321; + FIELD field_17076 SWAMP Lnet/minecraft/class_5321; + FIELD field_17077 TAIGA Lnet/minecraft/class_5321; FIELD field_17078 BIOME_TO_TYPE Ljava/util/Map; - FIELD field_26690 name Ljava/lang/String; - METHOD (Ljava/lang/String;)V - ARG 1 name - METHOD method_16930 forBiome (Lnet/minecraft/class_6880;)Lnet/minecraft/class_3854; + METHOD method_16930 forBiome (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5321; ARG 0 biomeEntry - METHOD method_16931 create (Ljava/lang/String;)Lnet/minecraft/class_3854; - ARG 0 id + METHOD method_16931 create (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Lnet/minecraft/class_3854; METHOD method_16932 (Ljava/util/HashMap;)V ARG 0 map diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index 1d1d6907e6..26f2db8cfa 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -203,12 +203,11 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules FIELD field_19416 changeCallback Ljava/util/function/BiConsumer; FIELD field_24104 ruleAcceptor Lnet/minecraft/class_1928$class_5199; FIELD field_52616 requiredFeatures Lnet/minecraft/class_7699; - METHOD (Ljava/util/function/Supplier;Ljava/util/function/Function;Ljava/util/function/BiConsumer;Lnet/minecraft/class_1928$class_5199;Lnet/minecraft/class_7699;)V + METHOD (Ljava/util/function/Supplier;Ljava/util/function/Function;Ljava/util/function/BiConsumer;Lnet/minecraft/class_1928$class_5199;Ljava/lang/Class;Lnet/minecraft/class_7699;)V ARG 1 argumentType ARG 2 ruleFactory ARG 3 changeCallback ARG 4 ruleAcceptor - ARG 5 requiredFeatures METHOD method_20773 createRule ()Lnet/minecraft/class_1928$class_4315; METHOD method_20775 argument (Ljava/lang/String;)Lcom/mojang/brigadier/builder/RequiredArgumentBuilder; ARG 1 name