Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.21.2-pre2 stuff #4019

Merged
merged 1 commit into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
METHOD method_52653 play ()V
METHOD method_52654 createRealm ()V
METHOD method_54566 drawDescription (Lnet/minecraft/class_332;III)V
ARG 1 context
ARG 2 y
ARG 3 x
ARG 4 entryWidth
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/client/render/RenderLayer.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer
FIELD field_53135 GUI_TEXTURED Ljava/util/function/Function;
FIELD field_53136 VIGNETTE Ljava/util/function/Function;
FIELD field_53137 CROSSHAIR Ljava/util/function/Function;
FIELD field_54962 ARMOR_TRANSLUCENT Ljava/util/function/Function;
METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_293;Lnet/minecraft/class_293$class_5596;IZZLjava/lang/Runnable;Ljava/lang/Runnable;)V
ARG 1 name
ARG 2 vertexFormat
Expand Down Expand Up @@ -282,6 +283,10 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer
ARG 0 texture
METHOD method_62291 getNoCullingClouds ()Lnet/minecraft/class_1921;
METHOD method_64914 getSecondaryBlockOutline ()Lnet/minecraft/class_1921;
METHOD method_65051 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
ARG 0 texture
METHOD method_65052 createArmorTranslucent (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
ARG 0 texture
CLASS class_4687 MultiPhase
FIELD field_21403 phases Lnet/minecraft/class_1921$class_4688;
FIELD field_21697 affectedOutline Ljava/util/Optional;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/RenderPhase.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
FIELD field_53126 MOJANG_LOGO_TRANSPARENCY Lnet/minecraft/class_4668$class_4685;
FIELD field_53127 NAUSEA_OVERLAY_TRANSPARENCY Lnet/minecraft/class_4668$class_4685;
FIELD field_53128 POSITION_TEXTURE_COLOR_PROGRAM Lnet/minecraft/class_4668$class_5942;
FIELD field_54961 ARMOR_TRANSLUCENT Lnet/minecraft/class_4668$class_5942;
METHOD <init> (Ljava/lang/String;Ljava/lang/Runnable;Ljava/lang/Runnable;)V
ARG 1 name
ARG 2 beginAction
Expand Down
6 changes: 6 additions & 0 deletions mappings/net/minecraft/entity/Entity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
FIELD field_47742 stateAtPos Lnet/minecraft/class_2680;
FIELD field_51994 portalManager Lnet/minecraft/class_9787;
FIELD field_52442 collidedBlocks Ljava/util/Set;
FIELD field_54946 onFire Z
FIELD field_5951 ridingCooldown I
FIELD field_5952 onGround Z
FIELD field_5953 firstUpdate Z
Expand Down Expand Up @@ -212,6 +213,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
FIELD field_6037 velocityModified Z
FIELD field_6038 lastRenderX D
METHOD <init> (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V
ARG 1 type
ARG 2 world
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
Expand Down Expand Up @@ -1711,6 +1713,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
ARG 2 volume
ARG 3 pitch
METHOD method_5784 move (Lnet/minecraft/class_1313;Lnet/minecraft/class_243;)V
ARG 1 type
ARG 2 movement
METHOD method_5785 scheduleVelocityUpdate ()V
METHOD method_5786 saveSelfNbt (Lnet/minecraft/class_2487;)Z
Expand Down Expand Up @@ -2301,6 +2304,9 @@ 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_65038 isControlledByPlayer ()Z
METHOD method_65039 (Lnet/minecraft/class_2680;)Z
ARG 0 state
METHOD method_7325 isSpectator ()Z
COMMENT {@return whether the entity is a spectator}
COMMENT
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/entity/LivingEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
METHOD method_6060 knockback (Lnet/minecraft/class_1309;)V
ARG 1 target
METHOD method_6061 blockedByShield (Lnet/minecraft/class_1282;)Z
ARG 1 source
METHOD method_6062 isImmobile ()Z
METHOD method_6063 getMaxHealth ()F
METHOD method_6064 getNextAirOnLand (I)I
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/item/AnimalArmorItem.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CLASS net/minecraft/class_4059 net/minecraft/item/AnimalArmorItem
METHOD <init> (Lnet/minecraft/class_1741;Lnet/minecraft/class_4059$class_9076;Lnet/minecraft/class_6880;ZLnet/minecraft/class_1792$class_1793;)V
ARG 1 material
ARG 2 type
ARG 3 equipSound
ARG 4 damageOnHurt
ARG 5 settings
CLASS class_9076 Type
Expand Down
5 changes: 4 additions & 1 deletion mappings/net/minecraft/item/BlockPredicatesChecker.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ CLASS net/minecraft/class_6538 net/minecraft/item/BlockPredicatesChecker
ARG 0 predicate
METHOD method_57326 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_57329 getTooltipText (Ljava/util/List;)Ljava/util/List;
METHOD method_57327 (Lnet/minecraft/class_6538;)Ljava/util/List;
ARG 0 blockPredicatesChecker
METHOD method_57329 createTooltipText (Ljava/util/List;)Ljava/util/List;
ARG 0 blockPredicates
METHOD method_57330 addTooltips (Ljava/util/function/Consumer;)V
ARG 1 adder
Expand All @@ -51,3 +53,4 @@ CLASS net/minecraft/class_6538 net/minecraft/item/BlockPredicatesChecker
ARG 0 checker
METHOD method_58402 withShowInTooltip (Z)Lnet/minecraft/class_6538;
ARG 1 showInTooltip
METHOD method_65042 getOrCreateTooltipText ()Ljava/util/List;
3 changes: 3 additions & 0 deletions mappings/net/minecraft/item/Item.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
FIELD field_40209 requiredFeatures Lnet/minecraft/class_7699;
FIELD field_49263 components Lnet/minecraft/class_9323;
FIELD field_49998 MAX_MAX_COUNT I
FIELD field_54952 ENTRY_CODEC Lcom/mojang/serialization/Codec;
FIELD field_8001 BASE_ATTACK_SPEED_MODIFIER_ID Lnet/minecraft/class_2960;
FIELD field_8003 BLOCK_ITEMS Ljava/util/Map;
FIELD field_8006 BASE_ATTACK_DAMAGE_MODIFIER_ID Lnet/minecraft/class_2960;
Expand Down Expand Up @@ -136,6 +137,8 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
METHOD method_63680 getName ()Lnet/minecraft/class_2561;
METHOD method_64193 getDamageSource (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282;
ARG 1 user
METHOD method_65043 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/DataResult;
ARG 0 entry
METHOD method_7836 use (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269;
COMMENT Called when the player uses (or starts using) the item.
COMMENT The use action, by default, is bound to the right mouse button.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ CLASS net/minecraft/class_1741 net/minecraft/item/equipment/ArmorMaterial
ARG 1 equipmentType
METHOD method_64503 applyBodyArmorSettings (Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_6880;ZLnet/minecraft/class_6885;)Lnet/minecraft/class_1792$class_1793;
ARG 1 settings
ARG 2 equipSound
ARG 3 damageOnHurt
ARG 4 allowedEntities
1 change: 1 addition & 0 deletions mappings/net/minecraft/network/codec/PacketCodec.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec
ARG 13 from7
ARG 14 to
METHOD method_65036 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function8;)Lnet/minecraft/class_9139;
COMMENT {@return a codec for encoding eight values}
ARG 0 codec1
ARG 1 from1
ARG 2 codec2
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/recipe/Recipe.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe
COMMENT
COMMENT <p>Recipe displays are sent to the client and displayed in the recipe book.
COMMENT One recipe can have multiple displays.
METHOD method_64668 getRecipeBookTab ()Lnet/minecraft/class_10355;
METHOD method_64668 getRecipeBookCategory ()Lnet/minecraft/class_10355;
METHOD method_8112 getGroup ()Ljava/lang/String;
COMMENT {@return a group this recipe belongs in, or an empty string} This is
COMMENT only used by the recipe book.
Expand Down
8 changes: 4 additions & 4 deletions mappings/net/minecraft/sound/SoundEvent.mapping
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
CLASS net/minecraft/class_3414 net/minecraft/sound/SoundEvent
FIELD comp_3319 id Lnet/minecraft/class_2960;
FIELD comp_3320 getStaticDistanceToTravel Ljava/util/Optional;
FIELD field_41698 CODEC Lcom/mojang/serialization/Codec;
FIELD field_41699 ENTRY_CODEC Lcom/mojang/serialization/Codec;
FIELD field_48278 PACKET_CODEC Lnet/minecraft/class_9139;
FIELD field_48279 ENTRY_PACKET_CODEC Lnet/minecraft/class_9139;
METHOD <init> (Lnet/minecraft/class_2960;Ljava/util/Optional;)V
ARG 1 id
METHOD comp_3319 id ()Lnet/minecraft/class_2960;
METHOD comp_3320 getStaticDistanceToTravel ()Ljava/util/Optional;
METHOD method_43044 getDistanceToTravel (F)F
ARG 1 volume
METHOD method_47908 of (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3414;
ARG 0 id
METHOD method_47909 of (Lnet/minecraft/class_2960;F)Lnet/minecraft/class_3414;
ARG 0 id
ARG 1 distanceToTravel
ARG 1 fixedRange
METHOD method_47955 (Lnet/minecraft/class_2960;Ljava/lang/Float;)Lnet/minecraft/class_3414;
ARG 1 fixedRangex
METHOD method_47956 of (Lnet/minecraft/class_2960;Ljava/util/Optional;)Lnet/minecraft/class_3414;
ARG 0 id
ARG 1 distanceToTravel
ARG 1 fixedRange
METHOD method_47957 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
4 changes: 4 additions & 0 deletions mappings/net/minecraft/util/dynamic/Codecs.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,10 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs
ARG 0 vec4f
METHOD method_59550 (Lorg/joml/Vector4f;)Ljava/util/List;
ARG 0 vec4f
METHOD method_59551 (Ljava/util/List;)Lcom/mojang/serialization/DataResult;
ARG 0 list
METHOD method_59552 (Ljava/util/List;)Lorg/joml/Quaternionf;
ARG 0 listx
METHOD method_62812 rangedInclusiveFloat (FFLjava/util/function/Function;)Lcom/mojang/serialization/Codec;
ARG 0 minInclusive
ARG 1 maxInclusive
Expand Down