Skip to content

Commit

Permalink
match 24w35a to 24w34a
Browse files Browse the repository at this point in the history
  • Loading branch information
ix0rai committed Aug 29, 2024
1 parent 68364d6 commit f49c416
Show file tree
Hide file tree
Showing 17 changed files with 67 additions and 0 deletions.
9 changes: 9 additions & 0 deletions mappings/net/minecraft/block/AbstractBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
FIELD f_eagudpej slipperiness F
FIELD f_gtipwtfw requiredFlags Lnet/minecraft/unmapped/C_czxxrbcp;
FIELD f_hcgxjldr jumpVelocityMultiplier F
FIELD f_hflsieep lootTableId Ljava/util/Optional;
FIELD f_hpfrgdhl velocityMultiplier F
FIELD f_hskzbzfq settings Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
FIELD f_lyvgdypq soundGroup Lnet/minecraft/unmapped/C_aevintex;
FIELD f_mfgswndv dynamicBounds Z
FIELD f_nsbwwaru DIRECTIONS [Lnet/minecraft/unmapped/C_xpuuihxf;
FIELD f_pqndzdga collidable Z
FIELD f_uxluwspt resistance F
FIELD f_zawgabdk translationKey Ljava/lang/String;
METHOD <init> (Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V
ARG 1 settings
METHOD m_bhohbmwk getWeakRedstonePower (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xpuuihxf;)I
Expand Down Expand Up @@ -47,6 +49,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
METHOD m_enfnjurp (Ljava/util/function/Function;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 1 codecBuilder
METHOD m_ewcsdntg asBlock ()Lnet/minecraft/unmapped/C_mmxmpdoq;
METHOD m_fegczxns getTranslationKey ()Ljava/lang/String;
METHOD m_fjkbizwn isRedstonePowerSource (Lnet/minecraft/unmapped/C_txtbiemp;)Z
ARG 1 state
METHOD m_flnjgkno isTransparent (Lnet/minecraft/unmapped/C_txtbiemp;)Z
Expand Down Expand Up @@ -133,6 +136,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 3 pos
ARG 4 stack
ARG 5 dropExperience
METHOD m_qodrklgm getLootTableId ()Ljava/util/Optional;
METHOD m_qzmkwuwe canReplace (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_aiootljq;)Z
ARG 1 state
ARG 2 context
Expand Down Expand Up @@ -563,6 +567,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
FIELD f_obppjqdx opaque Z
FIELD f_pgktgiev offsetFunction Lnet/minecraft/unmapped/C_triydqro$C_mlfsdncu;
FIELD f_piwzbwkw suffocationPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
FIELD f_pxqjcqnw lootTableId Lnet/minecraft/unmapped/C_jquyxssk;
FIELD f_stojhpmj solid Z
FIELD f_vgbjitlh spawnsDustParticles Z
FIELD f_vncuqezy luminance Ljava/util/function/ToIntFunction;
Expand Down Expand Up @@ -633,6 +638,10 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 1 predicate
METHOD m_scrsgkaj copy (Lnet/minecraft/unmapped/C_triydqro;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
ARG 0 block
METHOD m_secizybe (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Z
ARG 0 state
ARG 1 world
ARG 2 pos
METHOD m_shyyftwz toolRequired ()Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
METHOD m_tzpskyoo (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z
ARG 0 state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,12 @@ CLASS net/minecraft/unmapped/C_awkydklx net/minecraft/client/gui/tooltip/Tooltip
COMMENT the model matrix for text rendering
ARG 5 vertexConsumer
COMMENT the vertex consumer
METHOD m_wwteowvl drawItems (Lnet/minecraft/unmapped/C_mavozmpp;IIIILnet/minecraft/unmapped/C_sedilmty;)V
COMMENT Draws the more complex part of this tooltip, which may include items.
ARG 1 textRenderer
COMMENT the text renderer
ARG 2 x
COMMENT the X coordinate of the tooltip origin
ARG 3 y
COMMENT the Y coordinate of the tooltip origin
ARG 6 graphics
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/model/Model.mapping
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CLASS net/minecraft/unmapped/C_lzwtpfka net/minecraft/client/model/Model
COMMENT Represents a dynamic model which has its own render layers and custom rendering.
FIELD f_ajixxuno root Lnet/minecraft/unmapped/C_rglqxnbw;
FIELD f_tmwqkepw layerFactory Ljava/util/function/Function;
METHOD m_bffuidgd getRoot ()Lnet/minecraft/unmapped/C_rglqxnbw;
METHOD m_mzofdwyu getLayer (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_tizlwnnv;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ CLASS net/minecraft/unmapped/C_giodsxsr net/minecraft/client/render/entity/featu
ARG 2 leggingsModel
ARG 3 bodyModel
ARG 4 modelManager
METHOD m_flcuqnsy renderArmor (Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;Lnet/minecraft/unmapped/C_btosngnd;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_yuycoehb;ILnet/minecraft/unmapped/C_kbsahqug;)V
ARG 1 matrices
ARG 2 vertexConsumers
ARG 5 armorSlot
ARG 6 light
ARG 7 model
METHOD m_jjqpnqlp getArmor (Lnet/minecraft/unmapped/C_btosngnd;Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_kbsahqug;
ARG 2 slot
METHOD m_lmbxrdsa renderArmorGlint (Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;ILnet/minecraft/unmapped/C_kbsahqug;)V
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ CLASS net/minecraft/unmapped/C_fouvqrqy net/minecraft/client/render/entity/model
COMMENT <p>Some children classes contain a model parts table, those tables contains
COMMENT the model parts for the base model. In a modded context the tables may be
COMMENT inaccurate. Model parts with an associated field are required.
METHOD <init> (Lnet/minecraft/unmapped/C_rglqxnbw;)V
ARG 1 root
METHOD m_zqrlbqnu setAngles (Lnet/minecraft/unmapped/C_vptppxob;)V
3 changes: 3 additions & 0 deletions mappings/net/minecraft/entity/EntityType.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType
FIELD f_mjmkeute requiredFlags Lnet/minecraft/unmapped/C_czxxrbcp;
FIELD f_nmhdwoib saveable Z
FIELD f_rbjzcosu summonable Z
FIELD f_sjefpzeu lootTableId Ljava/util/Optional;
FIELD f_txgmkfug canSpawnInside Lcom/google/common/collect/ImmutableSet;
FIELD f_xwixcoto spawnGroup Lnet/minecraft/unmapped/C_ormqdxci;
FIELD f_yohcyxht fireImmune Z
Expand Down Expand Up @@ -88,6 +89,7 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType
METHOD m_qprblwyz isSaveable ()Z
METHOD m_qwgbrbqg createDefaultStackSpawnConfig (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jzrpycqo;)Ljava/util/function/Consumer;
ARG 2 player
METHOD m_qxlrmhco getLootTableId ()Ljava/util/Optional;
METHOD m_rdswxkej streamFromNbt (Ljava/util/List;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_bhyaesep;)Ljava/util/stream/Stream;
ARG 0 entityNbtList
ARG 1 world
Expand Down Expand Up @@ -168,6 +170,7 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType
METHOD m_tfrskfvg create (Lnet/minecraft/unmapped/C_ormqdxci;)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;
ARG 0 spawnGroup
METHOD m_tyhsjfkq vehicleAttachment (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;
METHOD m_ukhgvcht build (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ogavsvbr;
METHOD m_vwlaksox setAttachmentType (Lnet/minecraft/unmapped/C_biqpbxns;Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;
ARG 1 attachmentType
ARG 2 pos
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/entity/mob/MobEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity
FIELD f_srixsinn LEFT_HANDED_FLAG I
FIELD f_tcesvuol lookControl Lnet/minecraft/unmapped/C_lgufpcrf;
FIELD f_uushnomk targetSelector Lnet/minecraft/unmapped/C_qospjrjn;
FIELD f_vuffzgdh lootTable Ljava/util/Optional;
FIELD f_wfwaeazd leashData Lnet/minecraft/unmapped/C_gbavazgo$C_trsxpkpu;
FIELD f_wkutgcpe DEFAULT_ATTACK_RANGE D
FIELD f_xdwjzxrd handDropChances [F
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/item/Item.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ CLASS net/minecraft/unmapped/C_vorddnax net/minecraft/item/Item
METHOD m_hsttveiz canRepair (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
ARG 1 stack
ARG 2 ingredient
METHOD m_hwkxajsh onStoppedUsing (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_usxaxydn;I)Z
ARG 1 stack
ARG 2 world
ARG 3 user
ARG 4 remainingUseTicks
METHOD m_hwznhtnf getUseTicks (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_usxaxydn;)I
ARG 2 entity
METHOD m_inqbslnb useOnEntity (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_laxmzoqs;)Lnet/minecraft/unmapped/C_ozuepbyj;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ CLASS net/minecraft/unmapped/C_mphuroti net/minecraft/network/packet/s2c/play/En
METHOD m_lfkbmuwn getEntity (Lnet/minecraft/unmapped/C_cdctfzbn;)Lnet/minecraft/unmapped/C_astfners;
ARG 1 world
METHOD m_ohzlybap write (Lnet/minecraft/unmapped/C_idfydwco;)V
METHOD m_vovbwirz getHeadYaw ()F
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ CLASS net/minecraft/unmapped/C_qlsxyesm net/minecraft/network/packet/s2c/play/En
METHOD <init> (Lnet/minecraft/unmapped/C_idfydwco;)V
ARG 1 buf
METHOD m_cinegpls isOnGround ()Z
METHOD m_erbxpyxg getYaw ()F
METHOD m_itvabcwg getY ()D
METHOD m_marppcmv write (Lnet/minecraft/unmapped/C_idfydwco;)V
METHOD m_sdiwgriv getZ ()D
METHOD m_srdyrako getPitch ()F
METHOD m_wsxblhil getId ()I
METHOD m_zfxybctx getX ()D
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ CLASS net/minecraft/unmapped/C_mblcabfe net/minecraft/network/packet/s2c/play/En
METHOD m_dltyxzmo isOnGround ()Z
METHOD m_ebvyefeb hasRotation ()Z
METHOD m_gdgixcqg getDeltaY ()S
METHOD m_jccqnbph getPitch ()F
METHOD m_lnyuyszh getEntity (Lnet/minecraft/unmapped/C_cdctfzbn;)Lnet/minecraft/unmapped/C_astfners;
ARG 1 world
METHOD m_qkmjaxyn getDeltaZ ()S
METHOD m_qpjjgynx getYaw ()F
METHOD m_srkjtjgk getDeltaX ()S
METHOD m_vukwqeza isPositionChanged ()Z
CLASS C_bxqvwlgz Rotate
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/registry/HolderProvider.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,7 @@ CLASS net/minecraft/unmapped/C_pzdchrcy net/minecraft/registry/HolderProvider
COMMENT {@return the holder provider of the given registry, may be empty if the registry does not exist in this provider}
ARG 1 registryKey
COMMENT the key of the registry
METHOD m_yuymjcux get (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional;
COMMENT {@return the entry's holder by its key, may be empty if the entry does not exist in the searched registry}
ARG 1 registry
COMMENT the key of the registry to search in
2 changes: 2 additions & 0 deletions mappings/net/minecraft/server/command/LootCommand.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ CLASS net/minecraft/unmapped/C_bqrskrfs net/minecraft/server/command/LootCommand
ARG 0 context
ARG 1 entity
ARG 2 constructor
METHOD m_aumabzti (Lnet/minecraft/unmapped/C_bqrskrfs$C_jsqppuqn;Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 constructor
METHOD m_axxuzqtn executeLoot (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_bqrskrfs$C_jsqppuqn;)I
ARG 0 context
ARG 2 constructor
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/village/raid/Raid.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,14 @@ CLASS net/minecraft/unmapped/C_szefbyex net/minecraft/village/raid/Raid
METHOD m_iarhyjws hasSpawnedExtraWave ()Z
METHOD m_ihifrprf invalidate ()V
METHOD m_ilwmzynv removeObsoleteRaiders ()V
METHOD m_jnntkqxs getRavagerSpawnLocation (I)Lnet/minecraft/unmapped/C_hynzadkk;
ARG 1 proximity
METHOD m_jvxffxut tick ()V
METHOD m_kkhfgadp start (Lnet/minecraft/unmapped/C_mxrobsgg;)Z
METHOD m_mesmxuol getCenter ()Lnet/minecraft/unmapped/C_hynzadkk;
METHOD m_msoysvru hasSpawnedFinalWave ()Z
METHOD m_mwiqgpfz isInRaidDistance ()Ljava/util/function/Predicate;
METHOD m_ncpwdmit preCalculateRavagerSpawnLocation ()Ljava/util/Optional;
METHOD m_nodtgeic updateBar ()V
METHOD m_odulvant getRaiderCount ()I
METHOD m_ofdsiptf (Lnet/minecraft/unmapped/C_mxrobsgg;)Z
Expand Down
8 changes: 8 additions & 0 deletions mappings/net/minecraft/world/NeighborUpdater.mapping
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
CLASS net/minecraft/unmapped/C_rwmwglbe net/minecraft/world/NeighborUpdater
FIELD f_ccnhxzee DIRECTIONS [Lnet/minecraft/unmapped/C_xpuuihxf;
METHOD m_cmnwwuvp replaceStateForUpdate (Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;II)V
ARG 0 world
ARG 1 direction
ARG 2 pos
ARG 3 sourcePos
ARG 4 state
ARG 5 flags
ARG 6 maxDepth
METHOD m_ldrrsucu updateAllNeighbors (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_ctatbkvy;)V
ARG 1 pos
ARG 2 block
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/world/TrialSpawnerLogic.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CLASS net/minecraft/unmapped/C_jelkcvqk net/minecraft/world/TrialSpawnerLogic
FIELD f_oeictsyk ominous Z
FIELD f_rqyxrnno playerDetectionSelector Lnet/minecraft/unmapped/C_kkiexczn$C_ztluwxut;
FIELD f_sobdyvtw MAX_MOB_TRACKING_RANGE I
FIELD f_xcfvwbbl ominousConfig Lnet/minecraft/unmapped/C_cjzoxshv;
FIELD f_xvaxtoox normalConfig Lnet/minecraft/unmapped/C_cjzoxshv;
METHOD m_aakzgwdf spawnMob (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)Ljava/util/Optional;
METHOD m_bfccdstr addSpawnParticles (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_lwmufxcy;)V
METHOD m_bfmdqsfz getPlayerDetector ()Lnet/minecraft/unmapped/C_kkiexczn;
Expand Down
7 changes: 7 additions & 0 deletions mappings/net/minecraft/world/WorldAccess.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ CLASS net/minecraft/unmapped/C_vdvbsyle net/minecraft/world/WorldAccess
ARG 2 fluid
ARG 3 delay
ARG 4 priority
METHOD m_jljqpdrp updateNeighbor (Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;II)V
ARG 1 direction
ARG 2 pos
ARG 3 sourcePos
ARG 4 state
ARG 5 flags
ARG 6 maxUpdateDepth
METHOD m_kiwkevmb syncWorldEvent (Lnet/minecraft/unmapped/C_jzrpycqo;ILnet/minecraft/unmapped/C_hynzadkk;I)V
ARG 1 player
ARG 2 eventId
Expand Down

1 comment on commit f49c416

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No diff file generated.

Please sign in to comment.