From 3ea998f506f0af305ecc62feab92faef60e48d42 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Mon, 14 Oct 2024 20:19:08 -0500 Subject: [PATCH 01/24] start working on entity mappings --- .../minecraft/entity/AnimationState.mapping | 7 +++++- mappings/net/minecraft/entity/Entity.mapping | 16 ++++++++++++- .../minecraft/entity/EntityStatuses.mapping | 2 ++ .../net/minecraft/entity/EntityType.mapping | 3 +++ .../minecraft/entity/EquipmentSlot.mapping | 2 ++ .../decoration/ArmorStandEntity.mapping | 2 ++ .../entity/vehicle/AbstractBoatEntity.mapping | 3 +++ .../vehicle/AbstractChestBoatEntity.mapping | 6 +++++ .../entity/vehicle/RaftEntity.mapping | 1 + .../entity/vehicle/StorageVehicle.mapping | 2 +- .../net/minecraft/registry/KeyedValue.mapping | 5 ++++ .../net/minecraft/util/math/Direction.mapping | 24 +++++++++++++++++++ .../minecraft/util/shape/VoxelShape.mapping | 8 +++++++ 13 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping create mode 100644 mappings/net/minecraft/entity/vehicle/AbstractChestBoatEntity.mapping create mode 100644 mappings/net/minecraft/entity/vehicle/RaftEntity.mapping create mode 100644 mappings/net/minecraft/registry/KeyedValue.mapping diff --git a/mappings/net/minecraft/entity/AnimationState.mapping b/mappings/net/minecraft/entity/AnimationState.mapping index b2ee6d0435..cb973f1c03 100644 --- a/mappings/net/minecraft/entity/AnimationState.mapping +++ b/mappings/net/minecraft/entity/AnimationState.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/unmapped/C_kxntavoz net/minecraft/entity/AnimationState - FIELD f_mynxnfft INVALID_TIME I + FIELD f_mynxnfft STOPPED I + FIELD f_slrycntl startTick I METHOD m_cpvhojvm fastForward (IF)V ARG 1 seconds ARG 2 speedMultiplier @@ -7,6 +8,10 @@ CLASS net/minecraft/unmapped/C_kxntavoz net/minecraft/entity/AnimationState METHOD m_eyncnhvh animateIf (ZI)V ARG 1 condition ARG 2 start + METHOD m_fjeaaddd copyFrom (Lnet/minecraft/unmapped/C_kxntavoz;)V + ARG 1 state + METHOD m_hbqomwtk getTimeMillis (F)J + ARG 1 ticks METHOD m_ipvmrdzh stop ()V METHOD m_nbtuouwc restart (I)V ARG 1 start diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index d886ace66b..e311b0600c 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -57,6 +57,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity FIELD f_llpiaiql fireTicks I FIELD f_lnfbdcex firstUpdate Z FIELD f_ltxgrrxv noClip Z + FIELD f_lwsftgrz queuedCollisionChecks Ljava/util/List; FIELD f_metfcppr velocityDirty Z FIELD f_mhlwwcep POSE Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_mnnqnavj glowing Z @@ -72,6 +73,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity FIELD f_pfezymmj prevYaw F FIELD f_pfgaedzm MIN_TICKS_TO_FREEZE I FIELD f_qazqhmfv SNEAKING_FLAG_INDEX I + FIELD f_qckvmvwz collidingBlockPositions Lit/unimi/dsi/fastutil/longs/LongSet; FIELD f_qriixkyh SWIMMING_FLAG_INDEX I FIELD f_qtxalbwz SAFE_FALL_DISTANCE I FIELD f_qxfvmjxc lastRenderX D @@ -91,6 +93,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity FIELD f_ssljujsr LOGGER Lorg/slf4j/Logger; FIELD f_tigrjjuw DEFAULT_BOUNDING_BOX_WIDTH F FIELD f_tklhtpht entityChangeListener Lnet/minecraft/unmapped/C_ylpvpknw; + FIELD f_ujgsyoqm collidingBlocks Ljava/util/Set; FIELD f_ujsjgylb fallDistance F FIELD f_vdsiqqmt prevPitch F FIELD f_vettyvgp hasVisualFire Z @@ -132,6 +135,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 1 pose METHOD m_ahglzvvg getBodyY (D)D ARG 1 heightScale + METHOD m_ahrprint getPitch ()F METHOD m_ajnomikh getEffectiveExplosionResistance (Lnet/minecraft/unmapped/C_aahhrzpf;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_xqketiuf;F)F ARG 1 explosion ARG 2 world @@ -159,7 +163,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 2 type METHOD m_bikcqssn setInsidePortal (Lnet/minecraft/unmapped/C_teerivzm;Lnet/minecraft/unmapped/C_hynzadkk;)V ARG 1 portal - METHOD m_bjibgujk onRemoved ()V + METHOD m_bjibgujk onRemovedClient ()V METHOD m_bmjmwuig setBoundingBox (Lnet/minecraft/unmapped/C_hbcjzgoe;)V ARG 1 boundingBox METHOD m_bqujtsnz isSubmergedInWater ()Z @@ -169,6 +173,9 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 0 entity ARG 2 expectedCollisions ARG 3 entityBoundingBox + METHOD m_bujlfnum dropStack (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_uqpzijng; + METHOD m_bxezczwg dropStack (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;F)Lnet/minecraft/unmapped/C_uqpzijng; + ARG 3 yOffset METHOD m_bzrtaquy getVehicle ()Lnet/minecraft/unmapped/C_astfners; METHOD m_bzveerey collides ()Z METHOD m_cckfyxyf fall (DZLnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;)V @@ -337,6 +344,8 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_fzshfvfl isSprinting ()Z METHOD m_gakqenyv getLerpTargetPitch ()F METHOD m_gavkvalj hasWings ()Z + METHOD m_gbjymqob onRemoved (Lnet/minecraft/unmapped/C_astfners$C_emmohndu;)V + ARG 1 reason METHOD m_ggpcigyk addVelocityInternal (Lnet/minecraft/unmapped/C_vgpupfxx;)V ARG 1 velocity METHOD m_ghqcprlw onPlayerCollision (Lnet/minecraft/unmapped/C_jzrpycqo;)V @@ -540,6 +549,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 1 widthScale METHOD m_ncryhhth copyPositionAndRotation (Lnet/minecraft/unmapped/C_astfners;)V ARG 1 entity + METHOD m_ndosmusf getYaw ()F METHOD m_ngysbrcu getSwimSound ()Lnet/minecraft/unmapped/C_avavozay; METHOD m_nhuepqoa getOppositeRotationVector (FF)Lnet/minecraft/unmapped/C_vgpupfxx; ARG 1 pitch @@ -702,6 +712,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_shlbgxdt saveSelfNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Z ARG 1 nbt METHOD m_smbujbsa discard ()V + METHOD m_smqilrfl dropStack (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_gmbqjnle;I)Lnet/minecraft/unmapped/C_uqpzijng; METHOD m_spboarji isTouchingWater ()Z COMMENT {@return whether this entity's hitbox is touching water} METHOD m_spnjhgke resetFallDistance ()V @@ -880,6 +891,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 1 tickDelta METHOD m_xpuekaoa setUuid (Ljava/util/UUID;)V ARG 1 uuid + METHOD m_xrhuexzc dropStack (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_uqpzijng; METHOD m_xrvghdnl getLandingBlockStateLegacy ()Lnet/minecraft/unmapped/C_txtbiemp; METHOD m_xthhawdp onStartedTrackingBy (Lnet/minecraft/unmapped/C_mxrobsgg;)V ARG 1 player @@ -894,6 +906,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 1 entity ARG 2 dimensions ARG 3 scaleFactor + METHOD m_xxnsgkmf queueCollisionCheck (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;)V METHOD m_xyjymteg getVehicleAttachmentPos (Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_vgpupfxx; ARG 1 entity METHOD m_xyqhaexi playCombinationStepSounds (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;)V @@ -955,6 +968,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 2 interpolationSteps METHOD m_zoivpnyj getAttachments ()Lnet/minecraft/unmapped/C_pubtmkke; METHOD m_zrismnrd checkWaterState ()V + CLASS C_aipuagbw Movement CLASS C_aobkcgmf PositionUpdater METHOD accept (Lnet/minecraft/unmapped/C_astfners;DDD)V ARG 1 entity diff --git a/mappings/net/minecraft/entity/EntityStatuses.mapping b/mappings/net/minecraft/entity/EntityStatuses.mapping index f4914f01cf..3f3f0dd27a 100644 --- a/mappings/net/minecraft/entity/EntityStatuses.mapping +++ b/mappings/net/minecraft/entity/EntityStatuses.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/unmapped/C_vuauwont net/minecraft/entity/EntityStatuses FIELD f_hgeveagl SET_OP_LEVEL_4 B FIELD f_hlhbecen ADD_PORTAL_PARTICLES B FIELD f_iujagjoa BREAK_OFFHAND B + FIELD f_jahbxxhy PROTECTED_FROM_DEATH B FIELD f_jfcmyval ADD_WITCH_PARTICLES B FIELD f_jkvfmfoj TAME_OCELOT_SUCCESS B FIELD f_jogsmdtm ADD_POSITIVE_PLAYER_REACTION_PARTICLES B @@ -32,6 +33,7 @@ CLASS net/minecraft/unmapped/C_vuauwont net/minecraft/entity/EntityStatuses FIELD f_lbkmphzf PLAY_ATTACK_SOUND B FIELD f_lzgaeuhp PREPARE_RAM B FIELD f_mfslguzv USE_REDUCED_DEBUG_INFO B + FIELD f_nerpufry SHAKE B FIELD f_nfcguorg BREAK_CHEST B FIELD f_olioudok ADD_DEATH_PARTICLES B FIELD f_oorwyirf BREAK_BODY B diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 12004673f2..8dd559c436 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -114,9 +114,11 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType FIELD f_lwhqlwvm factory Lnet/minecraft/unmapped/C_ogavsvbr$C_pasczndl; FIELD f_nmmzrtfm saveable Z FIELD f_qcebxifq spawnDimensionsScale F + FIELD f_qdlfxewu translationKey Lnet/minecraft/unmapped/C_jquyxssk; FIELD f_rpsdjoxa trackingTickInterval I FIELD f_rzcfynrt attachmentType Lnet/minecraft/unmapped/C_pubtmkke$C_qexjibym; FIELD f_tntzkbun spawnableFarFromPlayer Z + FIELD f_uuowbxbh lootTable Lnet/minecraft/unmapped/C_jquyxssk; FIELD f_xtndxyps spawnGroup Lnet/minecraft/unmapped/C_ormqdxci; METHOD (Lnet/minecraft/unmapped/C_ogavsvbr$C_pasczndl;Lnet/minecraft/unmapped/C_ormqdxci;)V ARG 1 factory @@ -162,6 +164,7 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType METHOD m_onnfrfmf spawnableFarFromPlayer ()Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb; METHOD m_phyefhwa setEyeHeight (F)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb; ARG 1 eyeHeight + METHOD m_qgatngvl emptyLootTable ()Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb; METHOD m_qzcjtflv disableSaving ()Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb; METHOD m_tfrskfvg create (Lnet/minecraft/unmapped/C_ormqdxci;)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb; ARG 0 spawnGroup diff --git a/mappings/net/minecraft/entity/EquipmentSlot.mapping b/mappings/net/minecraft/entity/EquipmentSlot.mapping index 441dd7ab48..49e5bb9b98 100644 --- a/mappings/net/minecraft/entity/EquipmentSlot.mapping +++ b/mappings/net/minecraft/entity/EquipmentSlot.mapping @@ -15,6 +15,8 @@ CLASS net/minecraft/unmapped/C_yuycoehb net/minecraft/entity/EquipmentSlot METHOD m_egyjjxnq getType ()Lnet/minecraft/unmapped/C_yuycoehb$C_vkdieima; METHOD m_fyvngtoz (Lnet/minecraft/unmapped/C_yuycoehb;)I ARG 0 slot + METHOD m_jjdtlure offsetId (I)I + ARG 1 offset METHOD m_omjerill isArmorSlot ()Z METHOD m_ovklkqiy getName ()Ljava/lang/String; METHOD m_sybtfyce getEntitySlotId ()I diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping index 9a341c9f71..2ea64e06ff 100644 --- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping @@ -59,6 +59,7 @@ CLASS net/minecraft/unmapped/C_nknvrhfn net/minecraft/entity/decoration/ArmorSta ARG 1 value ARG 2 bitField ARG 3 set + METHOD m_fjamjtjb showsArms ()Z METHOD m_foqjlatj setLeftLegRotation (Lnet/minecraft/unmapped/C_eocijcdh;)V ARG 1 angle METHOD m_fqivefvy isMarker ()Z @@ -68,6 +69,7 @@ CLASS net/minecraft/unmapped/C_nknvrhfn net/minecraft/entity/decoration/ArmorSta ARG 3 amount METHOD m_kkoccwlu setMarker (Z)V ARG 1 marker + METHOD m_kruazguc showsBasePlate ()Z METHOD m_ldbykolm poseToNbt ()Lnet/minecraft/unmapped/C_hhlwcnih; METHOD m_lvksyjqf isSlotDisabled (Lnet/minecraft/unmapped/C_yuycoehb;)Z ARG 1 slot diff --git a/mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping new file mode 100644 index 0000000000..4ca211cfb1 --- /dev/null +++ b/mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/unmapped/C_sfpofsgc net/minecraft/entity/vehicle/AbstractBoatEntity + METHOD (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_cdctfzbn;Ljava/util/function/Supplier;)V + ARG 1 type diff --git a/mappings/net/minecraft/entity/vehicle/AbstractChestBoatEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractChestBoatEntity.mapping new file mode 100644 index 0000000000..ef4648753e --- /dev/null +++ b/mappings/net/minecraft/entity/vehicle/AbstractChestBoatEntity.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/unmapped/C_cyjxgxrb net/minecraft/entity/vehicle/AbstractChestBoatEntity + FIELD f_dehvsldw lootTable Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_lfxympdn inventory Lnet/minecraft/unmapped/C_rnrfftze; + FIELD f_nxvmtoei lootTableSeed J + FIELD f_vfvcqxxr INVENTORY_SIZE I + METHOD m_jhidwmsn generateLoot (Lnet/minecraft/unmapped/C_jzrpycqo;)V diff --git a/mappings/net/minecraft/entity/vehicle/RaftEntity.mapping b/mappings/net/minecraft/entity/vehicle/RaftEntity.mapping new file mode 100644 index 0000000000..370f2c3360 --- /dev/null +++ b/mappings/net/minecraft/entity/vehicle/RaftEntity.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_spthrjmn net/minecraft/entity/vehicle/RaftEntity diff --git a/mappings/net/minecraft/entity/vehicle/StorageVehicle.mapping b/mappings/net/minecraft/entity/vehicle/StorageVehicle.mapping index c69cf7f0d7..916b55aeed 100644 --- a/mappings/net/minecraft/entity/vehicle/StorageVehicle.mapping +++ b/mappings/net/minecraft/entity/vehicle/StorageVehicle.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/unmapped/C_srvkmyvp net/minecraft/entity/vehicle/StorageVehi METHOD m_ctcqgnek openScreen (Lnet/minecraft/unmapped/C_jzrpycqo;)Lnet/minecraft/unmapped/C_ozuepbyj; ARG 1 player METHOD m_elbjzlaw isRemoved ()Z - METHOD m_ggolaweo generateLoot (Lnet/minecraft/unmapped/C_jzrpycqo;)V + METHOD m_ggolaweo generateContainerLoot (Lnet/minecraft/unmapped/C_jzrpycqo;)V ARG 1 player METHOD m_huzqbykz clearInventory ()V METHOD m_iemddgjw writeStorage (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V diff --git a/mappings/net/minecraft/registry/KeyedValue.mapping b/mappings/net/minecraft/registry/KeyedValue.mapping new file mode 100644 index 0000000000..d8a4aa34eb --- /dev/null +++ b/mappings/net/minecraft/registry/KeyedValue.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/unmapped/C_jquyxssk net/minecraft/registry/KeyedValue + METHOD fixed (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_jquyxssk; + ARG 0 value + METHOD get (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/lang/Object; + ARG 1 key diff --git a/mappings/net/minecraft/util/math/Direction.mapping b/mappings/net/minecraft/util/math/Direction.mapping index b0738611db..48301a920c 100644 --- a/mappings/net/minecraft/util/math/Direction.mapping +++ b/mappings/net/minecraft/util/math/Direction.mapping @@ -14,10 +14,18 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction FIELD f_xnopevsr id I FIELD f_yxdvzmgt vec3i Lnet/minecraft/unmapped/C_ceivtqhh; FIELD f_zbhygcbw CODEC Lnet/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc; + METHOD m_aceixrsp getFacing (DDD)Lnet/minecraft/unmapped/C_xpuuihxf; + ARG 0 x + ARG 2 y + ARG 4 z METHOD m_arokrhof validateVertical (Lnet/minecraft/unmapped/C_xpuuihxf;)Lcom/mojang/serialization/DataResult; ARG 0 direction METHOD m_atdyqmtg getId ()I METHOD m_buxxiflp getOpposite ()Lnet/minecraft/unmapped/C_xpuuihxf; + METHOD m_ckfxacqi getFacing (FFF)Lnet/minecraft/unmapped/C_xpuuihxf; + ARG 0 x + ARG 1 y + ARG 2 z METHOD m_cmaqxlom byId (I)Lnet/minecraft/unmapped/C_xpuuihxf; ARG 0 id METHOD m_dfjhoqwe fromHorizontal (I)Lnet/minecraft/unmapped/C_xpuuihxf; @@ -30,12 +38,20 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction METHOD m_hntyvpnl get (Lnet/minecraft/unmapped/C_xpuuihxf$C_ozjqcgqq;Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)Lnet/minecraft/unmapped/C_xpuuihxf; ARG 0 direction ARG 1 axis + METHOD m_icbobqmt getFacing (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_xpuuihxf; + ARG 0 vec METHOD m_iuvhambs getAxis ()Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz; METHOD m_iztsoygw getUnitVector ()Lorg/joml/Vector3f; METHOD m_lxrgvhbm getOffsetY ()I + METHOD m_nmryvhog asVec3d ()Lnet/minecraft/unmapped/C_vgpupfxx; METHOD m_nyqvqnqv transform (Lorg/joml/Matrix4f;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_xpuuihxf; ARG 0 position ARG 1 direction + METHOD m_obcinsgd fromVec (IIILnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_xpuuihxf; + ARG 0 x + ARG 1 y + ARG 2 z + ARG 3 fallback METHOD m_oqyobyjy getOffsetX ()I METHOD m_osvadcjw rotateYClockwise ()Lnet/minecraft/unmapped/C_xpuuihxf; METHOD m_pbuextkm rotateCounterclockwise (Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)Lnet/minecraft/unmapped/C_xpuuihxf; @@ -51,6 +67,8 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction METHOD m_qnbvkhac getLookDirectionForAxis (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)Lnet/minecraft/unmapped/C_xpuuihxf; ARG 0 entity ARG 1 axis + METHOD m_rgctwylt fromVec (Lnet/minecraft/unmapped/C_ceivtqhh;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_xpuuihxf; + ARG 0 vec METHOD m_rybsiiha getName ()Ljava/lang/String; METHOD m_rzedosik from (Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;Lnet/minecraft/unmapped/C_xpuuihxf$C_ozjqcgqq;)Lnet/minecraft/unmapped/C_xpuuihxf; ARG 0 axis @@ -59,6 +77,7 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction ARG 0 entity METHOD m_ucwgyusq getShuffledDirections (Lnet/minecraft/unmapped/C_rlomrsco;)Ljava/util/Collection; ARG 0 random + METHOD m_uinacubi asVec3i ()Lnet/minecraft/unmapped/C_ceivtqhh; METHOD m_veocfmwg pointsTo (F)Z COMMENT {@return whether the given yaw points to the direction} COMMENT @@ -67,6 +86,8 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction COMMENT

This always returns {@code false} for vertical directions. ARG 1 yaw METHOD m_vyhskrab getOffsetZ ()I + METHOD m_vzfadujr getHorizontalDegrees (Lnet/minecraft/unmapped/C_xpuuihxf;)F + COMMENT Gets the degrees of the {@code direction}, relative to {@link Direction#SOUTH} METHOD m_wstyzrap (Lnet/minecraft/unmapped/C_xpuuihxf;)I ARG 0 direction METHOD m_xwgdebbi getRotationQuaternion ()Lorg/joml/Quaternionf; @@ -103,10 +124,13 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction ARG 0 name METHOD m_jwnubmio isVertical ()Z METHOD m_qewftacv getName ()Ljava/lang/String; + METHOD m_symjvdwr getDirections ()[Lnet/minecraft/unmapped/C_xpuuihxf; + METHOD m_uhgjjbza getPositive ()Lnet/minecraft/unmapped/C_xpuuihxf; METHOD m_vfobospg choose (III)I ARG 1 x ARG 2 y ARG 3 z + METHOD m_wxwlsnud getNegative ()Lnet/minecraft/unmapped/C_xpuuihxf; METHOD m_xfsvouev isHorizontal ()Z METHOD m_xipigoyp pickRandomAxis (Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz; ARG 0 random diff --git a/mappings/net/minecraft/util/shape/VoxelShape.mapping b/mappings/net/minecraft/util/shape/VoxelShape.mapping index ef33707049..951b6538e4 100644 --- a/mappings/net/minecraft/util/shape/VoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShape.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/unmapped/C_zscvhwbd net/minecraft/util/shape/VoxelShape FIELD f_uodkcxwt voxels Lnet/minecraft/unmapped/C_bipoyzjn; METHOD (Lnet/minecraft/unmapped/C_bipoyzjn;)V ARG 1 voxels + METHOD m_afxwtvim offset (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_zscvhwbd; + ARG 1 vec METHOD m_ebbqnisg raycast (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jdakttms; ARG 1 start ARG 2 end @@ -11,6 +13,7 @@ CLASS net/minecraft/unmapped/C_zscvhwbd net/minecraft/util/shape/VoxelShape ARG 1 axis METHOD m_evzrivct forEachBox (Lnet/minecraft/unmapped/C_dodusopt$C_spddrqcv;)V ARG 1 consumer + METHOD m_eziwunlj isSquareOn (Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)Z METHOD m_fbshlppi getFace (Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_zscvhwbd; ARG 1 facing METHOD m_glpbrbos (Lnet/minecraft/unmapped/C_dodusopt$C_spddrqcv;IIIIII)V @@ -28,8 +31,13 @@ CLASS net/minecraft/unmapped/C_zscvhwbd net/minecraft/util/shape/VoxelShape ARG 1 axis ARG 2 from ARG 4 to + METHOD m_ktlmojoe isCube ()Z METHOD m_mltevqes getPointPositions (Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)Lit/unimi/dsi/fastutil/doubles/DoubleList; ARG 1 axis + METHOD m_nxfuxmhj offset (DDD)Lnet/minecraft/unmapped/C_zscvhwbd; + ARG 1 x + ARG 3 y + ARG 5 z METHOD m_nzndbnrv calculateMaxDistance (Lnet/minecraft/unmapped/C_ryiuicpl;Lnet/minecraft/unmapped/C_hbcjzgoe;D)D ARG 1 axisCycle ARG 2 box From f6df2d1ce6d0601b6615f887e922b7ea3ec19567 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Tue, 15 Oct 2024 20:38:30 -0500 Subject: [PATCH 02/24] some progress --- .../minecraft/entity/ElytraAnimationState.mapping | 13 +++++++++++++ mappings/net/minecraft/entity/Entity.mapping | 7 +++++++ mappings/net/minecraft/entity/LimbData.mapping | 3 +++ mappings/net/minecraft/entity/LivingEntity.mapping | 2 ++ 4 files changed, 25 insertions(+) create mode 100644 mappings/net/minecraft/entity/ElytraAnimationState.mapping diff --git a/mappings/net/minecraft/entity/ElytraAnimationState.mapping b/mappings/net/minecraft/entity/ElytraAnimationState.mapping new file mode 100644 index 0000000000..6eaf38397b --- /dev/null +++ b/mappings/net/minecraft/entity/ElytraAnimationState.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/unmapped/C_raqyxzkb net/minecraft/entity/ElytraAnimationState + FIELD f_abffbhoa yaw F + FIELD f_cqtoagfd DEFAULT_PITCH F + FIELD f_euxkgdhp roll F + FIELD f_gtjjiatm lastRoll F + FIELD f_mqktoujp lastPitch F + FIELD f_ondamjfd lastYaw F + FIELD f_tvmvorkj DEFAULT_ROLL F + FIELD f_yerwbabc pitch F + METHOD m_hbtboris getRoll (F)F + METHOD m_krukcnbc getYaw (F)F + METHOD m_srnvybfn getPitch (F)F + METHOD m_vqxiufsb tick ()V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index e311b0600c..f87b77b108 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -339,6 +339,9 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_fqsmgmzi setMovementMultiplier (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_vgpupfxx;)V ARG 1 state ARG 2 multiplier + METHOD m_fuenwjjy damage (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z + ARG 2 source + ARG 3 amount METHOD m_fymcirnf setCustomName (Lnet/minecraft/unmapped/C_rdaqiwdt;)V ARG 1 name METHOD m_fzshfvfl isSprinting ()Z @@ -433,6 +436,8 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 1 cooldown METHOD m_imqrqpcf getRotationVec (F)Lnet/minecraft/unmapped/C_vgpupfxx; ARG 1 tickDelta + METHOD m_ioabfmzu damageSided (Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z + ARG 1 source METHOD m_iohdoxun teleportPassengers ()V METHOD m_iqvzwgkr canModifyAt (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)Z ARG 2 pos @@ -443,6 +448,8 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 2 damageMultiplier ARG 3 damageSource METHOD m_jaflucyh canSprintAsVehicle ()Z + METHOD m_jaiycnbg damageClient (Lnet/minecraft/unmapped/C_sbxfkpyv;)Z + ARG 1 source METHOD m_jfqciigr hasCollidedSoftly (Lnet/minecraft/unmapped/C_vgpupfxx;)Z ARG 1 adjustedMovement METHOD m_jjhhwbds updateDynamicGameEventListener (Ljava/util/function/BiConsumer;)V diff --git a/mappings/net/minecraft/entity/LimbData.mapping b/mappings/net/minecraft/entity/LimbData.mapping index 1e799fbd4b..7fdff120f5 100644 --- a/mappings/net/minecraft/entity/LimbData.mapping +++ b/mappings/net/minecraft/entity/LimbData.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/unmapped/C_okagbxbh net/minecraft/entity/LimbData + FIELD f_gxxxtoep scale F FIELD f_phygrlmu oldLimbDistance F FIELD f_rwiixyou totalLimbDistance F FIELD f_tvhydwyb limbDistance F @@ -12,5 +13,7 @@ CLASS net/minecraft/unmapped/C_okagbxbh net/minecraft/entity/LimbData METHOD m_ojyzwoun updateLimbs (FFF)V ARG 1 limbDistance ARG 2 delta + ARG 3 scale METHOD m_zhsfjxjq getLimbDistance (F)F ARG 1 tickDelta + METHOD m_ztvseqvg reset ()V diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 246134634e..91f31f1c65 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -3,7 +3,9 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity FIELD f_asrrjfdz attributes Lnet/minecraft/unmapped/C_cohbwqne; FIELD f_atqwrmrh lastDamageTaken F FIELD f_avsswxpi ELYTRA_DAMAGE_PER_FREE_FALL_TICKS I + FIELD f_aydtoono elytraState Lnet/minecraft/unmapped/C_raqyxzkb; FIELD f_bwbjmspv DAMAGE_SOURCE_TIMEOUT I + FIELD f_chuibjnv PLAYER_NOT_WEARING_GAZE_DISGUISE Ljava/util/function/Predicate; FIELD f_coityhpi jumping Z FIELD f_dddwkxrr bodyArmor Lnet/minecraft/unmapped/C_sddaxwyk; FIELD f_debofomg riptideTicks I From cf449b692f6f744872aad00584c40b5e8e3c30b1 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Wed, 16 Oct 2024 21:40:23 -0500 Subject: [PATCH 03/24] more progress! --- mappings/net/minecraft/entity/Entity.mapping | 23 +++++++++++++++++++ .../net/minecraft/util/math/BlockPos.mapping | 2 ++ mappings/net/minecraft/util/math/Box.mapping | 23 +++++++++++++++++++ .../net/minecraft/world/BlockView.mapping | 10 ++++++++ 4 files changed, 58 insertions(+) diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index f87b77b108..cc500748ae 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity FIELD f_crrlnxqg age I FIELD f_csywjyej velocityModified Z FIELD f_ctqyfogx renderDistanceMultiplier D + FIELD f_czyqvinj wasOnFire Z FIELD f_dirooojo chunkPos Lnet/minecraft/unmapped/C_ynrszrtu; FIELD f_doofwhhb pos Lnet/minecraft/unmapped/C_vgpupfxx; FIELD f_euemepwt FALL_FLYING_FLAG_INDEX I @@ -120,6 +121,8 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD m_aageeeod emitEffectsFromStep (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;ZZLnet/minecraft/unmapped/C_vgpupfxx;)Z + ARG 1 resultPos + ARG 2 resultState ARG 3 emitStepSounds ARG 4 emitStepEvent ARG 5 movement @@ -192,6 +195,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 1 pos ARG 2 yaw ARG 3 pitch + METHOD m_cgrdsanb createCommandSource (Lnet/minecraft/unmapped/C_bdwnwhiu;)Lnet/minecraft/unmapped/C_pennblrk; METHOD m_chpxygjr shouldSpawnSprintingParticles ()Z METHOD m_cizdqdzz addVelocity (DDD)V ARG 1 deltaX @@ -231,6 +235,11 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 1 portalAxis ARG 2 portalRect METHOD m_dphgtkki isSwimming ()Z + METHOD m_dqfiukfz applyMoveEffect (Lnet/minecraft/unmapped/C_astfners$C_tcfxsqwc;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V + ARG 1 effect + ARG 2 movement + ARG 3 resultPos + ARG 4 resultState METHOD m_dqqvhtsj setSneaking (Z)V ARG 1 sneaking METHOD m_dsagprus getRotationVector ()Lnet/minecraft/unmapped/C_vgpupfxx; @@ -415,6 +424,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 1 sound COMMENT the sound to play METHOD m_hvxlsjsw getFrozenTicks ()I + METHOD m_hwaiduvv applyBlockCollisionEffects ()V METHOD m_hxboixtd isInsideBubbleColumn ()Z METHOD m_hzdsqmkj getLandingPosition ()Lnet/minecraft/unmapped/C_hynzadkk; METHOD m_iadcwgxh updateWaterState ()Z @@ -442,6 +452,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_iqvzwgkr canModifyAt (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)Z ARG 2 pos METHOD m_iseshnfi isSpectator ()Z + METHOD m_iybimkec shouldApplyBlockCollisionEffects ()Z METHOD m_iznakrow removeFromDimension ()V METHOD m_izrsdktf handleFallDamage (FFLnet/minecraft/unmapped/C_sbxfkpyv;)Z ARG 1 fallDistance @@ -493,6 +504,11 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 1 killer ARG 2 score ARG 3 damageSource + METHOD m_ksoidzkr collides (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_zscvhwbd;)Z + ARG 1 oldPos + ARG 2 newPos + ARG 3 shapeOffset + ARG 4 shape METHOD m_kvelccqq applyMirror (Lnet/minecraft/unmapped/C_qomzaqud;)F ARG 1 mirror METHOD m_kvxkjouy setFireTicks (I)V @@ -537,6 +553,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_mdjbjjrz getServer ()Lnet/minecraft/server/MinecraftServer; METHOD m_mhvikmsw isPushedByFluids ()Z METHOD m_migwxxyu setOnGround (ZZLnet/minecraft/unmapped/C_vgpupfxx;)V + ARG 2 horizontalCollision METHOD m_mnshvqhc getLerpedEyePos (F)Lnet/minecraft/unmapped/C_vgpupfxx; ARG 1 tickDelta METHOD m_mrxmgxtb kill (Lnet/minecraft/unmapped/C_bdwnwhiu;)V @@ -673,6 +690,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 1 destX ARG 3 destY ARG 5 destZ + METHOD m_qkqqfrjy getLastPos ()Lnet/minecraft/unmapped/C_vgpupfxx; METHOD m_qmsqmnke doesRenderOnFire ()Z METHOD m_qoreltrp getFreezingScale ()F METHOD m_qpmhbrns extinguishWithEffects ()V @@ -805,6 +823,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 1 entity METHOD m_uvsfzohj handleAttack (Lnet/minecraft/unmapped/C_astfners;)Z ARG 1 attacker + METHOD m_uwlubbjx isControlledByPlayer ()Z METHOD m_vbxcqznf adjustSingleAxisMovementForCollisions (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_hbcjzgoe;Lnet/minecraft/unmapped/C_cdctfzbn;Ljava/util/List;)Lnet/minecraft/unmapped/C_vgpupfxx; ARG 0 entity ARG 1 movement @@ -861,6 +880,9 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 1 x ARG 3 y ARG 5 z + METHOD m_wcqnvmmu applyBlockCollisionEffects (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;)V + ARG 1 lastPos + ARG 2 pos METHOD m_wczujasu canFreeze ()Z METHOD m_wfjjffoz emitGameEvent (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_astfners;)V ARG 1 event @@ -962,6 +984,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_zcvlfcid move (Lnet/minecraft/unmapped/C_eojqvxuw;Lnet/minecraft/unmapped/C_vgpupfxx;)V ARG 1 movementType ARG 2 movement + METHOD m_zgdobmyk isOrControlledByLogicalPlayer ()Z METHOD m_zgonvdqc extinguish ()V METHOD m_zhcmfcni setSprinting (Z)V ARG 1 sprinting diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index f105a60699..e2bb7dc5a9 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -53,6 +53,8 @@ CLASS net/minecraft/unmapped/C_hynzadkk net/minecraft/util/math/BlockPos ARG 4 predicate METHOD m_elynlcyj unpackLongY (J)I ARG 0 packedPos + METHOD m_fkelicrp iterate (Lnet/minecraft/unmapped/C_hbcjzgoe;)Ljava/lang/Iterable; + ARG 0 box METHOD m_ibctoofh unpackLongZ (J)I ARG 0 packedPos METHOD m_jscknakh streamOutwards (Lnet/minecraft/unmapped/C_hynzadkk;III)Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/util/math/Box.mapping b/mappings/net/minecraft/util/math/Box.mapping index 9eba7446ba..63af17e9f4 100644 --- a/mappings/net/minecraft/util/math/Box.mapping +++ b/mappings/net/minecraft/util/math/Box.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/unmapped/C_hbcjzgoe net/minecraft/util/math/Box METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD m_armyzcig getZLength ()D + METHOD m_cappoqdf getMinPos ()Lnet/minecraft/unmapped/C_vgpupfxx; METHOD m_earezljt getAverageSideLength ()D METHOD m_emgqmgbh raycast (Ljava/lang/Iterable;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jdakttms; ARG 0 boxes @@ -42,6 +43,7 @@ CLASS net/minecraft/unmapped/C_hbcjzgoe net/minecraft/util/math/Box ARG 1 to METHOD m_hagzytre from (Lnet/minecraft/unmapped/C_hmqypqzz;)Lnet/minecraft/unmapped/C_hbcjzgoe; ARG 0 mutable + METHOD m_hicseajv getMaxPos ()Lnet/minecraft/unmapped/C_vgpupfxx; METHOD m_hwfgvpmt contract (D)Lnet/minecraft/unmapped/C_hbcjzgoe; COMMENT @see #expand(double) ARG 1 value @@ -131,6 +133,9 @@ CLASS net/minecraft/unmapped/C_hbcjzgoe net/minecraft/util/math/Box METHOD m_qawrpvjc contains (Lnet/minecraft/unmapped/C_vgpupfxx;)Z COMMENT Checks if the given position is in this box. ARG 1 pos + METHOD m_qikitayk collides (Lnet/minecraft/unmapped/C_vgpupfxx;Ljava/util/List;)Z + ARG 1 offset + ARG 2 boxes METHOD m_rkqksbvs getMin (Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)D ARG 1 axis METHOD m_rptaaemx of (Lnet/minecraft/unmapped/C_vgpupfxx;DDD)Lnet/minecraft/unmapped/C_hbcjzgoe; @@ -147,10 +152,14 @@ CLASS net/minecraft/unmapped/C_hbcjzgoe net/minecraft/util/math/Box COMMENT corners. ARG 1 pos1 ARG 2 pos2 + METHOD m_ttpbzbdo traceCollisionSide (Lnet/minecraft/unmapped/C_hbcjzgoe;Lnet/minecraft/unmapped/C_vgpupfxx;[DLnet/minecraft/unmapped/C_xpuuihxf;DDD)Lnet/minecraft/unmapped/C_xpuuihxf; + ARG 0 box METHOD m_uegujhig withMinZ (D)Lnet/minecraft/unmapped/C_hbcjzgoe; COMMENT Creates a box with the minimum Z provided and all other coordinates COMMENT of this box. ARG 1 minZ + METHOD m_uquuyker raycast (DDDDDDLnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;)Ljava/util/Optional; + ARG 13 end METHOD m_utbwwbwl squaredMagnitude (Lnet/minecraft/unmapped/C_vgpupfxx;)D ARG 1 vec METHOD m_uzekxbgu withMaxX (D)Lnet/minecraft/unmapped/C_hbcjzgoe; @@ -172,6 +181,19 @@ CLASS net/minecraft/unmapped/C_hbcjzgoe net/minecraft/util/math/Box METHOD m_wsmxurzz expand (D)Lnet/minecraft/unmapped/C_hbcjzgoe; COMMENT @see #contract(double) ARG 1 value + METHOD m_wywdjpzc traceCollisionSide (DDDDDDLnet/minecraft/unmapped/C_vgpupfxx;[DLnet/minecraft/unmapped/C_xpuuihxf;DDD)Lnet/minecraft/unmapped/C_xpuuihxf; + ARG 0 minX + ARG 2 minY + ARG 4 minZ + ARG 6 maxX + ARG 8 maxY + ARG 10 maxZ + ARG 12 start + ARG 13 traceDistanceResult + ARG 14 direction + ARG 15 deltaX + ARG 17 deltaY + ARG 19 deltaZ METHOD m_xejolzay offset (DDD)Lnet/minecraft/unmapped/C_hbcjzgoe; COMMENT Creates a box that is translated by {@code x}, {@code y}, {@code z} on COMMENT each axis from this box. @@ -184,3 +206,4 @@ CLASS net/minecraft/unmapped/C_hbcjzgoe net/minecraft/util/math/Box ARG 1 maxY METHOD m_zmkdorxa getMax (Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)D ARG 1 axis + METHOD m_zpsbullj getBottomCenter ()Lnet/minecraft/unmapped/C_vgpupfxx; diff --git a/mappings/net/minecraft/world/BlockView.mapping b/mappings/net/minecraft/world/BlockView.mapping index 587b3b8ea5..747f8ca4a0 100644 --- a/mappings/net/minecraft/world/BlockView.mapping +++ b/mappings/net/minecraft/world/BlockView.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/unmapped/C_peaveboq net/minecraft/world/BlockView COMMENT Represents a scoped, read-only view of block states, fluid states and block entities. + FIELD f_evjnqixv MAX_BLOCK_ITERATIONS_COLLECTING_COLLISIONS I METHOD m_bwuplpck (Lnet/minecraft/unmapped/C_rvvvywqd;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jdakttms; ARG 1 context ARG 2 pos @@ -7,6 +8,11 @@ CLASS net/minecraft/unmapped/C_peaveboq net/minecraft/world/BlockView ARG 0 context METHOD m_cwgupilf getBlockState (Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_txtbiemp; ARG 1 pos + METHOD m_futnjlxi collectCollisions (Ljava/util/Set;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_hbcjzgoe;)V + ARG 0 result + ARG 1 startPos + ARG 2 endPos + ARG 3 box METHOD m_gpwzkbdj raycast (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;Ljava/lang/Object;Ljava/util/function/BiFunction;Ljava/util/function/Function;)Ljava/lang/Object; ARG 0 start ARG 1 end @@ -42,5 +48,9 @@ CLASS net/minecraft/unmapped/C_peaveboq net/minecraft/world/BlockView ARG 1 context METHOD m_ynqagjmo (Lnet/minecraft/unmapped/C_rvvvywqd;)Lnet/minecraft/unmapped/C_jdakttms; ARG 0 context + METHOD m_znghthms collectCollisions (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_hbcjzgoe;)Ljava/lang/Iterable; + ARG 0 startPos + ARG 1 endPos + ARG 2 box METHOD m_zqixworh getStatesInBox (Lnet/minecraft/unmapped/C_hbcjzgoe;)Ljava/util/stream/Stream; ARG 1 box From de14456626836d9c8ffcd02d1885c6486938213a Mon Sep 17 00:00:00 2001 From: ix0rai Date: Thu, 17 Oct 2024 17:29:20 -0500 Subject: [PATCH 04/24] `Entity` class fully mapped! --- .../net/minecraft/block/AbstractBlock.mapping | 2 + mappings/net/minecraft/entity/Entity.mapping | 38 ++++++++++++++++++- .../minecraft/entity/EntityPosition.mapping | 14 +++++++ .../net/minecraft/entity/PositionFlag.mapping | 5 +++ .../entity/vehicle/ChestRaftEntity.mapping | 1 + .../listener/ClientPlayPacketListener.mapping | 4 +- .../EntityPositionUpdateS2CPacket.mapping | 6 +-- .../s2c/play/EntityTeleportS2CPacket.mapping | 5 +++ .../network/ServerPlayNetworkHandler.mapping | 3 ++ .../world/entity/TeleportTarget.mapping | 20 ++++++++++ .../world/explosion/Explosion.mapping | 7 ++++ 11 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 mappings/net/minecraft/entity/EntityPosition.mapping create mode 100644 mappings/net/minecraft/entity/PositionFlag.mapping create mode 100644 mappings/net/minecraft/entity/vehicle/ChestRaftEntity.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/EntityTeleportS2CPacket.mapping create mode 100644 mappings/net/minecraft/world/entity/TeleportTarget.mapping diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 7aaea64f00..817804ad35 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -60,6 +60,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock ARG 4 context METHOD m_fsimvkxt getCullingShape (Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_zscvhwbd; ARG 1 state + METHOD m_fwpxnldx getInsideCollisionShape (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd; METHOD m_gzvkqagj createScreenHandlerFactory (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_soxpxdhu; ARG 1 state ARG 2 world @@ -338,6 +339,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock ARG 1 block COMMENT the block instance to match METHOD m_geunkiif hasModelOffset ()Z + METHOD m_hhjvgbvf getInsideCollisionShape (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd; METHOD m_hndkckmc spawnsDustParticles ()Z METHOD m_hnwtgjio streamTags ()Ljava/util/stream/Stream; COMMENT {@return a stream of tag keys this block is in} diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index cc500748ae..086f8070ac 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -126,7 +126,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 3 emitStepSounds ARG 4 emitStepEvent ARG 5 movement - METHOD m_aasyvbgj (FF)V + METHOD m_aasyvbgj rotate (FF)V ARG 1 pitch ARG 2 yaw METHOD m_acgnvjmq isTeammate (Lnet/minecraft/unmapped/C_astfners;)Z @@ -146,6 +146,8 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 4 blockState ARG 5 fluidState ARG 6 max + METHOD m_akwsfvdx setPrevPos (Lnet/minecraft/unmapped/C_vgpupfxx;)V + ARG 1 pos METHOD m_almiwujd isInLava ()Z METHOD m_arkgrfeb tick ()V METHOD m_ashzovao canAcceptPassenger ()Z @@ -161,6 +163,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity COMMENT @implSpec This implementation expands this entity's bounding box by 1 in COMMENT each axis and checks whether the expanded box's smallest enclosing COMMENT axis-aligned integer box is fully loaded in the world. + METHOD m_beudeczo getLerpedPitch (F)F METHOD m_bibfwntw adjustMovementForSneaking (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_eojqvxuw;)Lnet/minecraft/unmapped/C_vgpupfxx; ARG 1 movement ARG 2 type @@ -197,6 +200,9 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 3 pitch METHOD m_cgrdsanb createCommandSource (Lnet/minecraft/unmapped/C_bdwnwhiu;)Lnet/minecraft/unmapped/C_pennblrk; METHOD m_chpxygjr shouldSpawnSprintingParticles ()Z + METHOD m_ciiyibaw getPassengerTeleportTarget (Lnet/minecraft/unmapped/C_sqhjwpkh;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_sqhjwpkh; + ARG 1 mainTarget + ARG 2 passenger METHOD m_cizdqdzz addVelocity (DDD)V ARG 1 deltaX ARG 3 deltaY @@ -207,6 +213,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 0 vehicle ARG 1 passenger ARG 2 attachments + METHOD m_ckvztyll isOnSameTeam (Lnet/minecraft/unmapped/C_astfners;)Z METHOD m_clvtkwyd setFlag (IZ)V ARG 1 index ARG 2 value @@ -227,6 +234,8 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_cwblvmlg tickNetherPortalCooldown ()V METHOD m_czllkfyu isLogicalSideForUpdatingMovement ()Z METHOD m_daozjmru stopRiding ()V + METHOD m_deqvawon teleport (Lnet/minecraft/unmapped/C_bdwnwhiu;DDDLjava/util/Set;FFZ)Z + ARG 11 resetCamera METHOD m_dgesbqpr calculateDimensions ()V METHOD m_dlwxaobh getRandom ()Lnet/minecraft/unmapped/C_rlomrsco; METHOD m_dmqmmjta getWidth ()F @@ -294,6 +303,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 3 pos ARG 4 state ARG 5 explosionPower + METHOD m_erhomtwv setPosition (Lnet/minecraft/unmapped/C_dxakxzow;Ljava/util/Set;)V METHOD m_etjezvwe getHoverEvent ()Lnet/minecraft/unmapped/C_qhrnrrcp; METHOD m_exebbkmr addAirTravelEffects ()V COMMENT Adds the effects of this entity when it travels in air, usually to the @@ -391,6 +401,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_hehkhdfc isFrozen ()Z METHOD m_hhmmivsh tryTickInVoid ()V METHOD m_hhwoykag calculateNextStepSoundDistance ()F + METHOD m_hhwtkfxu setPrevPosAndAngles ()V METHOD m_hisokqyg setOnFireFor (I)V ARG 1 ticks METHOD m_hjjjfrzw getScoreboardTeam ()Lnet/minecraft/unmapped/C_dvkwmbxw; @@ -488,6 +499,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_jvbeeoym getDefaultName ()Lnet/minecraft/unmapped/C_rdaqiwdt; METHOD m_jvhgezub remove (Lnet/minecraft/unmapped/C_astfners$C_emmohndu;)V ARG 1 reason + METHOD m_kashyvjh setPrevAngles ()V METHOD m_kcqonvtd pushOutOfBlocks (DDD)V ARG 1 x ARG 3 y @@ -517,6 +529,8 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_lajughou getLootTable ()Ljava/util/Optional; METHOD m_lfjmpwyp hasPlayerRider ()Z METHOD m_lfpuwmgu removeAllPassengers ()V + METHOD m_lgldilrg sendPassengerTeleportPackets (Lnet/minecraft/unmapped/C_sqhjwpkh;)V + ARG 1 target METHOD m_lgmmhwrc hasPassenger (Lnet/minecraft/unmapped/C_astfners;)Z ARG 1 passenger METHOD m_lhatfyyd getBlockStateAtPos ()Lnet/minecraft/unmapped/C_txtbiemp; @@ -542,6 +556,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 2 offsetFactor METHOD m_lwugwlsw initDataTracker (Lnet/minecraft/unmapped/C_pyoaoolj$C_oqzxcugu;)V ARG 1 builder + METHOD m_lxlqiklm cancelLerp ()V METHOD m_lygmgdif getHoldingItemAngle (Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_vgpupfxx; ARG 1 item METHOD m_lytsaqwc resetNetherPortalCooldown ()V @@ -549,11 +564,16 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_lzpwoeto updateSwimming ()V METHOD m_mbesepaz isInvisibleTo (Lnet/minecraft/unmapped/C_jzrpycqo;)Z ARG 1 player + METHOD m_mcdfsxav teleport (Lnet/minecraft/unmapped/C_sqhjwpkh;)Lnet/minecraft/unmapped/C_astfners; + ARG 1 target METHOD m_mcimzscq setOnFireFromLava ()V METHOD m_mdjbjjrz getServer ()Lnet/minecraft/server/MinecraftServer; METHOD m_mhvikmsw isPushedByFluids ()Z METHOD m_migwxxyu setOnGround (ZZLnet/minecraft/unmapped/C_vgpupfxx;)V ARG 2 horizontalCollision + METHOD m_misouebt canTeleportBetween (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_cdctfzbn;)Z + ARG 1 from + ARG 2 to METHOD m_mnshvqhc getLerpedEyePos (F)Lnet/minecraft/unmapped/C_vgpupfxx; ARG 1 tickDelta METHOD m_mrxmgxtb kill (Lnet/minecraft/unmapped/C_bdwnwhiu;)V @@ -713,9 +733,12 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 1 pos ARG 2 state METHOD m_roxbbrfe getMovement ()Lnet/minecraft/unmapped/C_vgpupfxx; + METHOD m_rqhapnud isAlwaysInvulnerableTo (Lnet/minecraft/unmapped/C_sbxfkpyv;)Z + ARG 1 source METHOD m_rrlohuwe getBlockY ()I METHOD m_rrtmyzpv writeNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_hhlwcnih; ARG 1 nbt + METHOD m_rtigrevq setPrevPosAndAngles (Lnet/minecraft/unmapped/C_vgpupfxx;FF)V METHOD m_ruylcvxe getBurningDuration ()I METHOD m_rwwlsvsi getPitch (F)F ARG 1 tickDelta @@ -732,6 +755,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 1 values METHOD m_ryyntoxx getStepHeight ()F METHOD m_sciubbmh getStandingEyeHeight ()F + METHOD m_scrtnsdg canPlayLavaBurnSound ()Z METHOD m_sdtijuxq getPacketPositionCodec ()Lnet/minecraft/unmapped/C_kfofqpqr; METHOD m_sflppqpo limitFallDistance ()V METHOD m_shlbgxdt saveSelfNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Z @@ -747,6 +771,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 1 invisible METHOD m_srxowajy adjustMovementForCollisions (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_vgpupfxx; ARG 1 movement + METHOD m_stcixbth getLerpedYaw (F)F METHOD m_swzplugo canStartRiding (Lnet/minecraft/unmapped/C_astfners;)Z ARG 1 entity METHOD m_szxeksnh damage (Lnet/minecraft/unmapped/C_sbxfkpyv;F)V @@ -770,6 +795,8 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity COMMENT This is only called when the entity {@linkplain #hasWings() has wings} COMMENT and the entity {@linkplain #getMoveEffect() has any move effect}, from COMMENT {@link #addAirTravelEffects()}. + METHOD m_tjgpdfoe teleportCrossDimension (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sqhjwpkh;)Lnet/minecraft/unmapped/C_astfners; + ARG 2 target METHOD m_tjhbdkij isBeingRainedOn ()Z METHOD m_ttjwufim getY ()D METHOD m_ttlohclp isGlowing ()Z @@ -899,6 +926,9 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_wjodonhd isInvisible ()Z METHOD m_wkqvrgdz canAddPassenger (Lnet/minecraft/unmapped/C_astfners;)Z ARG 1 passenger + METHOD m_wmrqudhe checkBlockCollisions (Ljava/util/List;Ljava/util/Set;)V + ARG 1 collisionChecks + ARG 2 collidedBlocks METHOD m_wmxlrpiw getPos ()Lnet/minecraft/unmapped/C_vgpupfxx; COMMENT {@return the position in the world of this entity} METHOD m_wnmvwdkc playSwimSound ()V @@ -915,6 +945,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_xelmhfxy onBubbleColumnCollision (Z)V ARG 1 drag METHOD m_xfogfxdp isInsideWall ()Z + METHOD m_xgebmwpj setPrevPos ()V METHOD m_xoeeitpc dismountsUnderwater ()Z METHOD m_xoogehdd getYaw (F)F ARG 1 tickDelta @@ -998,6 +1029,11 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity ARG 2 interpolationSteps METHOD m_zoivpnyj getAttachments ()Lnet/minecraft/unmapped/C_pubtmkke; METHOD m_zrismnrd checkWaterState ()V + METHOD m_zskfvtfy setPrevAngles (FF)V + ARG 1 yaw + ARG 2 pitch + METHOD m_zvtbefqn teleportSameDimension (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sqhjwpkh;)Lnet/minecraft/unmapped/C_astfners; + ARG 2 target CLASS C_aipuagbw Movement CLASS C_aobkcgmf PositionUpdater METHOD accept (Lnet/minecraft/unmapped/C_astfners;DDD)V diff --git a/mappings/net/minecraft/entity/EntityPosition.mapping b/mappings/net/minecraft/entity/EntityPosition.mapping new file mode 100644 index 0000000000..20c29d218c --- /dev/null +++ b/mappings/net/minecraft/entity/EntityPosition.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/unmapped/C_dxakxzow net/minecraft/entity/EntityPosition + METHOD m_axgndomh calculateAbsolute (Lnet/minecraft/unmapped/C_dxakxzow;Lnet/minecraft/unmapped/C_dxakxzow;Ljava/util/Set;)Lnet/minecraft/unmapped/C_dxakxzow; + ARG 0 oldPos + ARG 1 newPos + ARG 2 flags + METHOD m_ayjmwjtl combineIfPresent (DDLjava/util/Set;Lnet/minecraft/unmapped/C_crougwaz;)D + ARG 0 value1 + ARG 2 value2 + ARG 4 flags + ARG 5 checkedFlag + METHOD m_scijksjb createFromLerpTarget (Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_dxakxzow; + METHOD m_ttkambna create (Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_dxakxzow; + METHOD m_xwawuwvz create (Lnet/minecraft/unmapped/C_sqhjwpkh;)Lnet/minecraft/unmapped/C_dxakxzow; + ARG 0 target diff --git a/mappings/net/minecraft/entity/PositionFlag.mapping b/mappings/net/minecraft/entity/PositionFlag.mapping new file mode 100644 index 0000000000..093ee53fd6 --- /dev/null +++ b/mappings/net/minecraft/entity/PositionFlag.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/unmapped/C_crougwaz net/minecraft/entity/PositionFlag + FIELD f_kgzcwlaw ROTATION Ljava/util/Set; + FIELD f_xilpqumj id I + FIELD f_xthkdyos VALUES Ljava/util/Set; + FIELD f_xyfjsrdy DELTA Ljava/util/Set; diff --git a/mappings/net/minecraft/entity/vehicle/ChestRaftEntity.mapping b/mappings/net/minecraft/entity/vehicle/ChestRaftEntity.mapping new file mode 100644 index 0000000000..01fcc820ea --- /dev/null +++ b/mappings/net/minecraft/entity/vehicle/ChestRaftEntity.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_bujylnzi net/minecraft/entity/vehicle/ChestRaftEntity diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index 9fbb3ad931..cc0fd39f1f 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -40,6 +40,8 @@ CLASS net/minecraft/unmapped/C_rbfddnlp net/minecraft/network/listener/ClientPla ARG 1 packet METHOD m_exqmtpgi onBlockEntityUpdate (Lnet/minecraft/unmapped/C_knypsere;)V ARG 1 packet + METHOD m_fejagkmw onEntityPositionUpdate (Lnet/minecraft/unmapped/C_yqhgaaca;)V + ARG 1 packet METHOD m_feleozmp onEntityEvent (Lnet/minecraft/unmapped/C_uwykaorv;)V ARG 1 packet METHOD m_fhrcqnnh onChatMessage (Lnet/minecraft/unmapped/C_syaruuur;)V @@ -126,7 +128,7 @@ CLASS net/minecraft/unmapped/C_rbfddnlp net/minecraft/network/listener/ClientPla ARG 1 packet METHOD m_otouqqlf onDeathMessage (Lnet/minecraft/unmapped/C_lkozehxy;)V ARG 1 packet - METHOD m_pcurpaku onEntityPositionUpdate (Lnet/minecraft/unmapped/C_qlsxyesm;)V + METHOD m_pcurpaku onEntityTeleport (Lnet/minecraft/unmapped/C_qlsxyesm;)V ARG 1 packet METHOD m_phjtliyc onWrittenBookOpen (Lnet/minecraft/unmapped/C_jrsyoqon;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityPositionUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityPositionUpdateS2CPacket.mapping index e2f8091610..0a4c6470bd 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityPositionUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityPositionUpdateS2CPacket.mapping @@ -1,4 +1,2 @@ -CLASS net/minecraft/unmapped/C_qlsxyesm net/minecraft/network/packet/s2c/play/EntityPositionUpdateS2CPacket - FIELD f_icpacfle CODEC Lnet/minecraft/unmapped/C_qsrmwluu; - FIELD f_uxkakfmv onGround Z - FIELD f_xagqagrq id I +CLASS net/minecraft/unmapped/C_yqhgaaca net/minecraft/network/packet/s2c/play/EntityPositionUpdateS2CPacket + METHOD m_gkyxhtoe create (Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_yqhgaaca; diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityTeleportS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityTeleportS2CPacket.mapping new file mode 100644 index 0000000000..483ad976c7 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityTeleportS2CPacket.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/unmapped/C_qlsxyesm net/minecraft/network/packet/s2c/play/EntityTeleportS2CPacket + FIELD f_icpacfle CODEC Lnet/minecraft/unmapped/C_qsrmwluu; + FIELD f_uxkakfmv onGround Z + FIELD f_xagqagrq id I + METHOD m_qfxfords create (ILnet/minecraft/unmapped/C_dxakxzow;Ljava/util/Set;Z)Lnet/minecraft/unmapped/C_qlsxyesm; diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index d4a277ddc0..8be7c8768b 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -77,6 +77,7 @@ CLASS net/minecraft/unmapped/C_hwbabymg net/minecraft/server/network/ServerPlayN ARG 2 box METHOD m_mjupspsv hasInvalidCharacters (Ljava/lang/String;)Z ARG 0 string + METHOD m_movttepd handleRequestedTeleport ()Z METHOD m_nlkvqtcc syncWithPlayerPosition ()V METHOD m_nqyymdqg isMovementInvalid (DDDFF)Z COMMENT {@return whether this movement is invalid} @@ -108,6 +109,8 @@ CLASS net/minecraft/unmapped/C_hwbabymg net/minecraft/server/network/ServerPlayN ARG 1 exception METHOD m_sworheig clampVertical (D)D ARG 0 d + METHOD m_tijnjbqv shouldCheckPlayerMovement (Z)Z + ARG 1 hasElytra METHOD m_tklkmeyc canPlace (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;)Z COMMENT Checks if a player can place a block or fluid from a bucket. COMMENT diff --git a/mappings/net/minecraft/world/entity/TeleportTarget.mapping b/mappings/net/minecraft/world/entity/TeleportTarget.mapping new file mode 100644 index 0000000000..1943cd14b1 --- /dev/null +++ b/mappings/net/minecraft/world/entity/TeleportTarget.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/unmapped/C_sqhjwpkh net/minecraft/world/entity/TeleportTarget + FIELD f_abqyyxsi yaw F + FIELD f_bpwmamga pitch F + FIELD f_jibestwn ADD_PORTAL_CHUNK_TICKET Lnet/minecraft/unmapped/C_sqhjwpkh$C_saosxlyx; + FIELD f_luhevstl newWorld Lnet/minecraft/unmapped/C_bdwnwhiu; + FIELD f_uxkbpkwm SEND_PORTAL_TRAVEL_PACKET Lnet/minecraft/unmapped/C_sqhjwpkh$C_saosxlyx; + FIELD f_ywlkuzgh NO_OP Lnet/minecraft/unmapped/C_sqhjwpkh$C_saosxlyx; + METHOD m_arzblblk withRotation (FF)Lnet/minecraft/unmapped/C_sqhjwpkh; + METHOD m_bgwfddyy pitch ()F + METHOD m_dksqrdjp newWorld ()Lnet/minecraft/unmapped/C_bdwnwhiu; + METHOD m_dtmjdcdu withPosition (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_sqhjwpkh; + METHOD m_fuvyjqul create (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sqhjwpkh$C_saosxlyx;)Lnet/minecraft/unmapped/C_sqhjwpkh; + METHOD m_llmyhuae getAdjustedSpawnLocation (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_vgpupfxx; + METHOD m_ntxguczd yaw ()F + METHOD m_odkcduqq sendPortalTravelPacket (Lnet/minecraft/unmapped/C_astfners;)V + METHOD m_wgzbwrry copy ()Lnet/minecraft/unmapped/C_sqhjwpkh; + METHOD m_xxnedpaa addPortalTicket (Lnet/minecraft/unmapped/C_astfners;)V + CLASS C_saosxlyx PostTeleportTransition + METHOD then (Lnet/minecraft/unmapped/C_sqhjwpkh$C_saosxlyx;)Lnet/minecraft/unmapped/C_sqhjwpkh$C_saosxlyx; + ARG 1 transition diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping index bb4e7f4116..440e7a64c3 100644 --- a/mappings/net/minecraft/world/explosion/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -1,8 +1,15 @@ CLASS net/minecraft/unmapped/C_aahhrzpf net/minecraft/world/explosion/Explosion + METHOD m_aglpqtvb getCausingEntity (Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_usxaxydn; METHOD m_dhpfcxja getEntity ()Lnet/minecraft/unmapped/C_astfners; METHOD m_jgqsaodd getPosition ()Lnet/minecraft/unmapped/C_vgpupfxx; + METHOD m_mracoszf getWorld ()Lnet/minecraft/unmapped/C_bdwnwhiu; METHOD m_mxankppo createDamageSource (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_sbxfkpyv; ARG 1 entity METHOD m_nbqwldyc getPower ()F + METHOD m_ndwdgdks canTriggerBlocks ()Z + METHOD m_pzwvnxgx getCausingEntity ()Lnet/minecraft/unmapped/C_usxaxydn; + METHOD m_rbzkxlud shouldAffectDecorativeEntities ()Z METHOD m_vsvasiko getDestructionType ()Lnet/minecraft/unmapped/C_aahhrzpf$C_bhnzljtn; CLASS C_bhnzljtn DestructionType + FIELD f_sntaknmp affectsDecorativeEntities Z + METHOD m_wvtkcevq shouldAffectDecorativeEntities ()Z From 742dad74033c2988bc8ec063df927b58873255bb Mon Sep 17 00:00:00 2001 From: ix0rai Date: Thu, 17 Oct 2024 19:49:22 -0500 Subject: [PATCH 05/24] update --- .../minecraft/component/type/EquippableComponent.mapping | 1 + mappings/net/minecraft/entity/LivingEntity.mapping | 8 ++++++++ mappings/net/minecraft/entity/mob/Angerable.mapping | 1 + 3 files changed, 10 insertions(+) create mode 100644 mappings/net/minecraft/component/type/EquippableComponent.mapping diff --git a/mappings/net/minecraft/component/type/EquippableComponent.mapping b/mappings/net/minecraft/component/type/EquippableComponent.mapping new file mode 100644 index 0000000000..a899603ba1 --- /dev/null +++ b/mappings/net/minecraft/component/type/EquippableComponent.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_duiqsjgf net/minecraft/component/type/EquippableComponent diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 91f31f1c65..36de42cd51 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -213,6 +213,8 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity METHOD m_fqffmeys setAttacker (Lnet/minecraft/unmapped/C_usxaxydn;)V ARG 1 attacker METHOD m_fqywfcul clearActiveItem ()V + METHOD m_fruafpue onEffectsRemoved (Ljava/util/Collection;)V + ARG 1 effects METHOD m_fvvkbcbd setPotionSwirls ()V METHOD m_fyloosbv updateGlowing ()V METHOD m_gbfixjfm updateAttribute (Lnet/minecraft/unmapped/C_cjzoxshv;)V @@ -320,6 +322,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity METHOD m_ktkvypgf enterCombat ()V METHOD m_kwjgylty swimUpward (Lnet/minecraft/unmapped/C_ednuhnnn;)V ARG 1 tag + METHOD m_lazolqzm canTarget (Lnet/minecraft/unmapped/C_usxaxydn;)Z METHOD m_lbpuzdpj getLocationBasedEnchantmentEffects (Lnet/minecraft/unmapped/C_yuycoehb;)Ljava/util/Map; METHOD m_ldeqpsrz canDisableShield ()Z METHOD m_lgbaiieb slotEmitsEquipEvent (Lnet/minecraft/unmapped/C_yuycoehb;)Z @@ -335,6 +338,8 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity ARG 1 hand ARG 2 fromServerPlayer METHOD m_lrhbwltd getActiveItem ()Lnet/minecraft/unmapped/C_sddaxwyk; + METHOD m_luzswycb isInvulnerableTo (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;)Z + ARG 2 source METHOD m_midgwnho getSafeFallDistance (F)I ARG 1 health METHOD m_mlrktqxh setEquipment (Ljava/util/Map;)V @@ -466,6 +471,9 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity METHOD m_spqekiza tickCramming ()V METHOD m_spwwmdyl getHurtSound (Lnet/minecraft/unmapped/C_sbxfkpyv;)Lnet/minecraft/unmapped/C_avavozay; ARG 1 source + METHOD m_stneqkoz getPlayerHitTimer ()I + METHOD m_svekchwa canGlideUsing (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_yuycoehb;)Z + ARG 1 slot METHOD m_swoeftqi getRiddenSpeed (Lnet/minecraft/unmapped/C_jzrpycqo;)F ARG 1 player METHOD m_swttaoou knockDownwards ()V diff --git a/mappings/net/minecraft/entity/mob/Angerable.mapping b/mappings/net/minecraft/entity/mob/Angerable.mapping index 0e8deb6b5d..98bc34c3da 100644 --- a/mappings/net/minecraft/entity/mob/Angerable.mapping +++ b/mappings/net/minecraft/entity/mob/Angerable.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/unmapped/C_ceqittzp net/minecraft/entity/mob/Angerable METHOD m_hykyexft setTarget (Lnet/minecraft/unmapped/C_usxaxydn;)V ARG 1 target METHOD m_igzwsudv hasAngerTime ()Z + METHOD m_lazolqzm canTarget (Lnet/minecraft/unmapped/C_usxaxydn;)Z METHOD m_lsgfuuiy setAngerTime (I)V ARG 1 ticks METHOD m_mqgluxpv getTarget ()Lnet/minecraft/unmapped/C_usxaxydn; From a6b6b642ed7cd5ae3dc7ce3523d02d707b21897a Mon Sep 17 00:00:00 2001 From: ix0rai Date: Thu, 17 Oct 2024 21:18:34 -0500 Subject: [PATCH 06/24] complete LivingEntity --- .../net/minecraft/entity/LivingEntity.mapping | 45 +++++++++++++++++++ .../entity/mob/CreakingEntity.mapping | 3 ++ .../entity/mob/EndermanEntity.mapping | 1 + .../server/network/ServerPlayerEntity.mapping | 5 +++ 4 files changed, 54 insertions(+) diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 36de42cd51..2cc8db847a 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -124,6 +124,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity METHOD m_axkhmdzu getDeathSound ()Lnet/minecraft/unmapped/C_avavozay; METHOD m_ayeajhdm setCurrentHand (Lnet/minecraft/unmapped/C_laxmzoqs;)V ARG 1 hand + METHOD m_ayqytazn hasLineOfSight (Lnet/minecraft/unmapped/C_astfners;)Z METHOD m_bftuqrdn onKilledBy (Lnet/minecraft/unmapped/C_usxaxydn;)V COMMENT Performs secondary effects after this mob has been killed. COMMENT @@ -150,6 +151,8 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity ARG 1 amount METHOD m_bxkzqslp getArrowType (Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 1 stack + METHOD m_bxzefqod updateGlidingVelocity (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_vgpupfxx; + ARG 1 movementInput METHOD m_cdkmdkcc onAttacking (Lnet/minecraft/unmapped/C_astfners;)V ARG 1 target METHOD m_cehpabji setArmorInSlot (Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_sddaxwyk;)V @@ -161,6 +164,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity ARG 1 amount METHOD m_ctdiailf containsOnlyAmbientEffects (Ljava/util/Collection;)Z ARG 0 effects + METHOD m_cwcitqpe canPickUpLoot ()Z METHOD m_dbmgxkyo canWalkOnFluid (Lnet/minecraft/unmapped/C_xqketiuf;)Z METHOD m_dcbdaqcf getKnockback (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)F ARG 1 attackedEntity @@ -168,6 +172,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity ARG 1 hand METHOD m_dgbunafc onEquippedItemBroken (Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_yuycoehb;)V ARG 1 item + ARG 2 slot METHOD m_dickaawl getPrimeAdversary ()Lnet/minecraft/unmapped/C_usxaxydn; METHOD m_dmapfayh processEquippedStack (Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 1 stack @@ -177,6 +182,8 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity METHOD m_eajivoso isUndead ()Z METHOD m_eclhumtu getStackInHandSlot (Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 1 slot + METHOD m_eehgexpm travelInAir (Lnet/minecraft/unmapped/C_vgpupfxx;)V + ARG 1 movementInput METHOD m_eerxjifd removePowderSnowSlow ()V METHOD m_ejiuyguk isFallFlying ()Z METHOD m_eljjwntg setStatusEffect (Lnet/minecraft/unmapped/C_wpfizwve;Lnet/minecraft/unmapped/C_astfners;)V @@ -194,6 +201,12 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity COMMENT the effect to set ARG 2 source COMMENT the source entity or {@code null} for non-entity sources + METHOD m_emvhacmb isBeingSeenBy (Lnet/minecraft/unmapped/C_usxaxydn;DZZLjava/util/function/Predicate;[Ljava/util/function/DoubleSupplier;)Z + ARG 2 rotationCheckOffset + ARG 4 adjustToDistance + ARG 5 visualShape + ARG 6 predicate + ARG 7 entityEyeYChecks METHOD m_eobwecax dropXp (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;)V ARG 2 attacker METHOD m_epkzhkqg deserializeBrain (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/unmapped/C_rjqjaxef; @@ -203,7 +216,9 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity METHOD m_eydqxqbv getRecentDamageSource ()Lnet/minecraft/unmapped/C_sbxfkpyv; METHOD m_eyfojjsq canHaveStatusEffect (Lnet/minecraft/unmapped/C_wpfizwve;)Z ARG 1 effect + METHOD m_fcllvyfo forEachGiftItem (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/BiConsumer;)Z METHOD m_fdrozcta getFallSounds ()Lnet/minecraft/unmapped/C_usxaxydn$C_krioeiaq; + METHOD m_fgegzwmf canGlide ()Z METHOD m_fgldaguj getActiveHand ()Lnet/minecraft/unmapped/C_laxmzoqs; METHOD m_fmgoaoex takeShieldHit (Lnet/minecraft/unmapped/C_usxaxydn;)V ARG 1 attacker @@ -235,6 +250,10 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity COMMENT COMMENT @return the status effect removed ARG 1 effect + METHOD m_gnozrdmy endLocationBasedEffects (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_cohbwqne;)V + ARG 1 removedEquipment + ARG 2 slot + ARG 3 attributes METHOD m_gpdznmro teleport (DDDZ)Z ARG 1 x ARG 3 y @@ -324,6 +343,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity ARG 1 tag METHOD m_lazolqzm canTarget (Lnet/minecraft/unmapped/C_usxaxydn;)Z METHOD m_lbpuzdpj getLocationBasedEnchantmentEffects (Lnet/minecraft/unmapped/C_yuycoehb;)Ljava/util/Map; + ARG 1 slot METHOD m_ldeqpsrz canDisableShield ()Z METHOD m_lgbaiieb slotEmitsEquipEvent (Lnet/minecraft/unmapped/C_yuycoehb;)Z ARG 1 slot @@ -396,6 +416,8 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity COMMENT the amount of half-hearts to heal METHOD m_orzuenpv isUsingItem ()Z METHOD m_otdsojah tickNewAi ()V + METHOD m_oymopclz generateLoot (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;Z)V + ARG 3 fromPlayer METHOD m_ozivsxrd turnHead (FF)F ARG 1 bodyRotation ARG 2 headRotation @@ -410,8 +432,11 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity METHOD m_pizrjaok onStatusEffectApplied (Lnet/minecraft/unmapped/C_wpfizwve;Lnet/minecraft/unmapped/C_astfners;)V ARG 1 effect ARG 2 source + METHOD m_pizuxcky getHeldStack (Lnet/minecraft/unmapped/C_njjnizsa;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 1 arm METHOD m_pjwqmpzm setStuckArrowCount (I)V ARG 1 stuckArrowCount + METHOD m_pljlrlsh forEachShearingItem (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/function/BiConsumer;)V METHOD m_pumlpncf getJumpBoostVelocityModifier ()F METHOD m_pusvfpox createBrainProfile ()Lnet/minecraft/unmapped/C_rjqjaxef$C_liifzsnq; METHOD m_pwoagvwv getArmorInSlot (Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_sddaxwyk; @@ -427,6 +452,9 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity METHOD m_qmfzkten getJumpStrength (F)F ARG 1 multiplier METHOD m_qrjyiaeu getScaleFactor ()F + METHOD m_qrzeacza canEquip (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_yuycoehb;)Z + ARG 1 equipment + ARG 2 slot METHOD m_qsbhsxhz isAffectedBySplashPotions ()Z METHOD m_qsfhmwnj getAttributeBaseValue (Lnet/minecraft/unmapped/C_cjzoxshv;)D ARG 1 attribute @@ -436,8 +464,14 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity ARG 1 pose METHOD m_rbjtcuvw positionInPortal (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_vgpupfxx; ARG 0 pos + METHOD m_rcpsjrox checkGlidingCollision (DD)V + ARG 1 oldSpeed + ARG 3 newSpeed METHOD m_redjlchk wakeUp ()V METHOD m_rimpghsg getArmorVisibility ()F + METHOD m_rkacnhvq forEachGeneratedItem (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/Function;Ljava/util/function/BiConsumer;)Z + ARG 3 contextParameterFactory + ARG 4 lootConsumer METHOD m_rtgyxdad shouldDropXp ()Z COMMENT Returns if this entity should drop experience on death when the {@linkplain COMMENT net.minecraft.world.GameRules#DO_MOB_LOOT doMobLoot} game rule is @@ -495,6 +529,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity ARG 1 type METHOD m_thntwwku getEquipmentBreakStatus (Lnet/minecraft/unmapped/C_yuycoehb;)B ARG 0 slot + METHOD m_tihbzsvh getEffectiveGravity ()D METHOD m_tioidcpp getHandSwingDuration ()I METHOD m_tjshokwe takeKnockback (DDD)V ARG 1 strength @@ -514,6 +549,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity ARG 1 pos ARG 2 state METHOD m_umdbefol getSleepingDirection ()Lnet/minecraft/unmapped/C_xpuuihxf; + METHOD m_umnlaave insertOrDrop (Lnet/minecraft/unmapped/C_sddaxwyk;)V METHOD m_unmnupmt applyDamage (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)V ARG 2 source ARG 3 amount @@ -537,6 +573,10 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity METHOD m_vckvknnt getStackReference (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_xkkpnyvk; ARG 0 entity ARG 1 slot + METHOD m_vcvoldaa hasLineOfSight (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_uyikqwzv$C_kuslmwpu;Lnet/minecraft/unmapped/C_uyikqwzv$C_krdrvutw;Ljava/util/function/DoubleSupplier;)Z + ARG 4 entityEyeY + METHOD m_viviwntz travelInFluid (Lnet/minecraft/unmapped/C_vgpupfxx;)V + ARG 1 movementInput METHOD m_vixrfdxj hasEquipmentChanged (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z COMMENT Returns whether the equipment has changed based on the previous and new values. COMMENT @@ -564,6 +604,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity METHOD m_whvujbsh dropInventory (Lnet/minecraft/unmapped/C_bdwnwhiu;)V METHOD m_widuipxk getAttributes ()Lnet/minecraft/unmapped/C_cohbwqne; METHOD m_wjvypezh getRoll ()I + METHOD m_wkgrdcha travelGliding ()V METHOD m_wmvelibz isHoldingOntoLadder ()Z COMMENT @return {@code true} if this entity should not lose height while in a climbing state COMMENT @see net.minecraft.entity.LivingEntity @@ -603,6 +644,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity ARG 1 effect METHOD m_xzwxvody getHitbox ()Lnet/minecraft/unmapped/C_hbcjzgoe; METHOD m_yanqzhib getXpToDrop (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;)I + METHOD m_yfwvcpag getBlockingItem ()Lnet/minecraft/unmapped/C_sddaxwyk; METHOD m_ykflpkfs damageHelmet (Lnet/minecraft/unmapped/C_sbxfkpyv;F)V ARG 1 source ARG 2 amount @@ -624,6 +666,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity METHOD m_ythaxfga hurtByWater ()Z METHOD m_ywumiypj setPositionInBed (Lnet/minecraft/unmapped/C_hynzadkk;)V ARG 1 pos + METHOD m_zarrsjtw canEquipWithDispenser (Lnet/minecraft/unmapped/C_sddaxwyk;)Z METHOD m_zgpfruit getAttributeInstance (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_lzukavpx; ARG 1 attribute METHOD m_zhwrgbmx getPoses ()Lcom/google/common/collect/ImmutableList; @@ -634,6 +677,8 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity ARG 1 source ARG 2 amount ARG 3 slots + METHOD m_zqlgoica canDispenserEquipInto (Lnet/minecraft/unmapped/C_yuycoehb;)Z + ARG 1 slot METHOD m_zrgxyjwv hasStatusEffect (Lnet/minecraft/unmapped/C_cjzoxshv;)Z ARG 1 effect METHOD m_ztpokzjz getDamageTiltStrength ()F diff --git a/mappings/net/minecraft/entity/mob/CreakingEntity.mapping b/mappings/net/minecraft/entity/mob/CreakingEntity.mapping index 6cfd859cfd..1d382496a0 100644 --- a/mappings/net/minecraft/entity/mob/CreakingEntity.mapping +++ b/mappings/net/minecraft/entity/mob/CreakingEntity.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/unmapped/C_vbugwmii net/minecraft/entity/mob/CreakingEntity FIELD f_iflztenn attackCooldown I + FIELD f_jujfnssl ACTIVE Lnet/minecraft/unmapped/C_rinmcaxy; + METHOD m_japnsene setActive (Z)V METHOD m_jkvxeltg createAttributes ()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus; METHOD m_ohccomft animate ()V + METHOD m_xkvsljnw isActive ()Z CLASS C_bhmfzyyn CreakingJumpControl CLASS C_hkgbvofv CreakingMoveControl CLASS C_hnlwfmab CreakingLookControl diff --git a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping index fae000d805..53cb481d40 100644 --- a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/unmapped/C_qujqqtsx net/minecraft/entity/mob/EndermanEntity FIELD f_uvuhjwot angerTime I FIELD f_vcaxcgqn CARRIED_BLOCK Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_zllajqcs lastAngrySoundAge I + METHOD m_ablsprfq shouldAngerTowards (Lnet/minecraft/unmapped/C_jzrpycqo;)Z METHOD m_bfukobfg teleportTo (Lnet/minecraft/unmapped/C_astfners;)Z ARG 1 entity METHOD m_brngeofr setProvoked ()V diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 30b4f6f7ee..942ee7386f 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/unmapped/C_mxrobsgg net/minecraft/server/network/ServerPlaye COMMENT @see #setWatchedSection(ChunkSectionPos) FIELD f_ldmwjyxg requestedViewDistance I FIELD f_mfajmfxx spawnExtraParticlesOnFall Z + FIELD f_myvtmhev raidOmenPos Lnet/minecraft/unmapped/C_hynzadkk; FIELD f_onahzxmm interactionManager Lnet/minecraft/unmapped/C_egnasquq; FIELD f_oxxbizze syncedExperience I FIELD f_qcackqxh enteredLavaOnVehiclePos Lnet/minecraft/unmapped/C_vgpupfxx; @@ -99,6 +100,7 @@ CLASS net/minecraft/unmapped/C_mxrobsgg net/minecraft/server/network/ServerPlaye ARG 2 alive METHOD m_eenhzbrz sendServerMetadata (Lnet/minecraft/unmapped/C_bwttende;)V ARG 1 metadata + METHOD m_ehhcdgvv setRaidOmenPos (Lnet/minecraft/unmapped/C_hynzadkk;)V METHOD m_esetupfd playerTick ()V METHOD m_fafsmqxt getSpawnPointDimension ()Lnet/minecraft/unmapped/C_xhhleach; METHOD m_fawxnykw setGameMode (Lnet/minecraft/unmapped/C_hhlwcnih;)V @@ -184,12 +186,15 @@ CLASS net/minecraft/unmapped/C_mxrobsgg net/minecraft/server/network/ServerPlaye METHOD m_ulcuzxzs updateScores (Lnet/minecraft/unmapped/C_adsgsrpw;I)V ARG 1 criterion ARG 2 score + METHOD m_uxjbfcwl getRaidOmenPos ()Lnet/minecraft/unmapped/C_hynzadkk; METHOD m_vrtyhqjd setChatSession (Lnet/minecraft/unmapped/C_sdodhjzp;)V ARG 1 chatSession + METHOD m_wgyjvvco resetRaidOmenPos ()V METHOD m_wnaewudz isPvpEnabled ()Z METHOD m_wrxsxpkn setExperienceLevel (I)V ARG 1 level METHOD m_wsnwyxhu getIp ()Ljava/lang/String; + METHOD m_wujubsor createCommonPlayerSpawnInfo (Lnet/minecraft/unmapped/C_bdwnwhiu;)Lnet/minecraft/unmapped/C_zsjubkei; METHOD m_xkkpozuc changeGameMode (Lnet/minecraft/unmapped/C_lghcpyvl;)Z ARG 1 gameMode METHOD m_ygkpsrag getRecipeBook ()Lnet/minecraft/unmapped/C_ypnziuiu; From e76b8f124425edcec93492e58054627d8ff00da7 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Thu, 17 Oct 2024 22:12:26 -0500 Subject: [PATCH 07/24] glide -> fallFly --- mappings/net/minecraft/entity/LivingEntity.mapping | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 2cc8db847a..f3d27f5fd6 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -218,7 +218,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity ARG 1 effect METHOD m_fcllvyfo forEachGiftItem (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/BiConsumer;)Z METHOD m_fdrozcta getFallSounds ()Lnet/minecraft/unmapped/C_usxaxydn$C_krioeiaq; - METHOD m_fgegzwmf canGlide ()Z + METHOD m_fgegzwmf canFallFly ()Z METHOD m_fgldaguj getActiveHand ()Lnet/minecraft/unmapped/C_laxmzoqs; METHOD m_fmgoaoex takeShieldHit (Lnet/minecraft/unmapped/C_usxaxydn;)V ARG 1 attacker @@ -506,7 +506,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity METHOD m_spwwmdyl getHurtSound (Lnet/minecraft/unmapped/C_sbxfkpyv;)Lnet/minecraft/unmapped/C_avavozay; ARG 1 source METHOD m_stneqkoz getPlayerHitTimer ()I - METHOD m_svekchwa canGlideUsing (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_yuycoehb;)Z + METHOD m_svekchwa canFallFlyUsing (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_yuycoehb;)Z ARG 1 slot METHOD m_swoeftqi getRiddenSpeed (Lnet/minecraft/unmapped/C_jzrpycqo;)F ARG 1 player From 8d2b9d6c959fea0a35199d529a27f4e8aebebd43 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Fri, 18 Oct 2024 20:05:17 -0500 Subject: [PATCH 08/24] lots of progress! (ai and mobs) --- .../entity/EntityConversionParameters.mapping | 6 ++++++ .../entity/EntityConversionType.mapping | 11 +++++++++++ .../net/minecraft/entity/EntityType.mapping | 1 + .../minecraft/entity/ai/TargetPredicate.mapping | 2 ++ .../brain/sensor/NearestPlayersSensor.mapping | 1 + .../entity/ai/brain/sensor/Sensor.mapping | 7 +++++++ .../ai/brain/task/BreezeLongJumpTask.mapping | 3 +++ .../entity/ai/brain/task/BreezeUtil.mapping | 7 +++++++ .../brain/task/ForgetAttackTargetTask.mapping | 17 +++++++++++++++++ .../ai/brain/task/GiveGiftsToHeroTask.mapping | 2 ++ .../ai/brain/task/MeleeAttackTask.mapping | 4 ++++ .../brain/task/UpdateAttackTargetTask.mapping | 10 ++++++++++ .../net/minecraft/entity/ai/goal/Goal.mapping | 2 ++ .../minecraft/entity/ai/goal/RaidGoal.mapping | 2 ++ .../minecraft/entity/ai/goal/TargetGoal.mapping | 3 +++ .../minecraft/entity/ai/goal/TemptGoal.mapping | 1 + .../entity/ai/pathing/EntityNavigation.mapping | 5 +++++ .../entity/ai/pathing/PathNodeNavigator.mapping | 8 ++++++++ .../entity/attribute/AttributeContainer.mapping | 2 ++ .../attribute/EntityAttributeInstance.mapping | 3 +++ .../minecraft/entity/boss/WitherEntity.mapping | 3 +++ .../boss/dragon/EnderDragonEntity.mapping | 5 +++++ .../dragon/EnderDragonFlightTracker.mapping | 14 ++++++++++++++ .../entity/decoration/DisplayEntity.mapping | 3 +++ .../entity/decoration/ItemFrameEntity.mapping | 6 ++++++ .../entity/mob/AbstractPiglinEntity.mapping | 2 ++ .../net/minecraft/entity/mob/MobEntity.mapping | 15 +++++++++++++++ 27 files changed, 145 insertions(+) create mode 100644 mappings/net/minecraft/entity/EntityConversionParameters.mapping create mode 100644 mappings/net/minecraft/entity/EntityConversionType.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/BreezeUtil.mapping create mode 100644 mappings/net/minecraft/entity/boss/dragon/EnderDragonFlightTracker.mapping diff --git a/mappings/net/minecraft/entity/EntityConversionParameters.mapping b/mappings/net/minecraft/entity/EntityConversionParameters.mapping new file mode 100644 index 0000000000..f7c16e4c93 --- /dev/null +++ b/mappings/net/minecraft/entity/EntityConversionParameters.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/unmapped/C_pkxijcfk net/minecraft/entity/EntityConversionParameters + METHOD m_azuwuobf create (Lnet/minecraft/unmapped/C_dxkfswlz;ZZ)Lnet/minecraft/unmapped/C_pkxijcfk; + ARG 0 entity + CLASS C_olacbmtc PostConversion + METHOD finalizeConversion (Lnet/minecraft/unmapped/C_dxkfswlz;)V + ARG 1 entity diff --git a/mappings/net/minecraft/entity/EntityConversionType.mapping b/mappings/net/minecraft/entity/EntityConversionType.mapping new file mode 100644 index 0000000000..fbce6c15a1 --- /dev/null +++ b/mappings/net/minecraft/entity/EntityConversionType.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/unmapped/C_bsnhfrwa net/minecraft/entity/EntityConversionType + FIELD f_znjpjvio discardOldEntity Z + METHOD m_nsgenfpv shouldDiscardOldEntity ()Z + METHOD m_pajsecbl convert (Lnet/minecraft/unmapped/C_dxkfswlz;Lnet/minecraft/unmapped/C_dxkfswlz;Lnet/minecraft/unmapped/C_pkxijcfk;)V + ARG 1 oldEntity + ARG 2 newEntity + ARG 3 parameters + METHOD m_srstntez copyOldData (Lnet/minecraft/unmapped/C_dxkfswlz;Lnet/minecraft/unmapped/C_dxkfswlz;Lnet/minecraft/unmapped/C_pkxijcfk;)V + ARG 1 oldEntity + ARG 2 newEntity + ARG 3 parameters diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 8dd559c436..429a791b5b 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -74,6 +74,7 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType METHOD m_ncqhbjml getHeight ()F METHOD m_nshhmmgl get (Ljava/lang/String;)Ljava/util/Optional; ARG 0 id + METHOD m_oebfrxli create (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_bhyaesep;)Lnet/minecraft/unmapped/C_astfners; METHOD m_oqyurndf getWidth ()F METHOD m_pebhwwxb getId (Lnet/minecraft/unmapped/C_ogavsvbr;)Lnet/minecraft/unmapped/C_ncpywfca; ARG 0 type diff --git a/mappings/net/minecraft/entity/ai/TargetPredicate.mapping b/mappings/net/minecraft/entity/ai/TargetPredicate.mapping index 0396f7ce29..6fb707a8b3 100644 --- a/mappings/net/minecraft/entity/ai/TargetPredicate.mapping +++ b/mappings/net/minecraft/entity/ai/TargetPredicate.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/unmapped/C_cjtyhinh net/minecraft/entity/ai/TargetPredicate ARG 1 attackable METHOD m_agtoaesw ignoreVisibility ()Lnet/minecraft/unmapped/C_cjtyhinh; METHOD m_gqimohkp setPredicate (Lnet/minecraft/unmapped/C_cjtyhinh$C_cqgaarcf;)Lnet/minecraft/unmapped/C_cjtyhinh; + ARG 1 predicate METHOD m_ilkmyxqb createNonAttackable ()Lnet/minecraft/unmapped/C_cjtyhinh; METHOD m_ilqjbnec test (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z ARG 2 baseEntity @@ -19,3 +20,4 @@ CLASS net/minecraft/unmapped/C_cjtyhinh net/minecraft/entity/ai/TargetPredicate METHOD m_umtotvzf copy ()Lnet/minecraft/unmapped/C_cjtyhinh; METHOD m_yfzxwnuz createAttackable ()Lnet/minecraft/unmapped/C_cjtyhinh; METHOD m_zqhzrtuw ignoreDistanceScalingFactor ()Lnet/minecraft/unmapped/C_cjtyhinh; + CLASS C_cqgaarcf Selector diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/NearestPlayersSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/NearestPlayersSensor.mapping index a7f6b28645..d1a2d6eddc 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/NearestPlayersSensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/NearestPlayersSensor.mapping @@ -1 +1,2 @@ CLASS net/minecraft/unmapped/C_uipsphan net/minecraft/entity/ai/brain/sensor/NearestPlayersSensor + METHOD m_bmzrlldc getFollowRange (Lnet/minecraft/unmapped/C_usxaxydn;)D diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping index b5b07bfc9d..67f0351e92 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping @@ -14,14 +14,21 @@ CLASS net/minecraft/unmapped/C_brvrbzqh net/minecraft/entity/ai/brain/sensor/Sen FIELD f_kfqocqmk DEFAULT_RUN_TIME I FIELD f_olgwztxk ATTACKABLE_TARGET_PREDICATE_IGNORE_VISIBILITY_OR_DISTANCE_SCALING Lnet/minecraft/unmapped/C_cjtyhinh; FIELD f_savrjxrj ATTACKABLE_TARGET_PREDICATE Lnet/minecraft/unmapped/C_cjtyhinh; + FIELD f_tqpujoog DEFAULT_TARGETING_RANGE I METHOD (I)V ARG 1 senseInterval + METHOD m_aputesvt hasRecentlyPassed (ILjava/util/function/BiPredicate;)Ljava/util/function/BiPredicate; + ARG 0 testedTicks + ARG 1 predicate + METHOD m_cqcoyxpn hasRecentlyBeenAttackable (Lnet/minecraft/unmapped/C_usxaxydn;I)Ljava/util/function/BiPredicate; + ARG 1 testedTicks METHOD m_dzzsgvsj tick (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;)V ARG 1 world ARG 2 entity METHOD m_namfjgwr testAttackableTargetPredicateIgnoreVisibility (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z ARG 1 entity ARG 2 target + METHOD m_oaooofgj updateTargetingRanges (Lnet/minecraft/unmapped/C_usxaxydn;)V METHOD m_pjqiwcnh testTargetPredicate (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z ARG 1 entity ARG 2 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/BreezeLongJumpTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/BreezeLongJumpTask.mapping index d4a0e6c4dc..a7393ef40f 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/BreezeLongJumpTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/BreezeLongJumpTask.mapping @@ -1,8 +1,11 @@ CLASS net/minecraft/unmapped/C_eadqehug net/minecraft/entity/ai/brain/task/BreezeLongJumpTask + FIELD f_gqwfesec MAX_JUMP_VELOCITY_MULTIPLIER F FIELD f_nhirfxju REQUIRED_AIR_BLOCKS_ABOVE I + FIELD f_oknthhqd DEFAULT_FOLLOW_RANGE F FIELD f_rxlvpvwu JUMP_COOLDOWN I FIELD f_uiikvybd ALLOWED_JUMP_ANGLES Lit/unimi/dsi/fastutil/objects/ObjectArrayList; FIELD f_vfqjpkaj INHALING_DURATION I + FIELD f_xloabgtw DEFAULT_MAX_JUMP_VELOCITY F FIELD f_xsygvjol JUMP_COOLDOWN_WHEN_HURT I METHOD m_cuwdufka isFinishedLongJumping (Lnet/minecraft/unmapped/C_nqresjkz;)Z ARG 0 breeze diff --git a/mappings/net/minecraft/entity/ai/brain/task/BreezeUtil.mapping b/mappings/net/minecraft/entity/ai/brain/task/BreezeUtil.mapping new file mode 100644 index 0000000000..512b281629 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/BreezeUtil.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/unmapped/C_cspceykn net/minecraft/entity/ai/brain/task/BreezeUtil + FIELD f_ifmhjwon MAX_LINE_OF_SIGHT_RANGE D + METHOD m_jpogoaaz getRandomPosBehindTarget (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_vgpupfxx; + METHOD m_lujgadpm hasLineOfSight (Lnet/minecraft/unmapped/C_nqresjkz;Lnet/minecraft/unmapped/C_vgpupfxx;)Z + ARG 0 breeze + METHOD m_xgooczyw getLineOfSightRange (Lnet/minecraft/unmapped/C_nqresjkz;)D + ARG 0 breeze diff --git a/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping index eb99a0b57f..adce2d37e8 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/unmapped/C_gaizicad net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask FIELD f_npnuwhrk REMEMBER_TIME I + METHOD m_aektglmo create (Lnet/minecraft/unmapped/C_gaizicad$C_wwmivdow;Lnet/minecraft/unmapped/C_gaizicad$C_xlpqahis;Z)Lnet/minecraft/unmapped/C_mdnathub; + ARG 0 attackEndPredicate + ARG 1 forgottenCallback + ARG 2 forgetIfUnreachable METHOD m_agdthaky cannotReachTarget (Lnet/minecraft/unmapped/C_usxaxydn;Ljava/util/Optional;)Z ARG 0 entity ARG 1 reason @@ -9,6 +13,19 @@ CLASS net/minecraft/unmapped/C_gaizicad net/minecraft/entity/ai/brain/task/Forge METHOD m_gtxqnaiw (ZLnet/minecraft/unmapped/C_gaizicad$C_wwmivdow;Lnet/minecraft/unmapped/C_gaizicad$C_xlpqahis;Lnet/minecraft/unmapped/C_rcqaryar$C_loqvwuht;)Lcom/mojang/datafixers/kinds/App; ARG 3 instance METHOD m_nyujuwga create ()Lnet/minecraft/unmapped/C_mdnathub; + METHOD m_pgzxguti (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_dxkfswlz;Lnet/minecraft/unmapped/C_usxaxydn;)V + ARG 1 entity + ARG 2 target + METHOD m_qgliofqg create (Lnet/minecraft/unmapped/C_gaizicad$C_wwmivdow;)Lnet/minecraft/unmapped/C_mdnathub; + METHOD m_tjydfjsu create (Lnet/minecraft/unmapped/C_gaizicad$C_xlpqahis;)Lnet/minecraft/unmapped/C_mdnathub; METHOD m_vrgvjiup (Lnet/minecraft/unmapped/C_rcqaryar$C_loqvwuht;ZLnet/minecraft/unmapped/C_gaizicad$C_wwmivdow;Lnet/minecraft/unmapped/C_gaizicad$C_xlpqahis;Lnet/minecraft/unmapped/C_ujlmiamh;Lnet/minecraft/unmapped/C_ujlmiamh;)Lnet/minecraft/unmapped/C_smovfozc; ARG 4 attackTarget ARG 5 cannotReachWalkTargetReason + METHOD m_vxfuuftx (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_dxkfswlz;Lnet/minecraft/unmapped/C_usxaxydn;)V + ARG 1 entity + ARG 2 target + CLASS C_wwmivdow AttackEndPredicate + CLASS C_xlpqahis ForgottenCallback + METHOD accept (Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/lang/Object;Lnet/minecraft/unmapped/C_usxaxydn;)V + ARG 2 entity + ARG 3 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.mapping index 7f36725367..40a2b53e63 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.mapping @@ -22,5 +22,7 @@ CLASS net/minecraft/unmapped/C_cxomqjew net/minecraft/entity/ai/brain/task/GiveG METHOD m_llpkctks isCloseEnough (Lnet/minecraft/unmapped/C_pdtkdbte;Lnet/minecraft/unmapped/C_jzrpycqo;)Z ARG 1 villager ARG 2 player + METHOD m_udnybjdp getGiftLootTable (Lnet/minecraft/unmapped/C_pdtkdbte;)Lnet/minecraft/unmapped/C_xhhleach; + ARG 0 villager METHOD m_xxwohtty isHero (Lnet/minecraft/unmapped/C_jzrpycqo;)Z ARG 1 player diff --git a/mappings/net/minecraft/entity/ai/brain/task/MeleeAttackTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/MeleeAttackTask.mapping index 7747111544..a8747acb9a 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/MeleeAttackTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/MeleeAttackTask.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/unmapped/C_gpxkysqi net/minecraft/entity/ai/brain/task/MeleeAttackTask + METHOD m_nhfjfnwn create (I)Lnet/minecraft/unmapped/C_yfpegcpm; METHOD m_njoxpzqb isHoldingUsableRangedWeapon (Lnet/minecraft/unmapped/C_dxkfswlz;)Z ARG 0 entity METHOD m_pigmfdcu (Lnet/minecraft/unmapped/C_rcqaryar$C_loqvwuht;Ljava/util/function/Predicate;ILnet/minecraft/unmapped/C_ujlmiamh;Lnet/minecraft/unmapped/C_ujlmiamh;Lnet/minecraft/unmapped/C_ujlmiamh;Lnet/minecraft/unmapped/C_ujlmiamh;)Lnet/minecraft/unmapped/C_smovfozc; ARG 0 instance + METHOD m_yvkymmtj create (Ljava/util/function/Predicate;I)Lnet/minecraft/unmapped/C_yfpegcpm; + ARG 0 targetPredicate + ARG 1 cooldown diff --git a/mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping index f38d03fd05..4f59a0fe71 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping @@ -1,4 +1,14 @@ CLASS net/minecraft/unmapped/C_ulrbltvh net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask + METHOD m_jgrjzbzo create (Lnet/minecraft/unmapped/C_ulrbltvh$C_fewmraou;)Lnet/minecraft/unmapped/C_mdnathub; + METHOD m_krktxyoq create (Lnet/minecraft/unmapped/C_ulrbltvh$C_dpbnwfid;Lnet/minecraft/unmapped/C_ulrbltvh$C_fewmraou;)Lnet/minecraft/unmapped/C_mdnathub; + ARG 0 startPredicate + ARG 1 targetFinder METHOD m_msxejphh (Lnet/minecraft/unmapped/C_ulrbltvh$C_dpbnwfid;Lnet/minecraft/unmapped/C_ulrbltvh$C_fewmraou;Lnet/minecraft/unmapped/C_ujlmiamh;Lnet/minecraft/unmapped/C_ujlmiamh;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_dxkfswlz;J)Z ARG 5 entity ARG 6 time + CLASS C_dpbnwfid AttackStartPredicate + METHOD test (Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/lang/Object;)Z + ARG 2 entity + CLASS C_fewmraou TargetFinder + METHOD get (Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/lang/Object;)Ljava/util/Optional; + ARG 2 entity diff --git a/mappings/net/minecraft/entity/ai/goal/Goal.mapping b/mappings/net/minecraft/entity/ai/goal/Goal.mapping index 7f45386868..1457f271f3 100644 --- a/mappings/net/minecraft/entity/ai/goal/Goal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/Goal.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/unmapped/C_svjebams net/minecraft/entity/ai/goal/Goal METHOD m_doopiaub toGoalTicks (I)I ARG 0 ticks METHOD m_eujpslgi requiresUpdateEveryTick ()Z + METHOD m_fvqcmini getServerWorld (Lnet/minecraft/unmapped/C_cdctfzbn;)Lnet/minecraft/unmapped/C_bdwnwhiu; METHOD m_jwvjszxr getTickCount (I)I ARG 1 ticks METHOD m_koalcxuy start ()V @@ -11,6 +12,7 @@ CLASS net/minecraft/unmapped/C_svjebams net/minecraft/entity/ai/goal/Goal METHOD m_njsjilur canStart ()Z METHOD m_oqtqfnlu setControls (Ljava/util/EnumSet;)V ARG 1 controls + METHOD m_stitijqs getServerWorld (Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_bdwnwhiu; METHOD m_takuynwx getControls ()Ljava/util/EnumSet; METHOD m_trsyngvn shouldContinue ()Z METHOD m_vtbcctlg stop ()V diff --git a/mappings/net/minecraft/entity/ai/goal/RaidGoal.mapping b/mappings/net/minecraft/entity/ai/goal/RaidGoal.mapping index e98a6b7fc7..9bc0021361 100644 --- a/mappings/net/minecraft/entity/ai/goal/RaidGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/RaidGoal.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/unmapped/C_eqvbqsuw net/minecraft/entity/ai/goal/RaidGoal FIELD f_ccmtlwob MAX_COOLDOWN I FIELD f_qijeuijm cooldown I + METHOD (Lnet/minecraft/unmapped/C_iaguvmwh;Ljava/lang/Class;ZLnet/minecraft/unmapped/C_cjtyhinh$C_cqgaarcf;)V + ARG 1 raider METHOD m_pmhwhzwo getCooldown ()I METHOD m_rerhwjgq decreaseCooldown ()V diff --git a/mappings/net/minecraft/entity/ai/goal/TargetGoal.mapping b/mappings/net/minecraft/entity/ai/goal/TargetGoal.mapping index b698da2a87..41f456c84c 100644 --- a/mappings/net/minecraft/entity/ai/goal/TargetGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/TargetGoal.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/unmapped/C_rxeqeznw net/minecraft/entity/ai/goal/TargetGoal FIELD f_krqrezbs targetPredicate Lnet/minecraft/unmapped/C_cjtyhinh; FIELD f_miruxfhs DEFAULT_RANDOM_INTERVAL I FIELD f_uffroykn targetClass Ljava/lang/Class; + METHOD (Lnet/minecraft/unmapped/C_dxkfswlz;Ljava/lang/Class;IZZLnet/minecraft/unmapped/C_cjtyhinh$C_cqgaarcf;)V + ARG 3 reciprocalChance METHOD (Lnet/minecraft/unmapped/C_dxkfswlz;Ljava/lang/Class;Z)V ARG 1 mob ARG 2 targetClass @@ -16,5 +18,6 @@ CLASS net/minecraft/unmapped/C_rxeqeznw net/minecraft/entity/ai/goal/TargetGoal METHOD m_dmjczyej getSearchBox (D)Lnet/minecraft/unmapped/C_hbcjzgoe; ARG 1 distance METHOD m_ufzrmdxm findClosestTarget ()V + METHOD m_wvkdctyc getTargetPredicate ()Lnet/minecraft/unmapped/C_cjtyhinh; METHOD m_yqzrtkes setTargetEntity (Lnet/minecraft/unmapped/C_usxaxydn;)V ARG 1 targetEntity diff --git a/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping b/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping index f3f39ff860..1b57ec0003 100644 --- a/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/unmapped/C_klcypqlq net/minecraft/entity/ai/goal/TemptGoal FIELD f_hvntedfi lastPlayerZ D FIELD f_iddzhkui speed D FIELD f_imkviwrf lastPlayerPitch D + FIELD f_nqsyxvxo TEMPTING_TARGET_PREDICATE Lnet/minecraft/unmapped/C_cjtyhinh; FIELD f_nzazfudk food Ljava/util/function/Predicate; FIELD f_scbsiutq mob Lnet/minecraft/unmapped/C_hqdayibh; FIELD f_stwralen lastPlayerX D diff --git a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping index e46f4e618e..9fde70b93d 100644 --- a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/unmapped/C_atbvfjwi net/minecraft/entity/ai/pathing/EntityNa FIELD f_unngfiir nodeMaker Lnet/minecraft/unmapped/C_pbtgpvfg; FIELD f_wcsndowi lastRecalculateTime J FIELD f_ytabmjrn entity Lnet/minecraft/unmapped/C_dxkfswlz; + FIELD f_ywwuimtf maxFollowRange F FIELD f_zyochajd STUCK_CHECK_INTERVAL I METHOD (Lnet/minecraft/unmapped/C_dxkfswlz;Lnet/minecraft/unmapped/C_cdctfzbn;)V ARG 1 mob @@ -79,6 +80,7 @@ CLASS net/minecraft/unmapped/C_atbvfjwi net/minecraft/entity/ai/pathing/EntityNa ARG 2 range ARG 3 useHeadPos ARG 4 distance + METHOD m_mnymngdr updateRange ()V METHOD m_mvysdvtn shouldRecalculatePath (Lnet/minecraft/unmapped/C_hynzadkk;)Z ARG 1 pos METHOD m_nchaaiut resetNodeAndStop ()V @@ -115,7 +117,10 @@ CLASS net/minecraft/unmapped/C_atbvfjwi net/minecraft/entity/ai/pathing/EntityNa ARG 2 minDistance ARG 3 maxDistance METHOD m_yvxtcmyo tick ()V + METHOD m_zexhlwxr getMaxFollowRange ()F METHOD m_zndcxdyx setCanSwim (Z)V ARG 1 canSwim + METHOD m_zojjqtnm setMaxFollowRange (F)V + ARG 1 range METHOD m_zsklzyvc adjustTargetY (Lnet/minecraft/unmapped/C_vgpupfxx;)D ARG 1 pos diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping index de5a046e8e..66229a6bc7 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping @@ -15,9 +15,17 @@ CLASS net/minecraft/unmapped/C_jjtdffgj net/minecraft/entity/ai/pathing/PathNode ARG 4 followRange ARG 5 distance ARG 6 rangeMultiplier + METHOD m_hbwptppq setRange (I)V + ARG 1 range METHOD m_jkydkewu getDistance (Lnet/minecraft/unmapped/C_dfzwsdmo;Lnet/minecraft/unmapped/C_dfzwsdmo;)F ARG 1 startNode ARG 2 targetNode + METHOD m_mudynioh findPath (Lnet/minecraft/unmapped/C_dfzwsdmo;Ljava/util/Map;FIF)Lnet/minecraft/unmapped/C_motipebf; + ARG 1 startNode + ARG 2 nodes + ARG 3 followRange + ARG 4 distance + ARG 5 rangeMultiplier METHOD m_sazxrrlu calculateDistances (Lnet/minecraft/unmapped/C_dfzwsdmo;Ljava/util/Set;)F ARG 1 node ARG 2 targets diff --git a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping index 85def8c9f9..5683fd1a57 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping @@ -34,6 +34,8 @@ CLASS net/minecraft/unmapped/C_cohbwqne net/minecraft/entity/attribute/Attribute ARG 1 nbt METHOD m_txvwadfp hasAttribute (Lnet/minecraft/unmapped/C_cjzoxshv;)Z ARG 1 attribute + METHOD m_vfhqjskx addPersistentModifiersFrom (Lnet/minecraft/unmapped/C_cohbwqne;)V + ARG 1 container METHOD m_yortiwsq removeModifiers (Lcom/google/common/collect/Multimap;)V ARG 1 modifiers METHOD m_zswycxao updateTrackedStatus (Lnet/minecraft/unmapped/C_lzukavpx;)V diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping index efe8f79205..b3352f6002 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping @@ -23,11 +23,14 @@ CLASS net/minecraft/unmapped/C_lzukavpx net/minecraft/entity/attribute/EntityAtt METHOD m_gktfmzhg addIfAbsent (Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;)Ljava/util/Map; METHOD m_gtfjwrju readNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)V ARG 1 nbt + METHOD m_hnarmzcg getPersistentModifiers ()Ljava/util/Set; METHOD m_hzjnirrj getModifiers ()Ljava/util/Set; METHOD m_ibcsuctz setBaseValue (D)V ARG 1 baseValue METHOD m_iztvbwpj removeModifier (Lnet/minecraft/unmapped/C_hdbqsqsm;)V ARG 1 modifier + METHOD m_jhkoxnsn addPersistentModifiers (Ljava/util/Collection;)V + ARG 1 modifiers METHOD m_jivcejqw onUpdate ()V METHOD m_jtbrfpgz getBaseValue ()D COMMENT Gets the base value of this attribute instance. diff --git a/mappings/net/minecraft/entity/boss/WitherEntity.mapping b/mappings/net/minecraft/entity/boss/WitherEntity.mapping index fca297ebe9..e11f0c625e 100644 --- a/mappings/net/minecraft/entity/boss/WitherEntity.mapping +++ b/mappings/net/minecraft/entity/boss/WitherEntity.mapping @@ -29,12 +29,15 @@ CLASS net/minecraft/unmapped/C_sggtxtfb net/minecraft/entity/boss/WitherEntity METHOD m_kmtvokzb (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_bdwnwhiu;)Z ARG 0 entity METHOD m_limguwou createAttributes ()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus; + METHOD m_lqbzdcae getSideHeadPitches ()[F METHOD m_ncsxlcdy getHeadY (I)D ARG 1 headIndex METHOD m_ojenakht setTrackedEntityId (II)V ARG 1 headIndex ARG 2 id + METHOD m_ozoswikq shouldRenderOverlay ()Z METHOD m_qhkuvwyu getInvulnerableTimer ()I + METHOD m_qmyjaubp getSideHeadYaws ()[F METHOD m_riwonxhm getHeadZ (I)D ARG 1 headIndex METHOD m_udmnrxfs getTrackedEntityId (I)I diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping index 95e49b74cd..7c5bc988f0 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping @@ -25,6 +25,7 @@ CLASS net/minecraft/unmapped/C_bsmypcfq net/minecraft/entity/boss/dragon/EnderDr FIELD f_utphuczg pathHeap Lnet/minecraft/unmapped/C_cxvvwfgw; FIELD f_uvfhrabx parts [Lnet/minecraft/unmapped/C_coyfpkdd; FIELD f_uwhiuhsy LOGGER Lorg/slf4j/Logger; + FIELD f_vhinbehd flightTracker Lnet/minecraft/unmapped/C_iozihrig; FIELD f_vwueqmnd MIN_GROWL_INTERVAL I FIELD f_wuxpwaau phaseManager Lnet/minecraft/unmapped/C_hnmrcewa; FIELD f_xhwcyfkh CLOSE_PLAYER_PREDICATE Lnet/minecraft/unmapped/C_cjtyhinh; @@ -41,6 +42,8 @@ CLASS net/minecraft/unmapped/C_bsmypcfq net/minecraft/entity/boss/dragon/EnderDr ARG 2 dx ARG 4 dy ARG 6 dz + METHOD m_hubnvizl damageEntities (Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/util/List;)V + ARG 2 entities METHOD m_jfgvmsbb parentDamage (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)V ARG 2 source ARG 3 amount @@ -63,6 +66,8 @@ CLASS net/minecraft/unmapped/C_bsmypcfq net/minecraft/entity/boss/dragon/EnderDr METHOD m_nomlcuzj wrapYawChange (D)F ARG 1 yawDegrees METHOD m_pamvmrhq setFightOrigin (Lnet/minecraft/unmapped/C_hynzadkk;)V + METHOD m_pmbrehqc damagePart (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_coyfpkdd;Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z + ARG 2 part METHOD m_pzbmfkfv destroyBlocks (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hbcjzgoe;)Z ARG 2 box METHOD m_qrovnyxu damageCollidingEntities (Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/util/List;)V diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFlightTracker.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFlightTracker.mapping new file mode 100644 index 0000000000..5e46f7b4ae --- /dev/null +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFlightTracker.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/unmapped/C_iozihrig net/minecraft/entity/boss/dragon/EnderDragonFlightTracker + FIELD f_gbdrlzqz samples [Lnet/minecraft/unmapped/C_iozihrig$C_oggeyhcs; + FIELD f_kabqupjb LENGTH I + FIELD f_ubcrhvjc currentIndex I + FIELD f_vigfpvsh MASK I + METHOD m_ioxcflfy copyFrom (Lnet/minecraft/unmapped/C_iozihrig;)V + ARG 1 tracker + METHOD m_ksknxywx get (I)Lnet/minecraft/unmapped/C_iozihrig$C_oggeyhcs; + ARG 1 age + METHOD m_snowqiri get (IF)Lnet/minecraft/unmapped/C_iozihrig$C_oggeyhcs; + ARG 1 age + ARG 2 tickDelta + METHOD m_yqwgsyyn record (DF)V + CLASS C_oggeyhcs Sample diff --git a/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping b/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping index 38b2778c4e..7140c9b6da 100644 --- a/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/unmapped/C_zdeutotk net/minecraft/entity/decoration/DisplayE FIELD f_tlzklppc SHADOW_STRENGTH_KEY Ljava/lang/String; FIELD f_tqjbnsuz NO_BRIGHTNESS_OVERRIDE I FIELD f_uaimxenm BRIGHTNESS_OVERRIDE Lnet/minecraft/unmapped/C_rinmcaxy; + FIELD f_ueewwziy ignoresCulling Z FIELD f_ufuxdfdq interpolationTarget Lnet/minecraft/unmapped/C_zdeutotk$C_xolajlpw; FIELD f_uwuepspo interpolationStart J FIELD f_vayhsclz RIGHT_ROTATION Lnet/minecraft/unmapped/C_rinmcaxy; @@ -68,6 +69,7 @@ CLASS net/minecraft/unmapped/C_zdeutotk net/minecraft/entity/decoration/DisplayE METHOD m_izunuqws createInterpolatedRenderState (Lnet/minecraft/unmapped/C_zdeutotk$C_fdgxcfnt;F)Lnet/minecraft/unmapped/C_zdeutotk$C_fdgxcfnt; ARG 1 state ARG 2 interpolationProgress + METHOD m_jlmdjsuq getVisibleBoundingBox ()Lnet/minecraft/unmapped/C_hbcjzgoe; METHOD m_lehpwmeg setBillboardRenderConstraints (Lnet/minecraft/unmapped/C_zdeutotk$C_cozbiatm;)V ARG 1 constaints METHOD m_lucrnlvf setShadowStrength (F)V @@ -76,6 +78,7 @@ CLASS net/minecraft/unmapped/C_zdeutotk net/minecraft/entity/decoration/DisplayE METHOD m_mhzmmfsl getTransformation (Lnet/minecraft/unmapped/C_pyoaoolj;)Lnet/minecraft/unmapped/C_qvfggwhk; ARG 0 tracker METHOD m_mkgxqfrt getDisplayWidth ()F + METHOD m_mmfwqwqi isAffectedByCulling ()Z METHOD m_nbotmszd setTransformation (Lnet/minecraft/unmapped/C_qvfggwhk;)V ARG 1 transformation METHOD m_njanchyv setShadowStrength ()F diff --git a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping index 2103ce3520..5cb98e97c1 100644 --- a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping @@ -16,6 +16,8 @@ CLASS net/minecraft/unmapped/C_hywnolpn net/minecraft/entity/decoration/ItemFram ARG 2 world ARG 3 pos ARG 4 facing + METHOD m_arihumii dropItem (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Z)V + ARG 3 dropSelf METHOD m_aynovpuz getBreakSound ()Lnet/minecraft/unmapped/C_avavozay; METHOD m_ffvtxsaa setRotation (I)V ARG 1 value @@ -27,6 +29,8 @@ CLASS net/minecraft/unmapped/C_hywnolpn net/minecraft/entity/decoration/ItemFram ARG 2 update METHOD m_jitaejhf onItemChanged (Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 1 stack + METHOD m_keyxxrxa canDamageWhenFixed (Lnet/minecraft/unmapped/C_sbxfkpyv;)Z + ARG 0 source METHOD m_ovgnzcdf getAsItemStack ()Lnet/minecraft/unmapped/C_sddaxwyk; METHOD m_rqhhitqy getRotateItemSound ()Lnet/minecraft/unmapped/C_avavozay; METHOD m_rsjfinjb removeFromFrame (Lnet/minecraft/unmapped/C_sddaxwyk;)V @@ -38,6 +42,8 @@ CLASS net/minecraft/unmapped/C_hywnolpn net/minecraft/entity/decoration/ItemFram METHOD m_vpjoitzo getMapId (Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_qqxyyzzm; METHOD m_vzpzpibr hasMap ()Z METHOD m_wfkncbnm getPlaceSound ()Lnet/minecraft/unmapped/C_avavozay; + METHOD m_yuwqubzg shouldDropItemWhenDamaged (Lnet/minecraft/unmapped/C_sbxfkpyv;)Z + ARG 1 source METHOD m_zepldpdm getRemoveItemSound ()Lnet/minecraft/unmapped/C_avavozay; METHOD m_zqomaqlg getHeldItemStack ()Lnet/minecraft/unmapped/C_sddaxwyk; METHOD m_zzskrqab getComparatorPower ()I diff --git a/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping b/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping index a1b1a6789b..17d00f84e0 100644 --- a/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping @@ -14,3 +14,5 @@ CLASS net/minecraft/unmapped/C_imddhoxf net/minecraft/entity/mob/AbstractPiglinE METHOD m_obdeahon isAdult ()Z METHOD m_rloeixfu zombify (Lnet/minecraft/unmapped/C_bdwnwhiu;)V ARG 1 world + METHOD m_zccciztz setTimeInOverworld (I)V + ARG 1 time diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 7c1b44ed55..ee32d4a502 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity FIELD f_irlmhwzh navigation Lnet/minecraft/unmapped/C_atbvfjwi; FIELD f_kfwdpftf positionTargetRange F FIELD f_mhavoyoi bodyArmor Lnet/minecraft/unmapped/C_sddaxwyk; + FIELD f_mulpcwks EQUIPMENT_INIT_ORDER Ljava/util/List; FIELD f_mxvsbror armorItems Lnet/minecraft/unmapped/C_rnrfftze; FIELD f_nwzksedo goalSelector Lnet/minecraft/unmapped/C_qospjrjn; FIELD f_nzzqwalu pathfindingPenalties Ljava/util/Map; @@ -91,12 +92,16 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity METHOD m_jrjjwiqr onStartPathfinding ()V METHOD m_jrvaluhu updateDropChances (Lnet/minecraft/unmapped/C_yuycoehb;)V ARG 1 slot + METHOD m_kbemoobx dropEquipment (Lnet/minecraft/unmapped/C_bdwnwhiu;)V METHOD m_kdlnwtnv lookAtEntity (Lnet/minecraft/unmapped/C_astfners;FF)V ARG 1 targetEntity ARG 2 maxYawChange ARG 3 maxPitchChange METHOD m_kmgypgaa getPenalty (Lnet/minecraft/unmapped/C_hahxxnjs;)F ARG 1 nodeType + METHOD m_kmhfjgdo convert (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_pkxijcfk;Lnet/minecraft/unmapped/C_bhyaesep;Lnet/minecraft/unmapped/C_pkxijcfk$C_olacbmtc;)Lnet/minecraft/unmapped/C_dxkfswlz; + ARG 1 newType + ARG 4 postConversionCallback METHOD m_koijwctm hasPositionTarget ()Z METHOD m_kqnvykqn enchantMainHandItem (Lnet/minecraft/unmapped/C_jmnzlycd;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_jiailwzt;)V METHOD m_kuhfocmh interactMob (Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;)Lnet/minecraft/unmapped/C_ozuepbyj; @@ -114,6 +119,9 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity METHOD m_lxcdvhkn enchantEquipment (Lnet/minecraft/unmapped/C_jmnzlycd;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_jiailwzt;)V ARG 3 slot METHOD m_mbyporyt createBodyControl ()Lnet/minecraft/unmapped/C_vofymfgv; + METHOD m_mkazpcha getAttributeValue (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_yuycoehb;)D + ARG 2 attribute + ARG 3 slot METHOD m_mowaxfbl isLeftHanded ()Z METHOD m_mrbrckqf isDisallowedInPeaceful ()Z METHOD m_mufhzdfi isInWalkTargetRange ()Z @@ -123,6 +131,7 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity ARG 2 stack METHOD m_nzxqjkay tryEquip (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 2 equipment + METHOD m_onipdsbr getHandDropChances ()[F METHOD m_owfqcyjj changeAngle (FFF)F ARG 1 oldAngle ARG 2 newAngle @@ -143,12 +152,16 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity ARG 0 equipmentSlot ARG 1 equipmentLevel METHOD m_rpistqzo isWearingBodyArmor ()Z + METHOD m_rpqyatoj convert (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_pkxijcfk;Lnet/minecraft/unmapped/C_pkxijcfk$C_olacbmtc;)Lnet/minecraft/unmapped/C_dxkfswlz; METHOD m_ruuttiyq isPersistent ()Z METHOD m_rxurkduy getAttackTarget ()Lnet/minecraft/unmapped/C_usxaxydn; METHOD m_saekgdkn stopMoving ()V + METHOD m_seslsqmb dropEquipment (Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/util/function/Predicate;)Ljava/util/Set; + ARG 2 dropPredicate METHOD m_swfiqufm prefersNewEquipment (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_yuycoehb;)Z ARG 1 newStack ARG 2 oldStack + ARG 3 slot METHOD m_szmqgzqm equipRandomly (Lnet/minecraft/unmapped/C_fiwnwrrf;)V ARG 1 equipmentTable METHOD m_tjejbxzp canUseRangedWeapon (Lnet/minecraft/unmapped/C_axrfhndl;)Z @@ -167,6 +180,7 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity ARG 3 difficulty METHOD m_uebjilbs equipRandomly (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/Map;)V ARG 1 lootTable + ARG 2 dropChances METHOD m_uqccedlq canSpawn (Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_bhyaesep;)Z ARG 1 world METHOD m_utndsklm equipBodyArmor (Lnet/minecraft/unmapped/C_sddaxwyk;)V @@ -196,5 +210,6 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity ARG 1 upwardSpeed METHOD m_yrminwpr onEatingGrass ()V METHOD m_ywtdditi getLimitPerChunk ()I + METHOD m_zdbceqxv getArmorDropChances ()[F METHOD m_zdjlhmwq getVisibilityCache ()Lnet/minecraft/unmapped/C_vyefybqz; METHOD m_zjfgbeap isAiDisabled ()Z From fad9c78874d766b107857ae6cd23929e399bc314 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Fri, 18 Oct 2024 20:47:47 -0500 Subject: [PATCH 09/24] mob entity completion! --- .../task/SetLookTargetOnIntervalTask.mapping | 12 ++++++++++++ .../net/minecraft/entity/mob/BreezeBrain.mapping | 1 + .../net/minecraft/entity/mob/BreezeEntity.mapping | 1 + .../minecraft/entity/mob/CreakingBrain.mapping | 4 ++++ .../minecraft/entity/mob/CreakingEntity.mapping | 15 +++++++++++++++ mappings/net/minecraft/entity/mob/Hoglin.mapping | 1 + .../net/minecraft/entity/mob/HoglinEntity.mapping | 2 ++ .../minecraft/entity/mob/PhantomEntity.mapping | 2 ++ .../net/minecraft/entity/mob/PiglinBrain.mapping | 1 + .../entity/mob/PiglinBruteEntity.mapping | 1 + .../minecraft/entity/mob/RavagerEntity.mapping | 3 +++ .../entity/mob/WaterCreatureEntity.mapping | 1 + .../net/minecraft/entity/mob/ZombieEntity.mapping | 10 ++++++++-- .../entity/mob/ZombieVillagerEntity.mapping | 2 ++ .../entity/mob/warden/WardenEntity.mapping | 1 + 15 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 mappings/net/minecraft/entity/ai/brain/task/SetLookTargetOnIntervalTask.mapping diff --git a/mappings/net/minecraft/entity/ai/brain/task/SetLookTargetOnIntervalTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/SetLookTargetOnIntervalTask.mapping new file mode 100644 index 0000000000..00813b61e5 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/SetLookTargetOnIntervalTask.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/unmapped/C_lygsomtd net/minecraft/entity/ai/brain/task/SetLookTargetOnIntervalTask + METHOD m_aecmvuxy create (Lnet/minecraft/unmapped/C_ogavsvbr;FLnet/minecraft/unmapped/C_hvilmtvi;)Lnet/minecraft/unmapped/C_mdnathub; + ARG 0 validEntityType + METHOD m_ouvkkubu create (FLnet/minecraft/unmapped/C_hvilmtvi;)Lnet/minecraft/unmapped/C_mdnathub; + METHOD m_xpopbuma create (FLnet/minecraft/unmapped/C_hvilmtvi;Ljava/util/function/Predicate;)Lnet/minecraft/unmapped/C_mdnathub; + ARG 0 maxDistance + ARG 1 interval + ARG 2 targetPredicate + CLASS C_gvxfhlod Interval + FIELD f_efesnins remainingTicks I + FIELD f_rdvkztgg interval Lnet/minecraft/unmapped/C_hvilmtvi; + METHOD m_haxoxxhw shouldRun (Lnet/minecraft/unmapped/C_rlomrsco;)Z diff --git a/mappings/net/minecraft/entity/mob/BreezeBrain.mapping b/mappings/net/minecraft/entity/mob/BreezeBrain.mapping index c0363517fc..c141c49327 100644 --- a/mappings/net/minecraft/entity/mob/BreezeBrain.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeBrain.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/unmapped/C_gxdsshkk net/minecraft/entity/mob/BreezeBrain FIELD f_atwbyltl SLIDING_SPEED_MULTIPLIER F FIELD f_kequkmrd SENSORS Ljava/util/List; FIELD f_rkqhdhwy JUMP_CIRCLE_OUTER_RADIUS F + FIELD f_usqhomax TICKS_BEFORE_FORGETTING_TARGET I FIELD f_wjnamjhu MEMORY_MODULES Ljava/util/List; FIELD f_ygzaeast JUMP_CIRCLE_MIDDLE_RADIUS F METHOD m_inljbpxh addIdleTasks (Lnet/minecraft/unmapped/C_rjqjaxef;)V diff --git a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping index e926fc6911..c08c1c963e 100644 --- a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping @@ -30,3 +30,4 @@ CLASS net/minecraft/unmapped/C_nqresjkz net/minecraft/entity/mob/BreezeEntity ARG 1 pos METHOD m_qzaybzaa spawnJumpTrailParticles ()V METHOD m_sinilvic stopAnimations ()V + METHOD m_ywgongii getShootingY ()D diff --git a/mappings/net/minecraft/entity/mob/CreakingBrain.mapping b/mappings/net/minecraft/entity/mob/CreakingBrain.mapping index 095886aea6..8ef755fe4f 100644 --- a/mappings/net/minecraft/entity/mob/CreakingBrain.mapping +++ b/mappings/net/minecraft/entity/mob/CreakingBrain.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/unmapped/C_nkqatzha net/minecraft/entity/mob/CreakingBrain + FIELD f_spaomsvc MEMORY_MODULES Lcom/google/common/collect/ImmutableList; + FIELD f_uavqxrpw SENSORS Lcom/google/common/collect/ImmutableList; METHOD m_fdgcwgsd addIdleActivities (Lnet/minecraft/unmapped/C_rjqjaxef;)V METHOD m_hhynauwr addFightActivities (Lnet/minecraft/unmapped/C_rjqjaxef;)V METHOD m_rxjjsjcj create (Lnet/minecraft/unmapped/C_rjqjaxef;)Lnet/minecraft/unmapped/C_rjqjaxef; METHOD m_suwefzcr addCoreActivities (Lnet/minecraft/unmapped/C_rjqjaxef;)V METHOD m_vpamiunc createProfile ()Lnet/minecraft/unmapped/C_rjqjaxef$C_liifzsnq; + METHOD m_wvhfkjve updateActivities (Lnet/minecraft/unmapped/C_vbugwmii;)V + ARG 0 creaking diff --git a/mappings/net/minecraft/entity/mob/CreakingEntity.mapping b/mappings/net/minecraft/entity/mob/CreakingEntity.mapping index 1d382496a0..e27f199d6b 100644 --- a/mappings/net/minecraft/entity/mob/CreakingEntity.mapping +++ b/mappings/net/minecraft/entity/mob/CreakingEntity.mapping @@ -1,9 +1,24 @@ CLASS net/minecraft/unmapped/C_vbugwmii net/minecraft/entity/mob/CreakingEntity + FIELD f_ckldzaer GRAY I + FIELD f_dyztbejg ATTACK_DAMAGE F + FIELD f_ekddpnal CAN_MOVE Lnet/minecraft/unmapped/C_rinmcaxy; + FIELD f_ekjurwuq IDLING_SPEED_MULTIPLIER F + FIELD f_gnorwjlj invulnerabilityAnimationState Lnet/minecraft/unmapped/C_kxntavoz; FIELD f_iflztenn attackCooldown I FIELD f_jujfnssl ACTIVE Lnet/minecraft/unmapped/C_rinmcaxy; + FIELD f_mzkqzzle ATTACK_ANIMATION_DURATION I + FIELD f_rcowlgzl FOLLOW_RANGE F + FIELD f_sdmnlrcu MAX_HEALTH I + FIELD f_sjorwcyp ORANGE I + FIELD f_sqbcuhao ATTACK_INTERVAL I + FIELD f_stkvvsxy attackAnimationState Lnet/minecraft/unmapped/C_kxntavoz; + FIELD f_tocwldwq ACTIVATION_RANGE_SQUARED F + FIELD f_yaenaqzq FIGHTING_MOVEMENT_SPEED F METHOD m_japnsene setActive (Z)V METHOD m_jkvxeltg createAttributes ()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus; METHOD m_ohccomft animate ()V + METHOD m_qnnyojvb checkCanMove ()Z + METHOD m_xchtvnyy canMove ()Z METHOD m_xkvsljnw isActive ()Z CLASS C_bhmfzyyn CreakingJumpControl CLASS C_hkgbvofv CreakingMoveControl diff --git a/mappings/net/minecraft/entity/mob/Hoglin.mapping b/mappings/net/minecraft/entity/mob/Hoglin.mapping index 32974d02e1..17ba18463c 100644 --- a/mappings/net/minecraft/entity/mob/Hoglin.mapping +++ b/mappings/net/minecraft/entity/mob/Hoglin.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/unmapped/C_ovaqczqd net/minecraft/entity/mob/Hoglin + FIELD f_gcksedcw BABY_SPAWN_CHANCE F FIELD f_xrcjchag ATTACK_ANIMATION_DURATION I METHOD m_ivnhdoob tryAttack (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z ARG 1 attacker diff --git a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping index 7c91421b43..4b7864a7ce 100644 --- a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/unmapped/C_fnzykddk net/minecraft/entity/mob/HoglinEntity ARG 0 type ARG 1 world ARG 3 pos + METHOD m_resytqhn setTimeInOverworld (I)V + ARG 1 timeInOverworld METHOD m_sjcwxamc setImmuneToZombification (Z)V ARG 1 immuneToZombification METHOD m_tnmkoscv setCannotBeHunted (Z)V diff --git a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping index 704e460140..8a1a4438e7 100644 --- a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/unmapped/C_xghtjqbw net/minecraft/entity/mob/PhantomEntity FIELD f_vxkfiqyo movementType Lnet/minecraft/unmapped/C_xghtjqbw$C_gzcnjufx; FIELD f_yomimisq TICKS_PER_FLAP I METHOD m_blndykop getFlapTickOffset ()I + METHOD m_fvqarcie testTargetPredicate (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_cjtyhinh;)Z + ARG 3 predicate METHOD m_qsmmbmsk onSizeChanged ()V METHOD m_vbiamydm getPhantomSize ()I METHOD m_xynsjfci setPhantomSize (I)V diff --git a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping index ed5cd63857..44a2f434bd 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping @@ -98,6 +98,7 @@ CLASS net/minecraft/unmapped/C_mxpeolkc net/minecraft/entity/mob/PiglinBrain ARG 1 brain METHOD m_jqalumps shouldRunAwayFromHoglins (Lnet/minecraft/unmapped/C_lkhqndnb;)Z ARG 0 piglin + METHOD m_klnzftun hasPiglinSafeArmor (Lnet/minecraft/unmapped/C_usxaxydn;)Z METHOD m_kmcguhbn drop (Lnet/minecraft/unmapped/C_lkhqndnb;Ljava/util/List;Lnet/minecraft/unmapped/C_vgpupfxx;)V ARG 0 piglin ARG 1 items diff --git a/mappings/net/minecraft/entity/mob/PiglinBruteEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinBruteEntity.mapping index 76e6f39854..bd8ee4f8fa 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBruteEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBruteEntity.mapping @@ -4,5 +4,6 @@ CLASS net/minecraft/unmapped/C_mpoupnon net/minecraft/entity/mob/PiglinBruteEnti FIELD f_pjwygwlb MAX_HEALTH I FIELD f_wqepporx ATTACK_DAMAGE I FIELD f_yhdorhkd MOVEMENT_SPEED F + FIELD f_yoldbofa TARGETING_RANGE D METHOD m_fbacqqtq createAttributes ()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus; METHOD m_trsohuax playAngrySound ()V diff --git a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping index 105fe37ff9..b300fecfe5 100644 --- a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/unmapped/C_gijvkrwk net/minecraft/entity/mob/RavagerEntity + FIELD f_bgyajqwo CLIENT_ROAR_TARGET Ljava/util/function/Predicate; FIELD f_bhqoehky STUNNED_COLOR_GREEN F + FIELD f_ctkcjtee NO_MOB_GRIEFING_ROAR_TARGET Ljava/util/function/Predicate; FIELD f_hkyuymfz STUNNED_COLOR I FIELD f_jzawnpsw ATTACK_DURATION I FIELD f_khsyeshe BASE_MOVEMENT_SPEED D @@ -10,6 +12,7 @@ CLASS net/minecraft/unmapped/C_gijvkrwk net/minecraft/entity/mob/RavagerEntity FIELD f_usreyzam STUN_DURATION I FIELD f_vfyjxpaq STUNNED_COLOR_RED F FIELD f_xdxeebxn attackTick I + FIELD f_xxqlbqit ROAR_TARGET Ljava/util/function/Predicate; METHOD m_byufpzgq knockBack (Lnet/minecraft/unmapped/C_astfners;)V ARG 1 entity METHOD m_dmlphbdb (Lnet/minecraft/unmapped/C_astfners;)Z diff --git a/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping b/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping index b55f813fba..36623e236f 100644 --- a/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping +++ b/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/unmapped/C_cpqtqaen net/minecraft/entity/mob/WaterCreatureEntity + FIELD f_uznxfkln MIN_AMBIENT_SOUND_INTERVAL I METHOD m_rjwsrbhx tickWaterBreathingAir (I)V ARG 1 air METHOD m_rlvqolvj canSpawn (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_bhyaesep;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;)Z diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index c069ac0683..e7a1cc2e3b 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/unmapped/C_hlzqkibq net/minecraft/entity/mob/ZombieEntity - FIELD f_aqispqmf inWaterTime I + FIELD f_aqispqmf timeInWater I FIELD f_bkkffcav CAN_BREAK_DOORS_PROBABILITY F FIELD f_cbavnqhn LEADER_ZOMBIE_BONUS_MODIFIER_ID Lnet/minecraft/unmapped/C_ncpywfca; FIELD f_cgelqhxp ZOMBIE_LEADER_CHANCE F @@ -23,9 +23,11 @@ CLASS net/minecraft/unmapped/C_hlzqkibq net/minecraft/entity/mob/ZombieEntity METHOD (Lnet/minecraft/unmapped/C_cdctfzbn;)V ARG 1 world METHOD m_byfmkeyh shouldBeBaby (Lnet/minecraft/unmapped/C_rlomrsco;)Z + METHOD m_cfjxvslc infectVillager (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_pdtkdbte;)Z METHOD m_cinojixn (Lnet/minecraft/unmapped/C_mpbjgxic;)Z ARG 0 difficulty - METHOD m_dcbwxskt setTicksUntilWaterConversion (I)V + METHOD m_ckckhijq canSpawnInFluid ()Z + METHOD m_dcbwxskt setConvertingInWater (I)V ARG 1 ticksUntilWaterConversion METHOD m_dolaqwdc setCanBreakDoors (Z)V ARG 1 canBreakDoors @@ -39,10 +41,14 @@ CLASS net/minecraft/unmapped/C_hlzqkibq net/minecraft/entity/mob/ZombieEntity ARG 1 entityType METHOD m_pcnwswoc createAttributes ()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus; METHOD m_tgmcedmt initAttributes ()V + METHOD m_ufmnerao setTimeInWater (I)V + ARG 1 time METHOD m_vpvzzidd applyAttributeModifiers (F)V ARG 1 chanceMultiplier METHOD m_vtxgwfro burnsInDaylight ()Z METHOD m_wiihxgpu isConvertingInWater ()Z + METHOD m_zcxforui setTicksUntilWaterConversion (I)V + ARG 1 ticks METHOD m_zfhqmnbl canBreakDoors ()Z CLASS C_abgqtxqj ZombieData FIELD f_bwrjberv baby Z diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping index 288652b76e..39512be20a 100644 --- a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping @@ -19,6 +19,8 @@ CLASS net/minecraft/unmapped/C_yatelzvm net/minecraft/entity/mob/ZombieVillagerE ARG 1 world METHOD m_gutnbnvs setXp (I)V ARG 1 xp + METHOD m_nbnjxdaj setConversionTimer (I)V + ARG 1 time METHOD m_nhlbvskt setGossipData (Lnet/minecraft/unmapped/C_oivssbvb;)V ARG 1 element METHOD m_sbyyymlp getXp ()I diff --git a/mappings/net/minecraft/entity/mob/warden/WardenEntity.mapping b/mappings/net/minecraft/entity/mob/warden/WardenEntity.mapping index 90b5c767a9..f81d522eb6 100644 --- a/mappings/net/minecraft/entity/mob/warden/WardenEntity.mapping +++ b/mappings/net/minecraft/entity/mob/warden/WardenEntity.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/unmapped/C_fynaplbn net/minecraft/entity/mob/warden/WardenEn FIELD f_catvnevx VIBRATION_COOLDOWN_TICKS I FIELD f_ceomecbq ANGER_BOOST_ON_HURT I FIELD f_ctsqwubn emergingAnimation Lnet/minecraft/unmapped/C_kxntavoz; + FIELD f_drzmpevx FOLLOW_RANGE I FIELD f_ejgyiohn ATTACK_KNOCKBACK F FIELD f_fmnxjsjy vibrationCallback Lnet/minecraft/unmapped/C_ddxrijfx$C_vnbbhkol; FIELD f_fmvpjdup PROJECTILE_ANGER I From 7ec1ae01bff9115f153dd40030833ed3f4619674 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Wed, 23 Oct 2024 20:08:24 -0500 Subject: [PATCH 10/24] MORE --- .../component/type/UseCooldownComponent.mapping | 3 +++ .../component/type/UseRemainderComponent.mapping | 6 ++++++ .../net/minecraft/entity/SpawnRestriction.mapping | 3 +++ mappings/net/minecraft/entity/TntEntity.mapping | 3 +++ .../net/minecraft/entity/WindChargeEntity.mapping | 1 + .../entity/passive/AbstractHorseEntity.mapping | 1 + .../minecraft/entity/passive/AllayEntity.mapping | 1 + .../minecraft/entity/passive/AnimalEntity.mapping | 1 + .../minecraft/entity/passive/AxolotlEntity.mapping | 7 +++++++ .../net/minecraft/entity/passive/WolfEntity.mapping | 2 ++ .../entity/player/ItemCooldownManager.mapping | 3 +++ .../net/minecraft/util/InterpolatedAnimator.mapping | 13 +++++++++++++ .../net/minecraft/util/dynamic/GlobalPos.mapping | 2 ++ mappings/net/minecraft/util/math/MathHelper.mapping | 2 ++ mappings/net/minecraft/util/math/Vec3i.mapping | 2 ++ 15 files changed, 50 insertions(+) create mode 100644 mappings/net/minecraft/component/type/UseCooldownComponent.mapping create mode 100644 mappings/net/minecraft/component/type/UseRemainderComponent.mapping create mode 100644 mappings/net/minecraft/util/InterpolatedAnimator.mapping diff --git a/mappings/net/minecraft/component/type/UseCooldownComponent.mapping b/mappings/net/minecraft/component/type/UseCooldownComponent.mapping new file mode 100644 index 0000000000..61a0bd1929 --- /dev/null +++ b/mappings/net/minecraft/component/type/UseCooldownComponent.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/unmapped/C_elkynmne net/minecraft/component/type/UseCooldownComponent + METHOD m_bozsonlt getTicks ()I + METHOD m_vpoqolhn apply (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_usxaxydn;)V diff --git a/mappings/net/minecraft/component/type/UseRemainderComponent.mapping b/mappings/net/minecraft/component/type/UseRemainderComponent.mapping new file mode 100644 index 0000000000..21201faab2 --- /dev/null +++ b/mappings/net/minecraft/component/type/UseRemainderComponent.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/unmapped/C_jugjlqvm net/minecraft/component/type/UseRemainderComponent + METHOD m_rupthpty convert (Lnet/minecraft/unmapped/C_sddaxwyk;IZLnet/minecraft/unmapped/C_jugjlqvm$C_otiqgudp;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 2 oldCount + ARG 3 creative + ARG 4 returner + CLASS C_otiqgudp StackReturner diff --git a/mappings/net/minecraft/entity/SpawnRestriction.mapping b/mappings/net/minecraft/entity/SpawnRestriction.mapping index fbbe2362bd..9066d98c0b 100644 --- a/mappings/net/minecraft/entity/SpawnRestriction.mapping +++ b/mappings/net/minecraft/entity/SpawnRestriction.mapping @@ -17,6 +17,9 @@ CLASS net/minecraft/unmapped/C_bpscphvz net/minecraft/entity/SpawnRestriction METHOD m_stpmzdjr getLocation (Lnet/minecraft/unmapped/C_ogavsvbr;)Lnet/minecraft/unmapped/C_zojcplzh; ARG 0 type CLASS C_blyurspi SpawnPredicate + METHOD test (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_jmnzlycd;Lnet/minecraft/unmapped/C_bhyaesep;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;)Z + ARG 1 type + ARG 2 access CLASS C_cnknyuno Entry FIELD f_defqhlbr location Lnet/minecraft/unmapped/C_zojcplzh; FIELD f_kkouaxiw heightmapType Lnet/minecraft/unmapped/C_ybztoekc$C_wkdeqzbn; diff --git a/mappings/net/minecraft/entity/TntEntity.mapping b/mappings/net/minecraft/entity/TntEntity.mapping index 8de77015e0..59a9675516 100644 --- a/mappings/net/minecraft/entity/TntEntity.mapping +++ b/mappings/net/minecraft/entity/TntEntity.mapping @@ -1,12 +1,15 @@ CLASS net/minecraft/unmapped/C_kkoxxpxd net/minecraft/entity/TntEntity FIELD f_etznsvjx DEFAULT_FUSE I FIELD f_fcxpxvau BEHAVIOR Lnet/minecraft/unmapped/C_dmexlawk; + FIELD f_fnijqsot DEFAULT_EXPLOSION_POWER F FIELD f_hhactefe BLOCK_STATE Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_htakvyyx FUSE Lnet/minecraft/unmapped/C_rinmcaxy; + FIELD f_ifgadhwo explosionPower F FIELD f_kbwbaeda causingEntity Lnet/minecraft/unmapped/C_usxaxydn; FIELD f_nglvtdks BLOCK_STATE_KEY Ljava/lang/String; FIELD f_ryozcxns usedPortal Z FIELD f_tifoqahe FUSE_KEY Ljava/lang/String; + FIELD f_yqvfzvqx EXPLOSION_POWER_KEY Ljava/lang/String; METHOD (Lnet/minecraft/unmapped/C_cdctfzbn;DDDLnet/minecraft/unmapped/C_usxaxydn;)V ARG 1 world ARG 2 x diff --git a/mappings/net/minecraft/entity/WindChargeEntity.mapping b/mappings/net/minecraft/entity/WindChargeEntity.mapping index 1cb92206e0..4b5bad4a11 100644 --- a/mappings/net/minecraft/entity/WindChargeEntity.mapping +++ b/mappings/net/minecraft/entity/WindChargeEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/unmapped/C_miiummlo net/minecraft/entity/WindChargeEntity + FIELD f_efuzblcv MIN_CAMERA_DISTANCE_SQUARED F FIELD f_epnzhhem EXPLOSION_BEHAVIOR Lnet/minecraft/unmapped/C_dmexlawk; FIELD f_phhjsqan deflectCooldown I FIELD f_ptkglokr EXPLOSION_POWER F diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index 739749b862..813c4a7960 100644 --- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/unmapped/C_ktznyhaj net/minecraft/entity/passive/AbstractHor FIELD f_buzirmfu lastEatingGrassAnimationProgress F FIELD f_bzsvwmpq jumpStrength F FIELD f_catxtgyu BREEDING_CROSS_FACTOR D + FIELD f_cdewjdee INVENTORY_ROWS I FIELD f_cjthlgvf items Lnet/minecraft/unmapped/C_rsloiwzx; FIELD f_cxooziyz EATING_FLAG I FIELD f_edcpbqlo sprintCounter I diff --git a/mappings/net/minecraft/entity/passive/AllayEntity.mapping b/mappings/net/minecraft/entity/passive/AllayEntity.mapping index cf27e3bc7c..4af9e8ce60 100644 --- a/mappings/net/minecraft/entity/passive/AllayEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AllayEntity.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/unmapped/C_ueeoxhql net/minecraft/entity/passive/AllayEntity FIELD f_gqwygpsf sculkSensorListener Lnet/minecraft/unmapped/C_wpaexsvv; FIELD f_iqgfejuv MEMORY_MODULES Lcom/google/common/collect/ImmutableList; FIELD f_isxgvexv LIFTING_ITEM_ANIMATION_DURATION I + FIELD f_jghxqudq MAX_NOTE_BLOCK_DISTANCE I FIELD f_jxnwapwy THROWN_ITEM_PITCHES Lcom/google/common/collect/ImmutableList; FIELD f_lgixkfsj spinningAnimationTicks F FIELD f_mqaniyob DUPLICATION_HEART_COUNT I diff --git a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping index 76254c0814..971ed2a1b1 100644 --- a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/unmapped/C_tprvtfff net/minecraft/entity/passive/AnimalEntit ARG 3 pos METHOD m_njyokwrm isBreedingItem (Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 1 stack + METHOD m_qykjcmef createAttributes ()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus; METHOD m_rgotkmam canBreedWith (Lnet/minecraft/unmapped/C_tprvtfff;)Z ARG 1 other METHOD m_rvgeqdea isBrightEnoughForNaturalSpawn (Lnet/minecraft/unmapped/C_xjeuupup;Lnet/minecraft/unmapped/C_hynzadkk;)Z diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping index ecf7b155c9..fc2a2b243e 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping @@ -38,16 +38,22 @@ CLASS net/minecraft/unmapped/C_dkiorddu net/minecraft/entity/passive/AxolotlEnti FIELD f_gqlcvdoy MAX_AIR I FIELD f_hdavxpsd PLAYING_DEAD Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_hoeimypz BLUE_BABY_CHANCE I + FIELD f_hquzwutg onGroundAnimator Lnet/minecraft/unmapped/C_gtsjuuqr; FIELD f_hreliwgc BUFF_MAX_DURATION I + FIELD f_klmqpjnz inWaterAnimator Lnet/minecraft/unmapped/C_gtsjuuqr; FIELD f_nvryroyc MEMORY_MODULES Lcom/google/common/collect/ImmutableList; FIELD f_pkxjhfey POTION_HYDRATION I FIELD f_sgbckvjh FROM_BUCKET Lnet/minecraft/unmapped/C_rinmcaxy; + FIELD f_spzzgyvj POSE_ANIMATION_TICKS I FIELD f_udgpdxdv VARIANT Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_udkoqrte SENSORS Lcom/google/common/collect/ImmutableList; FIELD f_vfvanicn BUFF_RANGE D + FIELD f_wuymczru playingDeadAnimator Lnet/minecraft/unmapped/C_gtsjuuqr; + FIELD f_ymqhfbbi movingAnimator Lnet/minecraft/unmapped/C_gtsjuuqr; FIELD f_zkddedcq PLAY_DEAD_TICKS I METHOD m_bhbdygsg buffPlayer (Lnet/minecraft/unmapped/C_jzrpycqo;)V ARG 1 player + METHOD m_cwsafewj tickAnimations ()V METHOD m_eoqtlnrq canSpawnOn (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_jmnzlycd;Lnet/minecraft/unmapped/C_bhyaesep;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;)Z ARG 0 entityType ARG 1 world @@ -75,6 +81,7 @@ CLASS net/minecraft/unmapped/C_dkiorddu net/minecraft/entity/passive/AxolotlEnti ARG 1 variants METHOD m_vldseqkj getRandomVariant (Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_dkiorddu$C_wibhmvyi; ARG 1 random + CLASS C_ggxpdqxo AnimationState CLASS C_oacesbpf AxolotlLookControl METHOD (Lnet/minecraft/unmapped/C_dkiorddu;Lnet/minecraft/unmapped/C_dkiorddu;I)V ARG 2 axolotl diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 83bd9c6b14..50f9d2f8f1 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/unmapped/C_xokssljs net/minecraft/entity/passive/WolfEntity FIELD f_lcbuuhzu WILD_MAX_HEALTH F FIELD f_ocxdlcyn canShakeWaterOff Z FIELD f_opennbir lastBegAnimationProgress F + FIELD f_opljwcgc DEFAULT_TAIL_ANGLE F FIELD f_oyucjpiv FOLLOW_TAMED_PREDICATE Lnet/minecraft/unmapped/C_cjtyhinh$C_cqgaarcf; FIELD f_rqsgdixb targetUuid Ljava/util/UUID; FIELD f_svqisfdy BEGGING Lnet/minecraft/unmapped/C_rinmcaxy; @@ -24,6 +25,7 @@ CLASS net/minecraft/unmapped/C_xokssljs net/minecraft/entity/passive/WolfEntity METHOD m_gvyvpuqi getBegAnimationProgress (F)F ARG 1 tickDelta METHOD m_ilqinxlz tryTame (Lnet/minecraft/unmapped/C_jzrpycqo;)V + METHOD m_jdczbagy lerpShakeProgress (F)F METHOD m_mbvjvzbc getFurWetBrightnessMultiplier (F)F COMMENT Returns this wolf's brightness multiplier based on the fur wetness. COMMENT

diff --git a/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping b/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping index 0807862e66..d1b4fa831d 100644 --- a/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping +++ b/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping @@ -5,8 +5,11 @@ CLASS net/minecraft/unmapped/C_kqeizhow net/minecraft/entity/player/ItemCooldown METHOD m_eimagcng isCoolingDown (Lnet/minecraft/unmapped/C_sddaxwyk;)Z METHOD m_fazvauft getCooldownProgress (Lnet/minecraft/unmapped/C_sddaxwyk;F)F ARG 2 partialTicks + METHOD m_qfjbqzmn set (Lnet/minecraft/unmapped/C_sddaxwyk;I)V + METHOD m_rizxqeam set (Lnet/minecraft/unmapped/C_ncpywfca;I)V METHOD m_tctmselg onCooldownUpdate (Lnet/minecraft/unmapped/C_ncpywfca;)V METHOD m_ucminnit update ()V + METHOD m_yauzymmh getCooldownGroup (Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ncpywfca; METHOD m_zkqxkpud onCooldownUpdate (Lnet/minecraft/unmapped/C_ncpywfca;I)V ARG 2 duration CLASS C_cptmddkj Entry diff --git a/mappings/net/minecraft/util/InterpolatedAnimator.mapping b/mappings/net/minecraft/util/InterpolatedAnimator.mapping new file mode 100644 index 0000000000..b09ebe27dd --- /dev/null +++ b/mappings/net/minecraft/util/InterpolatedAnimator.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/unmapped/C_gtsjuuqr net/minecraft/util/InterpolatedAnimator + FIELD f_bnnmyjrf easingFunction Lnet/minecraft/unmapped/C_gtsjuuqr$C_upcbjlse; + FIELD f_ghcnkksg previousTick I + FIELD f_leyzovog currentTick I + FIELD f_tawbgiza animationLength I + METHOD (I)V + ARG 1 animationLength + METHOD m_amwazaat tick (Z)V + ARG 1 active + METHOD m_pdudjfdm getValue (F)F + CLASS C_upcbjlse EasingFunction + METHOD apply (F)F + ARG 1 tickDelta diff --git a/mappings/net/minecraft/util/dynamic/GlobalPos.mapping b/mappings/net/minecraft/util/dynamic/GlobalPos.mapping index 6836e761bd..425ee44fb5 100644 --- a/mappings/net/minecraft/util/dynamic/GlobalPos.mapping +++ b/mappings/net/minecraft/util/dynamic/GlobalPos.mapping @@ -12,6 +12,8 @@ CLASS net/minecraft/unmapped/C_ovcqqyqp net/minecraft/util/dynamic/GlobalPos METHOD m_gaaqqgqi create (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_ovcqqyqp; ARG 0 dimension ARG 1 pos + METHOD m_jcrmvjcl isWithinRange (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_hynzadkk;I)Z + ARG 3 maxRange METHOD m_lwvjuztd (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD m_njoibzgh getPos ()Lnet/minecraft/unmapped/C_hynzadkk; diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index d39e6b3273..2bf23ad6bb 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -72,6 +72,8 @@ CLASS net/minecraft/unmapped/C_zpccxxiz net/minecraft/util/math/MathHelper ARG 2 z METHOD m_dxovjztn hashCode (Lnet/minecraft/unmapped/C_ceivtqhh;)J ARG 0 vec + METHOD m_eaopfiaq easeInOutSine (F)F + ARG 0 value METHOD m_edwkdptc inverseLerp (FFF)F ARG 0 value ARG 1 start diff --git a/mappings/net/minecraft/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index 1cfcf806de..fd1ac22f8d 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -93,5 +93,7 @@ CLASS net/minecraft/unmapped/C_ceivtqhh net/minecraft/util/math/Vec3i ARG 1 direction ARG 2 distance METHOD m_ycusljyq getX ()I + METHOD m_yosafuze getChebyshevDistance (Lnet/minecraft/unmapped/C_ceivtqhh;)I + ARG 1 vec METHOD m_yslzeedq ([I)Lnet/minecraft/unmapped/C_ceivtqhh; ARG 0 ints From 14b19d7a3979ba334c0757380cd7fa9867794bc7 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Fri, 25 Oct 2024 11:15:39 -0500 Subject: [PATCH 11/24] boats! --- .../entity/vehicle/AbstractBoatEntity.mapping | 73 +++++++++++++++++++ unpick-definitions/boat.unpick | 7 ++ 2 files changed, 80 insertions(+) create mode 100644 unpick-definitions/boat.unpick diff --git a/mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping index 4ca211cfb1..010493b03f 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping @@ -1,3 +1,76 @@ CLASS net/minecraft/unmapped/C_sfpofsgc net/minecraft/entity/vehicle/AbstractBoatEntity + FIELD f_aikryzjk leashData Lnet/minecraft/unmapped/C_gbavazgo$C_trsxpkpu; + FIELD f_amqskyfy lastBubbleAngle F + FIELD f_bothgwhd pressingLeft Z + FIELD f_cjrdzfkq LEFT_PADDLE_MOVING Lnet/minecraft/unmapped/C_rinmcaxy; + FIELD f_cygmrozp status Lnet/minecraft/unmapped/C_sfpofsgc$C_ailaiyna; + FIELD f_ehxfmkxj bubbleWobbleStrength F + FIELD f_hfzhydpy lastStatus Lnet/minecraft/unmapped/C_sfpofsgc$C_ailaiyna; + FIELD f_ipvhnymi lerpPitch D + FIELD f_isprjbvq dropItem Ljava/util/function/Supplier; + FIELD f_iuskmoji waterLevel D + FIELD f_iyeolegn bubbleAngle F + FIELD f_jdxjqico yawDelta F + FIELD f_lfhlovmj landSlipperiness F + FIELD f_mcaooiey pressingForward Z + FIELD f_mlmucedx bubbleColumnPullingDown Z + FIELD f_mrlralmd lerpX D + FIELD f_mypnblpq pressingBack Z + FIELD f_ndjdbuld lerpZ D + FIELD f_nfnxkluj lastYVelocity D + FIELD f_onjnjwyh RIGHT_PADDLE_ID I + FIELD f_ouccwnbm lerpTicks I + FIELD f_pkxoicwx TIME_TO_EJECT I + FIELD f_pndaucet BUBBLE_TIME I + FIELD f_prlxlupt PADDLE_ROTATION_BEFORE_SOUND D + FIELD f_qomfhzoc PADDLE_SPEED F + FIELD f_swicxips lerpY D + FIELD f_syncvxqb ticksWithoutControl F + FIELD f_tijebdtz TICKS_IN_BUBBLES Lnet/minecraft/unmapped/C_rinmcaxy; + FIELD f_usvvsxbx lerpYaw D + FIELD f_wwushndf RIGHT_PADDLE_MOVING Lnet/minecraft/unmapped/C_rinmcaxy; + FIELD f_wwzuhoip pressingRight Z + FIELD f_yadskosv paddlePositions [F + FIELD f_ystwmady aboveBubbleColumn Z + FIELD f_zdzprfaf LEFT_PADDLE_ID I + FIELD f_zylhqtzk velocityDelta F METHOD (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_cdctfzbn;Ljava/util/function/Supplier;)V ARG 1 type + METHOD m_busvmoue initPosition (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z + METHOD m_bzrtpiib lerpBubbleWobble (F)F + METHOD m_ctquuefr getMaxPassengers ()I + METHOD m_djyqlddr updateControls ()V + METHOD m_ftkgpwcz tickBubbleColumn ()V + METHOD m_fywslodz canFit (Lnet/minecraft/unmapped/C_astfners;)Z + METHOD m_gxbcpqmg updateMovement ()V + METHOD m_hrckoqnv getStatus ()Lnet/minecraft/unmapped/C_sfpofsgc$C_ailaiyna; + METHOD m_iahkjlsd getWaterLevelAbove ()F + METHOD m_ivomcdwh tickLerp ()V + METHOD m_jasfzqqw getUnderWaterStatus ()Lnet/minecraft/unmapped/C_sfpofsgc$C_ailaiyna; + METHOD m_kklgcuav setTicksInBubbles (I)V + METHOD m_lalhbsfb getTicksInBubbles ()I + METHOD m_lgsgixjr getPassengerAttachmentY (Lnet/minecraft/unmapped/C_sszpscpo;)D + ARG 1 dimensions + METHOD m_lnjejjjt getPaddleSound ()Lnet/minecraft/unmapped/C_avavozay; + METHOD m_mnnaeauu canCollide (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_astfners;)Z + ARG 0 vehicle + ARG 1 other + METHOD m_qagjvlin checkInWater ()Z + METHOD m_qrbwkizc isPaddleMoving (I)Z + ARG 1 paddleId + METHOD m_skzmvmpb getLandSlipperiness ()F + METHOD m_utyeknxp setPaddleState (ZZ)V + ARG 1 leftMoving + ARG 2 rightMoving + METHOD m_vcitzkrx getSinglePassengerXOffset ()F + METHOD m_wdzivrij setInputs (ZZZZ)V + ARG 1 pressingLeft + ARG 2 pressingRight + ARG 3 pressingForward + ARG 4 pressingBack + METHOD m_ysehfimn clampPassengerYaw (Lnet/minecraft/unmapped/C_astfners;)V + METHOD m_ywqzsnln lerpPaddlePosition (IF)F + CLASS C_ailaiyna Status diff --git a/unpick-definitions/boat.unpick b/unpick-definitions/boat.unpick new file mode 100644 index 0000000000..0c294a49e4 --- /dev/null +++ b/unpick-definitions/boat.unpick @@ -0,0 +1,7 @@ +v2 + +constant paddle_id net/minecraft/entity/vehicle/AbstractBoatEntity LEFT_PADDLE_ID +constant paddle_id net/minecraft/entity/vehicle/AbstractBoatEntity RIGHT_PADDLE_ID + +target_method net/minecraft/entity/vehicle/AbstractBoatEntity lerpPaddlePosition (IF)F + param 0 paddle_id \ No newline at end of file From 874314a5f4f84db67487f06ba0a5161287e9a892 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Fri, 25 Oct 2024 12:18:54 -0500 Subject: [PATCH 12/24] start working on minecarts --- .../vehicle/AbstractMinecartEntity.mapping | 23 +++++++++ .../ExperimentalMinecartController.mapping | 3 ++ .../entity/vehicle/MinecartController.mapping | 48 +++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping create mode 100644 mappings/net/minecraft/entity/vehicle/MinecartController.mapping diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index 5a41ead12e..3bc62ab94b 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/unmapped/C_tahhkgty net/minecraft/entity/vehicle/AbstractMin FIELD f_cbqkmsxd ADJACENT_RAIL_POSITIONS_BY_SHAPE Ljava/util/Map; FIELD f_eskwdyms onRails Z FIELD f_figrvmbr VILLAGER_PASSENGER_ATTACHMENT_POS Lnet/minecraft/unmapped/C_vgpupfxx; + FIELD f_jhroxpze controller Lnet/minecraft/unmapped/C_jjtchizm; FIELD f_lotwtnbj yawFlipped Z FIELD f_revdcqip CUSTOM_BLOCK_ID Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_tbmsamms CUSTOM_BLOCK_OFFSET Lnet/minecraft/unmapped/C_rinmcaxy; @@ -14,20 +15,36 @@ CLASS net/minecraft/unmapped/C_tahhkgty net/minecraft/entity/vehicle/AbstractMin ARG 3 x ARG 5 y ARG 7 z + METHOD m_afluazez getPowerDirection (Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_vgpupfxx; + METHOD m_alrnhgzw isRideable ()Z METHOD m_cnkjmfhl onActivatorRail (IIIZ)V ARG 1 x ARG 2 y ARG 3 z ARG 4 powered + METHOD m_eipriqms initPos (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z METHOD m_glkhmiur setCustomBlock (Lnet/minecraft/unmapped/C_txtbiemp;)V ARG 1 state + METHOD m_gwoyqxww setYawFlipped (Z)V + ARG 1 yawFlipped METHOD m_hdngxmge getBlockOffset ()I METHOD m_hgtepult (Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd; ARG 1 pos + METHOD m_hxgtbizm isYawFlipped ()Z + METHOD m_inslfgor isFirstUpdate ()Z + METHOD m_masylmsi setOnRails (Z)V + ARG 1 onRails METHOD m_ounzrtxb create (Lnet/minecraft/unmapped/C_cdctfzbn;DDDLnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_bhyaesep;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jzrpycqo;)Lnet/minecraft/unmapped/C_tahhkgty; ARG 1 x ARG 3 y ARG 5 z + ARG 7 type + METHOD m_pzrmwujl getController ()Lnet/minecraft/unmapped/C_jjtchizm; + METHOD m_raaevxrz isNewBehaviorActive (Lnet/minecraft/unmapped/C_cdctfzbn;)Z + METHOD m_rpovghnz isSelfPropelling ()Z METHOD m_simptyqn moveOnRail (Lnet/minecraft/unmapped/C_bdwnwhiu;)V METHOD m_staqlmtx getDefaultContainedBlock ()Lnet/minecraft/unmapped/C_txtbiemp; METHOD m_upansguo getContainedBlock ()Lnet/minecraft/unmapped/C_txtbiemp; @@ -41,9 +58,15 @@ CLASS net/minecraft/unmapped/C_tahhkgty net/minecraft/entity/vehicle/AbstractMin ARG 1 offset METHOD m_xtdpuoft willHitBlockAt (Lnet/minecraft/unmapped/C_hynzadkk;)Z ARG 1 pos + METHOD m_ydndwdak stepAlongRail (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_wqmdpcsg;D)D METHOD m_yrpbpsae moveOffRail (Lnet/minecraft/unmapped/C_bdwnwhiu;)V METHOD m_yvrwkcqb applySlowdown (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_vgpupfxx; ARG 1 velocity + METHOD m_zmsijsbh pushOtherMinecart (Lnet/minecraft/unmapped/C_tahhkgty;DD)V + ARG 1 minecart + ARG 2 xOverlap + ARG 4 zOverlap METHOD m_zqqbmhzn hasCustomBlock ()Z METHOD m_zrztaorn (Ljava/util/EnumMap;)V ARG 0 map + METHOD m_zvxsupdf getCurrentPosOrRailBelow ()Lnet/minecraft/unmapped/C_hynzadkk; diff --git a/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping b/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping new file mode 100644 index 0000000000..c2af06c0ea --- /dev/null +++ b/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/unmapped/C_btculrky net/minecraft/entity/vehicle/ExperimentalMinecartController + CLASS C_yianzbtt + FIELD f_eqovgqok remainingMovement D diff --git a/mappings/net/minecraft/entity/vehicle/MinecartController.mapping b/mappings/net/minecraft/entity/vehicle/MinecartController.mapping new file mode 100644 index 0000000000..eb6d5646c7 --- /dev/null +++ b/mappings/net/minecraft/entity/vehicle/MinecartController.mapping @@ -0,0 +1,48 @@ +CLASS net/minecraft/unmapped/C_jjtchizm net/minecraft/entity/vehicle/MinecartController + FIELD f_yjfqtkfg minecart Lnet/minecraft/unmapped/C_tahhkgty; + METHOD m_aokaspmo limitSpeed (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_vgpupfxx; + ARG 1 velocity + METHOD m_aqvzatsd getLerpTargetYaw ()F + METHOD m_chsasecw getZ ()D + METHOD m_dsyrssnd getPitch ()F + METHOD m_ejobhcrd getWorld ()Lnet/minecraft/unmapped/C_cdctfzbn; + METHOD m_gasnuaee stepAlongRail (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_wqmdpcsg;D)D + ARG 2 shape + ARG 3 remainingMovement + METHOD m_gdmcmdqm handleCollisions ()Z + METHOD m_hxaxolpf getYaw ()F + METHOD m_ihaicvbu setPos (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z + METHOD m_ijbzzrpi getLerpTargetZ ()D + METHOD m_ikmxjwjz getLerpTargetPitch ()F + METHOD m_jdjlquwf cancelLerp ()V + METHOD m_kdzdosjm setLerpTargetVelocity (DDD)V + METHOD m_luktvikl setVelocity (Lnet/minecraft/unmapped/C_vgpupfxx;)V + ARG 1 velocity + METHOD m_mpmrpsbe getPos ()Lnet/minecraft/unmapped/C_vgpupfxx; + METHOD m_ndurksgo setVelocity (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z + METHOD m_osfmacwj getY ()D + METHOD m_ozrxcfzy setPitch (F)V + ARG 1 pitch + METHOD m_qlumdgkd getLerpTargetY ()D + METHOD m_rxroljgi getMaxSpeed (Lnet/minecraft/unmapped/C_bdwnwhiu;)D + METHOD m_sfbxlouf setYaw (F)V + ARG 1 yaw + METHOD m_snfbperf tick ()V + METHOD m_ulrxnnpi getVelocity ()Lnet/minecraft/unmapped/C_vgpupfxx; + METHOD m_vwyhisyo setPos (Lnet/minecraft/unmapped/C_vgpupfxx;)V + ARG 1 pos + METHOD m_vznicdbs getLerpTargetX ()D + METHOD m_wkvcjkwy getDecelerationFactor ()D + METHOD m_wlpowtkk moveAlongRail (Lnet/minecraft/unmapped/C_bdwnwhiu;)V + METHOD m_xozwohht getX ()D + METHOD m_xpryvvzb lerpTo (DDDFFI)V + ARG 7 yaw + ARG 8 pitch + ARG 9 interpolationSteps + METHOD m_zmfgxbee getHorizontalFacing ()Lnet/minecraft/unmapped/C_xpuuihxf; From 3309777a059ddd3006e5f85865d82f8302aafe13 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Sat, 26 Oct 2024 19:54:23 -0500 Subject: [PATCH 13/24] complete passives and projectiles --- .../entity/passive/BeeEntity.mapping | 18 ++++++++++++ .../entity/passive/DolphinEntity.mapping | 1 + .../entity/passive/FoxEntity.mapping | 1 + .../entity/passive/MooshroomEntity.mapping | 6 ++++ .../entity/passive/PandaEntity.mapping | 2 ++ .../entity/passive/PassiveEntity.mapping | 2 ++ .../entity/passive/PufferfishEntity.mapping | 1 + .../entity/passive/SalmonEntity.mapping | 6 ++++ .../entity/passive/SheepEntity.mapping | 2 ++ .../entity/passive/SquidEntity.mapping | 1 + .../passive/WaterCreatureEntity.mapping | 6 ++++ .../entity/player/PlayerEntity.mapping | 9 ++++++ .../entity/player/PlayerInventory.mapping | 7 +++++ .../projectile/AbstractFireballEntity.mapping | 1 + .../ExplosiveProjectileEntity.mapping | 2 ++ .../PersistentProjectileEntity.mapping | 8 ++++++ .../projectile/ProjectileEntity.mapping | 28 +++++++++++++++++++ .../projectile/thrown/ThrownEntity.mapping | 3 ++ .../entity/raid/RaiderEntity.mapping | 4 +++ .../listener/ClientPlayPacketListener.mapping | 2 ++ .../PlayerInventoryUpdateS2CPacket.mapping | 1 + .../predicate/entity/EntityPredicates.mapping | 1 + .../minecraft/server/MinecraftServer.mapping | 2 ++ .../util/random/RandomGenerator.mapping | 11 ++++++++ mappings/net/minecraft/world/World.mapping | 1 + simple_type_field_names.json5 | 6 ++++ 26 files changed, 132 insertions(+) create mode 100644 mappings/net/minecraft/entity/passive/WaterCreatureEntity.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/PlayerInventoryUpdateS2CPacket.mapping diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index 67b965dcde..b6f4f0808d 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/unmapped/C_hgfgxpql net/minecraft/entity/passive/BeeEntity + FIELD f_akmjjvkl RESTRICTED_WANDER_DISTANCE_REDUCTION I FIELD f_bdaqdvyx MIN_HIVE_RETURN_DISTANCE I COMMENT The minimum distance that bees will immediately return to their hive at. FIELD f_cjeyxcuq TICKS_SINCE_POLLINATION_KEY Ljava/lang/String; @@ -17,6 +18,7 @@ CLASS net/minecraft/unmapped/C_hgfgxpql net/minecraft/entity/passive/BeeEntity FIELD f_ilshqlkm MAX_POLLINATED_CROPS I FIELD f_jlzhazod pollinateGoal Lnet/minecraft/unmapped/C_hgfgxpql$C_hstezuru; FIELD f_jrbdvmhv LOCATING_NEW_HIVE_COOLDOWN I + FIELD f_jsypygyo MIN_RETRY_FINDING_FLOWER_COOLDOWN I FIELD f_lpvsbgtm HIVE_SEARCH_RANGE I FIELD f_mdrowaus HIVE_POS_KEY Ljava/lang/String; FIELD f_mfeadoih ANGER Lnet/minecraft/unmapped/C_rinmcaxy; @@ -35,6 +37,7 @@ CLASS net/minecraft/unmapped/C_hgfgxpql net/minecraft/entity/passive/BeeEntity FIELD f_rgimjzcr flowerPos Lnet/minecraft/unmapped/C_hynzadkk; FIELD f_rllxzote HAS_NECTAR_KEY Ljava/lang/String; FIELD f_smwphlyv LOCATING_NEW_FLOWER_COOLDOWN I + FIELD f_sxtbecla DEFAULT_WANDER_DISTANCE_REDUCTION I FIELD f_uwirnwkg moveToHiveGoal Lnet/minecraft/unmapped/C_hgfgxpql$C_aorvosrb; FIELD f_vbzxsdle NEAR_TARGET_FLAG I FIELD f_vgpnrcpq ticksInsideWater I @@ -42,6 +45,7 @@ CLASS net/minecraft/unmapped/C_hgfgxpql net/minecraft/entity/passive/BeeEntity FIELD f_whtbodsz MIN_ATTACK_DISTANCE I FIELD f_wuqtubpu targetUuid Ljava/util/UUID; FIELD f_xjbjocrt CANNOT_ENTER_HIVE_TICKS_KEY Ljava/lang/String; + FIELD f_xliifucf MAX_RETRY_FINDING_FLOWER_COOLDOWN I FIELD f_xyzgfgra HAS_STUNG_KEY Ljava/lang/String; FIELD f_ycjsovuu moveToFlowerGoal Lnet/minecraft/unmapped/C_hgfgxpql$C_svuqecsc; FIELD f_yqhwyhuf STING_DEATH_COUNTDOWN I @@ -50,6 +54,7 @@ CLASS net/minecraft/unmapped/C_hgfgxpql net/minecraft/entity/passive/BeeEntity METHOD m_beiolhwp setBeeFlag (IZ)V ARG 1 bit ARG 2 value + METHOD m_biootsai getHive ()Lnet/minecraft/unmapped/C_cyniebsl; METHOD m_bypgkjae updateBodyPitch ()V METHOD m_cihpsqgl setHasStung (Z)V ARG 1 hasStung @@ -57,6 +62,7 @@ CLASS net/minecraft/unmapped/C_hgfgxpql net/minecraft/entity/passive/BeeEntity METHOD m_hxcrhdeh createAttributes ()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus; METHOD m_ifoynezy canEnterHive ()Z METHOD m_ikwzmvgi getMoveGoalTicks ()I + METHOD m_inydwqhr isNightOrRaining (Lnet/minecraft/unmapped/C_cdctfzbn;)Z METHOD m_ixtjacit onHoneyDelivered ()V METHOD m_jnvzmqwd setHasNectar (Z)V ARG 1 hasNectar @@ -69,6 +75,7 @@ CLASS net/minecraft/unmapped/C_hgfgxpql net/minecraft/entity/passive/BeeEntity METHOD m_kxszurdg setCannotEnterHiveTicks (I)V ARG 1 ticks METHOD m_lksmfqbw setHivePos (Lnet/minecraft/unmapped/C_hynzadkk;)V + METHOD m_lqhqjghk loseHive ()V METHOD m_mkieglfb isTooFar (Lnet/minecraft/unmapped/C_hynzadkk;)Z ARG 1 pos METHOD m_nhjjyvbc getBeeFlag (I)Z @@ -99,6 +106,7 @@ CLASS net/minecraft/unmapped/C_hgfgxpql net/minecraft/entity/passive/BeeEntity ARG 12 effect METHOD m_xrvxkqxv startMovingTo (Lnet/minecraft/unmapped/C_hynzadkk;)V ARG 1 pos + METHOD m_xwinkfzm loseFlower ()V METHOD m_yoduviar hasStung ()Z METHOD m_zkthdefj hasNectar ()Z METHOD m_zycchyeq isHiveNearFire ()Z @@ -135,6 +143,7 @@ CLASS net/minecraft/unmapped/C_hgfgxpql net/minecraft/entity/passive/BeeEntity FIELD f_bklijrhn running Z FIELD f_boohtxxx nextTarget Lnet/minecraft/unmapped/C_vgpupfxx; FIELD f_djxwnopq POSITION_CHANGE_PROBABILITY I + FIELD f_hkwowzec FLOWER_SEARCH_RADIUS I FIELD f_hlpjktns flowerPredicate Ljava/util/function/Predicate; FIELD f_ithpcqbu ticks I FIELD f_lnbcclwg HOVER_HEIGHT_WITHIN_FLOWER F @@ -143,6 +152,7 @@ CLASS net/minecraft/unmapped/C_hgfgxpql net/minecraft/entity/passive/BeeEntity FIELD f_uciamvdk SPEED_MODIFIER F FIELD f_umrooslu lastPollinationTick I FIELD f_uxwaxwno pollinationTicks I + FIELD f_vfufljpq ticksUnderWater Lit/unimi/dsi/fastutil/longs/Long2LongOpenHashMap; FIELD f_vqmimsbg MAX_POLLINATION_TICKS I FIELD f_zevpzupt MIN_POLLINATION_TICKS I METHOD m_enlpoqja getFlower ()Ljava/util/Optional; @@ -158,6 +168,10 @@ CLASS net/minecraft/unmapped/C_hgfgxpql net/minecraft/entity/passive/BeeEntity METHOD m_luyzthep canBeeStart ()Z CLASS C_jmbatlcy BeeWanderAroundGoal METHOD m_gyqotsry getRandomLocation ()Lnet/minecraft/unmapped/C_vgpupfxx; + METHOD m_nsvntrdd getMaxWanderDistance ()I + CLASS C_kgvzcksa ValidateHiveGoal + FIELD f_lbrpizqw ticksUntilNextCheck I + FIELD f_zlysqrjr lastValidationTick J CLASS C_svuqecsc MoveToFlowerGoal FIELD f_flkrlasm MAX_FLOWER_NAVIGATION_TICKS I FIELD f_omakwtwb ticks I @@ -175,3 +189,7 @@ CLASS net/minecraft/unmapped/C_hgfgxpql net/minecraft/entity/passive/BeeEntity METHOD (Lnet/minecraft/unmapped/C_hgfgxpql;)V ARG 1 bee METHOD m_tcocmqdv canSting ()Z + CLASS C_yzizfveb ValidateFlowerGoal + FIELD f_rlboddkm ticksUntilNextCheck I + FIELD f_vllnymkd lastValidationTick J + METHOD m_ddrgxphk isFlower (Lnet/minecraft/unmapped/C_hynzadkk;)Z diff --git a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping index 93e60ea3be..fbbd874acc 100644 --- a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping +++ b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/unmapped/C_ucpoxhfy net/minecraft/entity/passive/DolphinEnti FIELD f_kriyywfw MOISTNESS Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_nlpajyrn CAN_TAKE Ljava/util/function/Predicate; FIELD f_qiqilmke MAX_MOISTNESS I + FIELD f_vzcfzugn BABY_SCALE F FIELD f_wnftchzc TOTAL_AIR_SUPPLY I METHOD m_evthcfvp getTreasurePos ()Lnet/minecraft/unmapped/C_hynzadkk; METHOD m_jlxlczsj getMoistness ()I diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index b10c2ccfa2..2cb5fdd240 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -133,6 +133,7 @@ CLASS net/minecraft/unmapped/C_axinhusn net/minecraft/entity/passive/FoxEntity FIELD f_mwctevcu lookZ D METHOD m_vctwvwhq chooseNewAngle ()V CLASS C_iksflemu FoxData + FIELD f_ajquahtq variant Lnet/minecraft/unmapped/C_axinhusn$C_dqmtshhc; CLASS C_jdyjcdzs PickBerriesGoal FIELD f_cfkermxf PICKING_TIME I FIELD f_sojxnnoc timer I diff --git a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping index e6cee49755..91d38922f3 100644 --- a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping @@ -4,8 +4,14 @@ CLASS net/minecraft/unmapped/C_keggniig net/minecraft/entity/passive/MooshroomEn FIELD f_eliiipao stewEffects Lnet/minecraft/unmapped/C_ceasgpks; FIELD f_exospqbd MUTATION_CHANCE I FIELD f_vtsiujtw STEW_EFFECTS Ljava/lang/String; + METHOD m_kkuvoqyg getVariantForBaby (Lnet/minecraft/unmapped/C_keggniig;)Lnet/minecraft/unmapped/C_keggniig$C_vwbykyrx; + ARG 1 mooshroom METHOD m_rbekgcxf canSpawn (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_bhyaesep;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;)Z ARG 0 type ARG 1 world ARG 3 pos METHOD m_xhwfgtsq getStewEffects (Lnet/minecraft/unmapped/C_sddaxwyk;)Ljava/util/Optional; + CLASS C_vwbykyrx Variant + FIELD f_wucfymus id Ljava/lang/String; + METHOD m_frvuonjc getBlockState ()Lnet/minecraft/unmapped/C_txtbiemp; + METHOD m_oebtoifm get (Ljava/lang/String;)Lnet/minecraft/unmapped/C_keggniig$C_vwbykyrx; diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index ef4e595f6b..7d4808a888 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -74,6 +74,8 @@ CLASS net/minecraft/unmapped/C_ogdzfiek net/minecraft/entity/passive/PandaEntity ARG 1 bitmask METHOD m_rqcwiqqd setPlaying (Z)V ARG 1 playing + METHOD m_rtktyahw canEatFromGround (Lnet/minecraft/unmapped/C_uqpzijng;)Z + ARG 0 item METHOD m_slvxcbou stop ()V METHOD m_sndnmaae setHiddenGene (Lnet/minecraft/unmapped/C_ogdzfiek$C_djzoyosk;)V ARG 1 gene diff --git a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping index 82f79bf4b1..b577568627 100644 --- a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping @@ -13,12 +13,14 @@ CLASS net/minecraft/unmapped/C_jvojbnla net/minecraft/entity/passive/PassiveEnti ARG 2 entity METHOD m_joivblzf growUp (I)V ARG 1 age + METHOD m_jwrgxfdo getForcedAge ()I METHOD m_lyunjbel growUp (IZ)V ARG 1 age ARG 2 overGrow METHOD m_qxlffuwy isReadyToBreed ()Z METHOD m_rrykeatb setBreedingAge (I)V ARG 1 age + METHOD m_tjkaggcz getHappyTicksRemaining ()I METHOD m_xdpbetzz onGrowUp ()V CLASS C_uxhqdxwl PassiveData FIELD f_bhvaxmjs babyChance F diff --git a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping index 9e8ba65e83..30a77a8ed7 100644 --- a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/unmapped/C_jrmyptau net/minecraft/entity/passive/PufferfishE FIELD f_czrejhld SEMI_PUFFED I FIELD f_ezedlqkq inflateTicks I FIELD f_fokyjgsx FULLY_PUFFED I + FIELD f_nawnbraa BLOW_UP_TARGET_PREDICATE Lnet/minecraft/unmapped/C_cjtyhinh; FIELD f_rpideidk PUFF_STATE Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_ufhfudig deflateTicks I FIELD f_xzrlmgxa NOT_PUFFED I diff --git a/mappings/net/minecraft/entity/passive/SalmonEntity.mapping b/mappings/net/minecraft/entity/passive/SalmonEntity.mapping index 1df84c45ab..484f8589d2 100644 --- a/mappings/net/minecraft/entity/passive/SalmonEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SalmonEntity.mapping @@ -1 +1,7 @@ CLASS net/minecraft/unmapped/C_upwlqigj net/minecraft/entity/passive/SalmonEntity + FIELD f_qjpbfsdr VARIANT Lnet/minecraft/unmapped/C_rinmcaxy; + METHOD m_hrasxhbu getScale ()F + CLASS C_oepggenf Variant + FIELD f_hplootfg id Ljava/lang/String; + FIELD f_nhniyxex scale F + METHOD m_jegaabvy get (Ljava/lang/String;)Lnet/minecraft/unmapped/C_upwlqigj$C_oepggenf; diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index 411113d7a9..99ef18d30b 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -21,6 +21,8 @@ CLASS net/minecraft/unmapped/C_xhsufrff net/minecraft/entity/passive/SheepEntity METHOD m_rgkmjdvy setColor (Lnet/minecraft/unmapped/C_arllgqae;)V ARG 1 color METHOD m_spfmlykt getChildColor (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_xhsufrff;Lnet/minecraft/unmapped/C_xhsufrff;)Lnet/minecraft/unmapped/C_arllgqae; + ARG 2 parent1 + ARG 3 parent2 METHOD m_zqcilmda getNeckAngle (F)F ARG 1 delta METHOD m_zzglaoyq getDyeColor ()Lnet/minecraft/unmapped/C_arllgqae; diff --git a/mappings/net/minecraft/entity/passive/SquidEntity.mapping b/mappings/net/minecraft/entity/passive/SquidEntity.mapping index cab56702fd..9e70c9b164 100644 --- a/mappings/net/minecraft/entity/passive/SquidEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SquidEntity.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/unmapped/C_hgqxwfnx net/minecraft/entity/passive/SquidEntity COMMENT Timer between thrusts as the squid swims. Represented as an angle from 0 to 2PI. FIELD f_mhlysgcz tentacleAngle F FIELD f_qrjbjkyl rollAngle F + FIELD f_qtclvdlx movementVec Lnet/minecraft/unmapped/C_vgpupfxx; FIELD f_umnynrvs swimVelocityScale F COMMENT A scale factor for the squid's swimming speed. COMMENT diff --git a/mappings/net/minecraft/entity/passive/WaterCreatureEntity.mapping b/mappings/net/minecraft/entity/passive/WaterCreatureEntity.mapping new file mode 100644 index 0000000000..67deee9e5d --- /dev/null +++ b/mappings/net/minecraft/entity/passive/WaterCreatureEntity.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/unmapped/C_bcazkkby net/minecraft/entity/passive/WaterCreatureEntity + METHOD m_dczwjvot canSpawn (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_bhyaesep;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;)Z + ARG 0 type + ARG 1 world + METHOD m_hkdiomer tickAirSupply (I)V + ARG 1 air diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 8d03e513b5..786761c3e9 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -63,6 +63,7 @@ CLASS net/minecraft/unmapped/C_jzrpycqo net/minecraft/entity/player/PlayerEntity METHOD (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;FLcom/mojang/authlib/GameProfile;)V ARG 3 yaw ARG 4 gameProfile + METHOD m_arcbriga getPermissionLevel ()I METHOD m_arduainz isCreativeLevelTwoOp ()Z METHOD m_aubfsqlm setReducedDebugInfo (Z)V ARG 1 reducedDebugInfo @@ -138,6 +139,7 @@ CLASS net/minecraft/unmapped/C_jzrpycqo net/minecraft/entity/player/PlayerEntity ARG 0 entityType METHOD m_hiqfmqtd collideWithEntity (Lnet/minecraft/unmapped/C_astfners;)V ARG 1 entity + METHOD m_hmruvmge canDropItems ()Z METHOD m_hsjkkbpv createCooldownManager ()Lnet/minecraft/unmapped/C_kqeizhow; METHOD m_hvzvdxyh canModifyBlocks ()Z METHOD m_hzbgasuo addShoulderEntity (Lnet/minecraft/unmapped/C_hhlwcnih;)Z @@ -145,6 +147,7 @@ CLASS net/minecraft/unmapped/C_jzrpycqo net/minecraft/entity/player/PlayerEntity METHOD m_icphgrlc increaseStat (Lnet/minecraft/unmapped/C_sibrxbfy;I)V ARG 1 stat ARG 2 amount + METHOD m_irikssnm dropCreativeStack (Lnet/minecraft/unmapped/C_sddaxwyk;)V METHOD m_itubculn unlockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD m_iujuxkpr disableShield (Lnet/minecraft/unmapped/C_sddaxwyk;)V @@ -152,6 +155,7 @@ CLASS net/minecraft/unmapped/C_jzrpycqo net/minecraft/entity/player/PlayerEntity ARG 1 box ARG 2 additionalRange METHOD m_jnzfvwue isMainPlayer ()Z + METHOD m_kgvhhcun tickRegeneration ()V METHOD m_knabeuog vanishCursedItems ()V METHOD m_kxxqgmsc sendTradeOffers (ILnet/minecraft/unmapped/C_eygsjfgm;IIZZ)V ARG 1 syncId @@ -173,6 +177,7 @@ CLASS net/minecraft/unmapped/C_jzrpycqo net/minecraft/entity/player/PlayerEntity COMMENT long enough}. METHOD m_mbymelmc addTellClickEvent (Lnet/minecraft/unmapped/C_npqneive;)Lnet/minecraft/unmapped/C_npqneive; ARG 1 component + METHOD m_mgdicokk shouldRotateWithMinecart ()Z METHOD m_mvgxwslk spawnSweepAttackParticles ()V METHOD m_nlpighqe dropShoulderEntities ()V METHOD m_nodjejyg increaseStat (Lnet/minecraft/unmapped/C_ncpywfca;I)V @@ -224,6 +229,8 @@ CLASS net/minecraft/unmapped/C_jzrpycqo net/minecraft/entity/player/PlayerEntity METHOD m_qupqytdv dropShoulderEntity (Lnet/minecraft/unmapped/C_hhlwcnih;)V ARG 1 entityNbt METHOD m_rbwjbvce updateTurtleHelmet ()V + METHOD m_rixwczkw isEquipped (Lnet/minecraft/unmapped/C_vorddnax;)Z + ARG 1 item METHOD m_rnkwwgyg shouldIgnoreFallDamageFromCurrentExplosion ()Z METHOD m_rxawqnif isPartVisible (Lnet/minecraft/unmapped/C_vqnqadci;)Z ARG 1 modelPart @@ -242,6 +249,8 @@ CLASS net/minecraft/unmapped/C_jzrpycqo net/minecraft/entity/player/PlayerEntity ARG 1 entityNbt METHOD m_smbsjwkr isCreative ()Z COMMENT Returns whether this player is in creative mode. + METHOD m_snjwnoyj hasPermissions (I)Z + ARG 1 level METHOD m_srbgfavo requestRespawn ()V METHOD m_srzttqeq shouldDismount ()Z METHOD m_tbdjuqar tryResetCurrentExplosion ()V diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index 887989196f..2c44a8f00b 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -32,6 +32,7 @@ CLASS net/minecraft/unmapped/C_sxzqocrm net/minecraft/entity/player/PlayerInvent ARG 1 stack METHOD m_cbuksxzb getSwappableHotbarSlot ()I METHOD m_cpwlhjly populateRecipeFinder (Lnet/minecraft/unmapped/C_fcquvjby;)V + ARG 1 finder METHOD m_cwfzntkt clone (Lnet/minecraft/unmapped/C_sxzqocrm;)V ARG 1 other METHOD m_eddjnvon usableForCrafting (Lnet/minecraft/unmapped/C_sddaxwyk;)Z @@ -43,6 +44,8 @@ CLASS net/minecraft/unmapped/C_sxzqocrm net/minecraft/entity/player/PlayerInvent ARG 1 entireStack METHOD m_gkniurqx contains (Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 1 stack + METHOD m_grrjbqkb setSelectedSlot (I)V + ARG 1 index METHOD m_hjszshmr offerOrDrop (Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 1 stack METHOD m_hmwxnoza hasMatchingStack (Ljava/util/function/Predicate;)Z @@ -58,12 +61,16 @@ CLASS net/minecraft/unmapped/C_sxzqocrm net/minecraft/entity/player/PlayerInvent ARG 2 stack METHOD m_julzohay writeNbt (Lnet/minecraft/unmapped/C_hqhtfwlr;)Lnet/minecraft/unmapped/C_hqhtfwlr; ARG 1 nbtList + METHOD m_lhflraib createInventoryUpdatePacket (I)Lnet/minecraft/unmapped/C_yjakgqnt; + ARG 1 slot METHOD m_mqaefcrf getOccupiedSlotWithRoomForStack (Lnet/minecraft/unmapped/C_sddaxwyk;)I ARG 1 stack METHOD m_ooomafpi getBlockBreakingSpeed (Lnet/minecraft/unmapped/C_txtbiemp;)F ARG 1 block METHOD m_owslrmqz swapSlotWithHotbar (I)V ARG 1 slot + METHOD m_qstschyr getMatchingSlot (Lnet/minecraft/unmapped/C_cjzoxshv;)I + ARG 1 item METHOD m_sffdzeof canStackAddMore (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 1 existingStack ARG 2 stack diff --git a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping index a7fa6e7c7a..4b7f354c0b 100644 --- a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/unmapped/C_hgilnbps net/minecraft/entity/projectile/AbstractFireballEntity FIELD f_jecpirjl ITEM Lnet/minecraft/unmapped/C_rinmcaxy; + FIELD f_ouyuabpn MIN_CAMERA_DISTANCE_SQUARED F METHOD m_fmcuiqma setItem (Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 1 stack METHOD m_yggiaavj createFireChargeStack ()Lnet/minecraft/unmapped/C_sddaxwyk; diff --git a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping index 254852a4c9..e015ebcaf3 100644 --- a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping @@ -20,5 +20,7 @@ CLASS net/minecraft/unmapped/C_rhioaoru net/minecraft/entity/projectile/Explosiv METHOD m_qcrzfahr setVelocityWithAcceleration (Lnet/minecraft/unmapped/C_vgpupfxx;D)V ARG 1 velocity METHOD m_qdxptizg isBurning ()Z + METHOD m_qqxejcog applyDrag ()V + METHOD m_qxctffca addParticleTrail ()V METHOD m_szcsbglq getOutline ()Lnet/minecraft/unmapped/C_uyikqwzv$C_kuslmwpu; METHOD m_xdxnqmvz drag ()F diff --git a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping index 866b19eee9..fb8b7db2dd 100644 --- a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping @@ -11,10 +11,12 @@ CLASS net/minecraft/unmapped/C_gstiksvs net/minecraft/entity/projectile/Persiste FIELD f_pnuxpkjk CRITICAL_FLAG I FIELD f_pqiurqmt PIERCE_LEVEL Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_qazfvpcx BASE_ARROW_DAMAGE D + FIELD f_rnapwtld SHAKE_TICKS I FIELD f_umpvtnwi PROJECTILE_FLAGS Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_wcrdrutf stack Lnet/minecraft/unmapped/C_sddaxwyk; FIELD f_wgfwlrwg shake I FIELD f_wuzchbwg damage D + FIELD f_yqrknjkl IN_GROUND Lnet/minecraft/unmapped/C_rinmcaxy; METHOD (Lnet/minecraft/unmapped/C_ogavsvbr;DDDLnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 1 type ARG 2 x @@ -25,6 +27,8 @@ CLASS net/minecraft/unmapped/C_gstiksvs net/minecraft/entity/projectile/Persiste METHOD (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 2 owner METHOD m_beukkvsr shouldFall ()Z + METHOD m_cjbjygrh addBubbleParticles (Lnet/minecraft/unmapped/C_vgpupfxx;)V + ARG 1 pos METHOD m_clbqtpac setPierceLevel (B)V ARG 1 level METHOD m_ehzehefq clearPiercingStatus ()V @@ -42,6 +46,7 @@ CLASS net/minecraft/unmapped/C_gstiksvs net/minecraft/entity/projectile/Persiste METHOD m_kynuhxfa getEntityCollision (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_wokbhynj; ARG 1 currentPosition ARG 2 nextPosition + METHOD m_mmuntudz applyCollision (Lnet/minecraft/unmapped/C_jdakttms;)V METHOD m_ovuszxpo tryPickup (Lnet/minecraft/unmapped/C_jzrpycqo;)Z ARG 1 player METHOD m_qmtcwgrn setStack (Lnet/minecraft/unmapped/C_sddaxwyk;)V @@ -49,6 +54,7 @@ CLASS net/minecraft/unmapped/C_gstiksvs net/minecraft/entity/projectile/Persiste ARG 1 index ARG 2 flag METHOD m_sepatgdc age ()V + METHOD m_ssyefsdq applyDrag ()V METHOD m_sxxslcng getPierceLevel ()B METHOD m_utnhoeqp isNoClip ()Z METHOD m_vifaajkb getDamage ()D @@ -60,7 +66,9 @@ CLASS net/minecraft/unmapped/C_gstiksvs net/minecraft/entity/projectile/Persiste ARG 1 target METHOD m_wrkmrnze getDragInWater ()F METHOD m_wznrraqn getStack ()Lnet/minecraft/unmapped/C_sddaxwyk; + METHOD m_xmbclleg setInGround (Z)V METHOD m_xnefdmre isCritical ()Z + METHOD m_ylbwqdcm isInGround ()Z METHOD m_znqipiwr applyDamageModifier (F)V ARG 1 modifier CLASS C_pbhnbeyk PickupPermission diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 788c35f62b..7e79c41be8 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -4,6 +4,14 @@ CLASS net/minecraft/unmapped/C_ltpsyvhj net/minecraft/entity/projectile/Projecti FIELD f_pfurkhwc shot Z FIELD f_udegztef ownerUuid Ljava/util/UUID; FIELD f_uofnxxot leftOwner Z + METHOD m_aicjbexr onBroken (Lnet/minecraft/unmapped/C_vorddnax;)V + ARG 1 item + METHOD m_aomcogmb spawn (Lnet/minecraft/unmapped/C_ltpsyvhj;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;DDDFF)Lnet/minecraft/unmapped/C_ltpsyvhj; + ARG 3 x + ARG 5 y + ARG 7 z + ARG 9 power + ARG 10 divergence METHOD m_bzpgfgfy setVelocity (DDDFF)V ARG 1 x ARG 3 y @@ -17,6 +25,7 @@ CLASS net/minecraft/unmapped/C_ltpsyvhj net/minecraft/entity/projectile/Projecti COMMENT {@return the cause entity of any effect applied by this projectile} If this COMMENT projectile has an owner, the effect is attributed to the owner; otherwise, it COMMENT is attributed to this projectile itself. + METHOD m_enlfovqr shouldBounceOnWorldBorder ()Z METHOD m_evdqjnse getVelocity (DDDFF)Lnet/minecraft/unmapped/C_vgpupfxx; ARG 7 speed ARG 8 divergence @@ -26,6 +35,11 @@ CLASS net/minecraft/unmapped/C_ltpsyvhj net/minecraft/entity/projectile/Projecti ARG 1 uuid METHOD m_jmdjqqjc canHit (Lnet/minecraft/unmapped/C_astfners;)Z ARG 1 entity + METHOD m_joqridfr spawn (Lnet/minecraft/unmapped/C_ltpsyvhj$C_kpzjrlxz;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_usxaxydn;FFF)Lnet/minecraft/unmapped/C_ltpsyvhj; + ARG 0 factory + ARG 4 roll + ARG 5 modifierZ + ARG 6 modifierXYZ METHOD m_jyeyoflu canBreakBlocks (Lnet/minecraft/unmapped/C_bdwnwhiu;)Z METHOD m_ltcpkbap updateRotation (FF)F ARG 0 prevRot @@ -41,12 +55,25 @@ CLASS net/minecraft/unmapped/C_ltpsyvhj net/minecraft/entity/projectile/Projecti ARG 4 roll ARG 5 modifierZ ARG 6 modifierXYZ + METHOD m_pxcagbzy onSpawned (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;)V METHOD m_qspsfakl isOwner (Lnet/minecraft/unmapped/C_astfners;)Z ARG 1 entity + METHOD m_rfjmckqt spawn (Lnet/minecraft/unmapped/C_ltpsyvhj;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ltpsyvhj; METHOD m_ruolgrkr shouldLeaveOwner ()Z METHOD m_rxkvtyyv getHorizontalKnockback (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_sbxfkpyv;)Lit/unimi/dsi/fastutil/doubles/DoubleDoubleImmutablePair; ARG 1 target ARG 2 source + METHOD m_siviquov spawn (Lnet/minecraft/unmapped/C_ltpsyvhj;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/function/Consumer;)Lnet/minecraft/unmapped/C_ltpsyvhj; + ARG 0 projectileEntity + ARG 3 beforeSpawn + METHOD m_tzwvduph spawn (Lnet/minecraft/unmapped/C_ltpsyvhj$C_kpzjrlxz;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_usxaxydn;DDDFF)Lnet/minecraft/unmapped/C_ltpsyvhj; + ARG 0 factory + ARG 4 x + ARG 6 y + ARG 8 z + ARG 10 power + ARG 11 divergence + METHOD m_uvnnhjdj getEntity (Ljava/util/UUID;)Lnet/minecraft/unmapped/C_astfners; METHOD m_vxsjwvrq updateRotation ()V METHOD m_wosjyviq setOwner (Lnet/minecraft/unmapped/C_astfners;)V ARG 1 entity @@ -57,3 +84,4 @@ CLASS net/minecraft/unmapped/C_ltpsyvhj net/minecraft/entity/projectile/Projecti ARG 2 deflectingEntity ARG 3 owner ARG 4 fromAttack + CLASS C_kpzjrlxz ProjectileEntityFactory diff --git a/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping index 8ddfb011de..587c3219e3 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/unmapped/C_rsdafihp net/minecraft/entity/projectile/thrown/ThrownEntity + FIELD f_etfjratb MIN_CAMERA_DISTANCE_SQUARED F METHOD (Lnet/minecraft/unmapped/C_ogavsvbr;DDDLnet/minecraft/unmapped/C_cdctfzbn;)V ARG 1 type ARG 2 x ARG 4 y ARG 6 z ARG 8 world + METHOD m_gnbcdvex applyDrag ()V + METHOD m_pxnqlzii tickInitialBubbleColumnCollision ()V diff --git a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping index 9f3da119fc..2b3b2086df 100644 --- a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping +++ b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping @@ -57,6 +57,10 @@ CLASS net/minecraft/unmapped/C_iaguvmwh net/minecraft/entity/raid/RaiderEntity METHOD m_snbezfbo canLootHome (Lnet/minecraft/unmapped/C_hynzadkk;)Z ARG 1 pos CLASS C_vpxlflhj PickupBannerAsLeaderGoal + FIELD f_nyblqxnm path Lnet/minecraft/unmapped/C_motipebf; + FIELD f_phrqvzwy unreachableBannerCache Lit/unimi/dsi/fastutil/ints/Int2LongOpenHashMap; + FIELD f_shcpzyqi desiredBannerItemEntity Lnet/minecraft/unmapped/C_uqpzijng; FIELD f_sjalgbhs actor Lnet/minecraft/unmapped/C_iaguvmwh; METHOD (Lnet/minecraft/unmapped/C_iaguvmwh;Lnet/minecraft/unmapped/C_iaguvmwh;)V ARG 2 actor + METHOD m_yefbcnoo shouldStop ()Z diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index cc0fd39f1f..341b1524f8 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -120,6 +120,8 @@ CLASS net/minecraft/unmapped/C_rbfddnlp net/minecraft/network/listener/ClientPla ARG 1 packet METHOD m_mwhsvrzj onChunkLoadDistanceUpdate (Lnet/minecraft/unmapped/C_ogcdqbko;)V ARG 1 packet + METHOD m_nbdaebbl onPlayerInventoryUpdate (Lnet/minecraft/unmapped/C_yjakgqnt;)V + ARG 1 packet METHOD m_nirbbegl onProjectilePower (Lnet/minecraft/unmapped/C_jhbjvrtr;)V ARG 1 packet METHOD m_nkywqjlj onTeamUpdate (Lnet/minecraft/unmapped/C_yxooxvgv;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerInventoryUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerInventoryUpdateS2CPacket.mapping new file mode 100644 index 0000000000..123f8c17e9 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerInventoryUpdateS2CPacket.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_yjakgqnt net/minecraft/network/packet/s2c/play/PlayerInventoryUpdateS2CPacket diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping index 2a4689c684..c22951243e 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping @@ -33,6 +33,7 @@ CLASS net/minecraft/unmapped/C_myhiyoxi net/minecraft/predicate/entity/EntityPre FIELD f_oxnametc COLLIDABLE_EXCEPT_SPECTATOR Ljava/util/function/Predicate; FIELD f_qaeklxpj EXCEPT_CREATIVE_OR_SPECTATOR Ljava/util/function/Predicate; FIELD f_svyelser EXCEPT_SPECTATOR Ljava/util/function/Predicate; + FIELD f_uslwafbb CAN_HIT Ljava/util/function/Predicate; METHOD m_eefyztox (Lnet/minecraft/unmapped/C_astfners;)Z ARG 0 entity METHOD m_fuvpaesr (Lnet/minecraft/unmapped/C_astfners;)Z diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index a189bb093a..182ccebd52 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -128,6 +128,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer COMMENT @see net.minecraft.server.network.ServerLoginNetworkHandler METHOD m_cpahzimu isStopping ()Z METHOD m_cuuhdoqu syncChunkWrites ()Z + METHOD m_cvfglksi getAverageTickTimeMillis ()F METHOD m_dajeggfi getResourceManager ()Lnet/minecraft/unmapped/C_tmnrpasf; METHOD m_dbtaxkzj updateMobSpawnOptions ()V METHOD m_ddlaxvao getServerResourcePackProperties ()Ljava/util/Optional; @@ -417,6 +418,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer ARG 1 properties METHOD m_yvsocvtk resetRecorder ()V METHOD m_zopvbxou getSaveProperties ()Lnet/minecraft/unmapped/C_jkevluio; + METHOD m_zpabhbdy getTickManager ()Lnet/minecraft/unmapped/C_ogibcuum; METHOD m_zprgpanc startDebug ()V METHOD m_zsxirona getServerIp ()Ljava/lang/String; METHOD m_zueyhxqi loadFavicon ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/util/random/RandomGenerator.mapping b/mappings/net/minecraft/util/random/RandomGenerator.mapping index 67b349cf23..e62766d15a 100644 --- a/mappings/net/minecraft/util/random/RandomGenerator.mapping +++ b/mappings/net/minecraft/util/random/RandomGenerator.mapping @@ -8,6 +8,17 @@ CLASS net/minecraft/unmapped/C_rlomrsco net/minecraft/util/random/RandomGenerato COMMENT @throws IllegalArgumentException if {@code max} isn't positive ARG 1 max COMMENT the upper limit on values (exclusive) + METHOD m_aokkzmee nextTriangular (DD)D + COMMENT {@return a random {@code double} between {@code mode - deviation} and + COMMENT {@code mode + deviation} (both inclusive) with mode {@code mode}} + COMMENT + COMMENT Because the return value follows a symmetric triangular distribution, + COMMENT the distribution's mean and median are equal to {@code mode}. + ARG 1 mode + ARG 3 deviation + METHOD m_arkijfie nextTriangular (FF)F + ARG 1 mode + ARG 2 deviation METHOD m_bggirwfo createPositionalRandomFactory ()Lnet/minecraft/unmapped/C_coqzjjrt; METHOD m_culopwlx skip (I)V ARG 1 count diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index aa5cedf470..0f396dd1e1 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -197,6 +197,7 @@ CLASS net/minecraft/unmapped/C_cdctfzbn net/minecraft/world/World ARG 9 category ARG 10 volume ARG 11 pitch + METHOD m_mlvimbbc getRecipeManager ()Lnet/minecraft/unmapped/C_wzaefoxm; METHOD m_mmqmrwak asString ()Ljava/lang/String; METHOD m_mnoqfxga isRaining ()Z METHOD m_mtjavzfl canPlayerModifyAt (Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_hynzadkk;)Z diff --git a/simple_type_field_names.json5 b/simple_type_field_names.json5 index 4278fc73b0..5e1c7b1a01 100644 --- a/simple_type_field_names.json5 +++ b/simple_type_field_names.json5 @@ -12,6 +12,12 @@ "com/mojang/serialization/MapCodec": "codec", "net/minecraft/unmapped/C_qsrmwluu": "packetCodec", // PacketCodec "com/mojang/datafixers/util/Pair": "pair", + "net/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc": { // StringIdentifiable.EnumCodec + local_name: "codec", + fallback: [ + "enumCodec" + ] + }, // Data "net/minecraft/unmapped/C_nykrdyol": "exporter", // RecipeExporter From dc1d87b6f8dc04474f43040ef0ce4b5fb56aa910 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Sat, 26 Oct 2024 20:30:45 -0500 Subject: [PATCH 14/24] COMPLETE --- .../net/minecraft/client/input/Input.mapping | 1 + .../entity/AreaEffectCloudEntity.mapping | 2 + .../net/minecraft/entity/EntityType.mapping | 17 +++++ .../net/minecraft/entity/ItemEntity.mapping | 3 + .../entity/OminousItemSpawnerEntity.mapping | 2 + .../net/minecraft/entity/PositionFlag.mapping | 9 +++ .../thrown}/EyeOfEnderEntity.mapping | 3 +- .../ExperimentalMinecartController.mapping | 64 ++++++++++++++++++- .../vehicle/FurnaceMinecartEntity.mapping | 4 ++ .../vehicle/HopperMinecartEntity.mapping | 2 + .../vehicle/LegacyMinecartController.mapping | 21 ++++++ .../entity/vehicle/MinecartEntity.mapping | 2 + .../entity/vehicle/TntMinecartEntity.mapping | 3 + .../entity/vehicle/VehicleEntity.mapping | 3 + .../server/network/ServerPlayerEntity.mapping | 2 + .../minecraft/util/math/MathHelper.mapping | 3 + .../net/minecraft/util/math/Vec3d.mapping | 2 + 17 files changed, 141 insertions(+), 2 deletions(-) rename mappings/net/minecraft/entity/{ => projectile/thrown}/EyeOfEnderEntity.mapping (84%) create mode 100644 mappings/net/minecraft/entity/vehicle/LegacyMinecartController.mapping diff --git a/mappings/net/minecraft/client/input/Input.mapping b/mappings/net/minecraft/client/input/Input.mapping index c147aa8a80..24ce301186 100644 --- a/mappings/net/minecraft/client/input/Input.mapping +++ b/mappings/net/minecraft/client/input/Input.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/unmapped/C_graemaps net/minecraft/client/input/Input + FIELD f_bltkqzwh EMPTY Lnet/minecraft/unmapped/C_graemaps; FIELD f_henmwcos pressingLeft Z FIELD f_vrmirqod pressingRight Z diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping index 69f9c84dd5..72a36a137e 100644 --- a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping +++ b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping @@ -26,6 +26,7 @@ CLASS net/minecraft/unmapped/C_dtsrsfye net/minecraft/entity/AreaEffectCloudEnti ARG 6 z METHOD m_bfrkvfja setRadiusGrowth (F)V ARG 1 growth + METHOD m_dplbdkym tickClient ()V METHOD m_eqkyeibg getRadiusOnUse ()F METHOD m_ereonukk setDurationOnUse (I)V ARG 1 durationOnUse @@ -55,3 +56,4 @@ CLASS net/minecraft/unmapped/C_dtsrsfye net/minecraft/entity/AreaEffectCloudEnti ARG 1 waiting METHOD m_volshxzg isWaiting ()Z METHOD m_wqpyilil getDuration ()I + METHOD m_xulccvfs tickServer (Lnet/minecraft/unmapped/C_bdwnwhiu;)V diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 429a791b5b..773d86f30e 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -44,7 +44,12 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType ARG 0 nbt ARG 1 world ARG 3 entityProcessor + METHOD m_doxdnahd createBoatFactory (Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_ogavsvbr$C_pasczndl; + ARG 0 dropItem METHOD m_faoepycm getDimensions ()Lnet/minecraft/unmapped/C_sszpscpo; + METHOD m_gmedtjoz spawn (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_bhyaesep;ZZ)Lnet/minecraft/unmapped/C_astfners; + ARG 6 alignPosition + ARG 7 invertY METHOD m_hekybjlx getSpawnBox (DDD)Lnet/minecraft/unmapped/C_hbcjzgoe; ARG 1 x ARG 3 y @@ -52,6 +57,8 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType METHOD m_hhehahrt loadEntityFromNbt (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_bhyaesep;)Ljava/util/Optional; ARG 0 nbt ARG 1 world + METHOD m_hyyvvjps createChestBoatFactory (Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_ogavsvbr$C_pasczndl; + ARG 0 dropItem METHOD m_ijebmrdp appendCustomEntityStackSpawnConfig (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jzrpycqo;)Ljava/util/function/Consumer; ARG 0 previous ARG 3 player @@ -71,11 +78,15 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType METHOD m_mzwuvsgt appendDefaultStackSpawnConfig (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jzrpycqo;)Ljava/util/function/Consumer; ARG 0 previous ARG 3 player + METHOD m_navxebru createChestRaftFactory (Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_ogavsvbr$C_pasczndl; + ARG 0 dropItem METHOD m_ncqhbjml getHeight ()F + METHOD m_nmoiyemp spawn (Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_bhyaesep;ZZ)Lnet/minecraft/unmapped/C_astfners; METHOD m_nshhmmgl get (Ljava/lang/String;)Ljava/util/Optional; ARG 0 id METHOD m_oebfrxli create (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_bhyaesep;)Lnet/minecraft/unmapped/C_astfners; METHOD m_oqyurndf getWidth ()F + METHOD m_osxbzipi createFromNbt (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_bhyaesep;)Ljava/util/Optional; METHOD m_pebhwwxb getId (Lnet/minecraft/unmapped/C_ogavsvbr;)Lnet/minecraft/unmapped/C_ncpywfca; ARG 0 type METHOD m_qprblwyz isSaveable ()Z @@ -90,7 +101,11 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType ARG 1 player ARG 2 entity ARG 3 nbt + METHOD m_tjmuaxwr create (Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_bhyaesep;ZZ)Lnet/minecraft/unmapped/C_astfners; + ARG 2 consumer + ARG 5 alignPosition METHOD m_tnzvrnms alwaysUpdateVelocity ()Z + METHOD m_tqxwdyaw spawn (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_bhyaesep;)Lnet/minecraft/unmapped/C_astfners; METHOD m_trtwdwmq getTrackTickInterval ()I METHOD m_wbaqqhrp getMaxTrackDistance ()I COMMENT Returns the tracking distance, in chunks, of this type of entity @@ -101,6 +116,8 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType METHOD m_wpubgsdl register (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;)Lnet/minecraft/unmapped/C_ogavsvbr; ARG 0 type ARG 1 builder + METHOD m_ytnkhrki createRaftFactory (Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_ogavsvbr$C_pasczndl; + ARG 0 dropItem METHOD m_znjphnxr getTranslationKey ()Ljava/lang/String; CLASS C_ddulqwnm METHOD tryAdvance (Ljava/util/function/Consumer;)Z diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping index a43310a077..fa52706664 100644 --- a/mappings/net/minecraft/entity/ItemEntity.mapping +++ b/mappings/net/minecraft/entity/ItemEntity.mapping @@ -72,6 +72,8 @@ CLASS net/minecraft/unmapped/C_uqpzijng net/minecraft/entity/ItemEntity METHOD m_pfxkbxad resetPickupDelay ()V COMMENT Sets the number of ticks before this item entity can be picked up COMMENT to 0. + METHOD m_pvlvkfwv applyBuoyancy (D)V + ARG 1 horizontalMultiplier METHOD m_qqncmjle setPickupDelay (I)V COMMENT Sets the number of ticks before this item entity can be picked up COMMENT to {@code pickupDelay}. @@ -92,6 +94,7 @@ CLASS net/minecraft/unmapped/C_uqpzijng net/minecraft/entity/ItemEntity METHOD m_taxbqlwn tryMerge ()V METHOD m_uddnzjha getRotation (FF)F ARG 0 tickDelta + ARG 1 offset METHOD m_ufhoqyem setToDefaultPickupDelay ()V COMMENT Sets the number of ticks before this item entity can be picked up COMMENT to the default value of 10. diff --git a/mappings/net/minecraft/entity/OminousItemSpawnerEntity.mapping b/mappings/net/minecraft/entity/OminousItemSpawnerEntity.mapping index 8fdce998d5..9abd0b43b7 100644 --- a/mappings/net/minecraft/entity/OminousItemSpawnerEntity.mapping +++ b/mappings/net/minecraft/entity/OminousItemSpawnerEntity.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/unmapped/C_czxrapyw net/minecraft/entity/OminousItemSpawnerE FIELD f_hwkvzweu MIN_ITEM_SPAWN_DELAY I FIELD f_iqwiqvcx ITEM_KEY Ljava/lang/String; FIELD f_nbbuvcry MAX_ITEM_SPAWN_DELAY I + METHOD m_adqditum spawnProjectile (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_dokwmwgh;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_astfners; + ARG 2 projectile METHOD m_apattskp getItem ()Lnet/minecraft/unmapped/C_sddaxwyk; METHOD m_fschfwkq spawnItem ()V METHOD m_hbpvxart create (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_czxrapyw; diff --git a/mappings/net/minecraft/entity/PositionFlag.mapping b/mappings/net/minecraft/entity/PositionFlag.mapping index 093ee53fd6..1d3f4199a6 100644 --- a/mappings/net/minecraft/entity/PositionFlag.mapping +++ b/mappings/net/minecraft/entity/PositionFlag.mapping @@ -3,3 +3,12 @@ CLASS net/minecraft/unmapped/C_crougwaz net/minecraft/entity/PositionFlag FIELD f_xilpqumj id I FIELD f_xthkdyos VALUES Ljava/util/Set; FIELD f_xyfjsrdy DELTA Ljava/util/Set; + METHOD m_cjwjpqsk combine ([Ljava/util/Set;)Ljava/util/Set; + ARG 0 sets + METHOD m_eruhosiw isSet (I)Z + ARG 1 mask + METHOD m_niirtfqm getMask ()I + METHOD m_pazeqcyr unpack (I)Ljava/util/Set; + ARG 0 flags + METHOD m_ynwzqznh pack (Ljava/util/Set;)I + ARG 0 flags diff --git a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/EyeOfEnderEntity.mapping similarity index 84% rename from mappings/net/minecraft/entity/EyeOfEnderEntity.mapping rename to mappings/net/minecraft/entity/projectile/thrown/EyeOfEnderEntity.mapping index 8bb72d313a..a533cff263 100644 --- a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/EyeOfEnderEntity.mapping @@ -1,10 +1,11 @@ -CLASS net/minecraft/unmapped/C_juzydrbx net/minecraft/entity/EyeOfEnderEntity +CLASS net/minecraft/unmapped/C_juzydrbx net/minecraft/entity/projectile/thrown/EyeOfEnderEntity FIELD f_azshsyjb lifespan I FIELD f_dsomuhan dropsItem Z FIELD f_etlbclfy targetZ D FIELD f_ftehkous ITEM Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_kmcrwfej targetY D FIELD f_myszgzhz targetX D + FIELD f_xqykrtsq MIN_CAMERA_DISTANCE_SQUARED F METHOD (Lnet/minecraft/unmapped/C_cdctfzbn;DDD)V ARG 1 world ARG 2 x diff --git a/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping b/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping index c2af06c0ea..1d3456bdc4 100644 --- a/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping +++ b/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping @@ -1,3 +1,65 @@ CLASS net/minecraft/unmapped/C_btculrky net/minecraft/entity/vehicle/ExperimentalMinecartController - CLASS C_yianzbtt + FIELD f_hikwcdre lastLerpStep Lnet/minecraft/unmapped/C_btculrky$C_xoihtwzz; + FIELD f_icggxsas Y_OFFSET_ON_RAIL D + FIELD f_jbgmphca currentLerpSteps Ljava/util/List; + FIELD f_kxhjtdkb REFRESH_TICKS I + FIELD f_ljrpmnlw currentTotalWeight D + FIELD f_mnqowxmz lerpSteps Ljava/util/List; + FIELD f_rhqsxplj ticksToNextUpdate I + FIELD f_tbzdvaef cachedTicksToNextUpdate I + FIELD f_uqdjwxfd cachedPartialTick F + FIELD f_yhexcgfs lastPartialTickStep Lnet/minecraft/unmapped/C_btculrky$C_dzjsmtju; + FIELD f_zosxuhfo V_SHAPED_TRACK_STOP_THRESHOLD D + METHOD m_djwrnguw getLerpedPitch (F)F + METHOD m_hptwubgx boostFromPoweredRail (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_vgpupfxx; + ARG 1 velocity + METHOD m_hzzcyntk decelerateFromPoweredRail (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_vgpupfxx; + ARG 1 velocity + METHOD m_izllixuq setRotation (FF)V + ARG 1 yaw + ARG 2 pitch + METHOD m_jbchdtyf setLastLerpStep ()V + METHOD m_kmamcsdp restAtVShape (Lnet/minecraft/unmapped/C_wqmdpcsg;Lnet/minecraft/unmapped/C_wqmdpcsg;)Z + ARG 1 currentRailShape + ARG 2 nextRailShape + METHOD m_lcsmvxnj pushEntities (Lnet/minecraft/unmapped/C_hbcjzgoe;)Z + ARG 1 bounds + METHOD m_lysdpqwh getLerpedPos (F)Lnet/minecraft/unmapped/C_vgpupfxx; + METHOD m_lzgrxckh getLerpedVelocity (F)Lnet/minecraft/unmapped/C_vgpupfxx; + METHOD m_odbcfrkh adjustToRails (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Z)V + ARG 3 ignoreWeight + METHOD m_qvaafauq getPartialTickStep (F)Lnet/minecraft/unmapped/C_btculrky$C_dzjsmtju; + ARG 1 tickDelta + METHOD m_qxvvmicx getLerpedYaw (F)F + METHOD m_tamvnwwk pickUpEntities (Lnet/minecraft/unmapped/C_hbcjzgoe;)Z + ARG 1 bounds + METHOD m_udvfwekl hasCurrentLerpSteps ()Z + METHOD m_udyxcniz applyPlayerInputVelocity (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_vgpupfxx; + ARG 1 velocity + METHOD m_whxsvdci calculateTrackVelocity (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_btculrky$C_yianzbtt;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_wqmdpcsg;)Lnet/minecraft/unmapped/C_vgpupfxx; + ARG 2 currentVelocity + ARG 3 iteration + ARG 6 shape + METHOD m_xucvbevm isDescending (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_wqmdpcsg;)Z + ARG 1 velocity + ARG 2 shape + METHOD m_yfseascf applySlopeVelocity (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_wqmdpcsg;)Lnet/minecraft/unmapped/C_vgpupfxx; + ARG 1 velocity + ARG 2 shape + METHOD m_zwxvpqxy tickClient ()V + CLASS C_dzjsmtju PartialTickStep + CLASS C_xoihtwzz Step + FIELD f_cpwhtplq ZERO Lnet/minecraft/unmapped/C_btculrky$C_xoihtwzz; + FIELD f_detfpquq velocity Lnet/minecraft/unmapped/C_vgpupfxx; + FIELD f_dkmnnaot yaw F + FIELD f_mnuzwqgi pitch F + METHOD m_albtrwoo yaw ()F + METHOD m_xoottmay velocity ()Lnet/minecraft/unmapped/C_vgpupfxx; + METHOD m_xpxfoqjx pitch ()F + CLASS C_yianzbtt MovementIteration + FIELD f_atrvdqal hasDecelerated Z + FIELD f_benbzlsn hasBoosted Z + FIELD f_ccpdmmpc hasGainedSlopeVelocity Z FIELD f_eqovgqok remainingMovement D + FIELD f_vcuwlxde initial Z + METHOD m_phqxttmg shouldContinue ()Z diff --git a/mappings/net/minecraft/entity/vehicle/FurnaceMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/FurnaceMinecartEntity.mapping index 08562a1978..5ff38e59c3 100644 --- a/mappings/net/minecraft/entity/vehicle/FurnaceMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/FurnaceMinecartEntity.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/unmapped/C_xepwpefa net/minecraft/entity/vehicle/FurnaceMinecartEntity FIELD f_dfnuxjgz fuel I + FIELD f_hpxypnjt FUEL_TICKS_PER_ITEM I + FIELD f_ihcfuort MAX_FUEL_TICKS I FIELD f_kviokqsx LIT Lnet/minecraft/unmapped/C_rinmcaxy; + FIELD f_yrcgyerw pushVec Lnet/minecraft/unmapped/C_vgpupfxx; METHOD m_lfyrjvcu isLit ()Z + METHOD m_yswrnvla calculateNewPush (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_vgpupfxx; METHOD m_zarbhdyq setLit (Z)V ARG 1 lit diff --git a/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping index 62e2bce526..73a53ff101 100644 --- a/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/unmapped/C_jloefuwq net/minecraft/entity/vehicle/HopperMinecartEntity + FIELD f_ggjucjed hopperTicked Z FIELD f_nbzcuwxz enabled Z METHOD m_azpkicgc isEnabled ()Z + METHOD m_mcjbqnry tryTickHopper ()V METHOD m_mvpbhvqj setEnabled (Z)V ARG 1 enabled METHOD m_xispepby canOperate ()Z diff --git a/mappings/net/minecraft/entity/vehicle/LegacyMinecartController.mapping b/mappings/net/minecraft/entity/vehicle/LegacyMinecartController.mapping new file mode 100644 index 0000000000..672686cbc3 --- /dev/null +++ b/mappings/net/minecraft/entity/vehicle/LegacyMinecartController.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/unmapped/C_nfapbymz net/minecraft/entity/vehicle/LegacyMinecartController + FIELD f_abcisqdy lerpSteps I + FIELD f_cehsldhz lerpYaw D + FIELD f_ewlupdss lerpX D + FIELD f_ixokaqad MAX_LAND_SPEED D + FIELD f_izzyovcd lerpZ D + FIELD f_jaelyxwl lerpPitch D + FIELD f_ldyuiyqy MAX_SPEED D + FIELD f_nqbvutdh lerpY D + FIELD f_okpgaujd velocity Lnet/minecraft/unmapped/C_vgpupfxx; + FIELD f_ppqfbxxz RIDABLE_THRESHOLD D + FIELD f_rpnxkbdi MAX_SPEED_IN_WATER D + METHOD m_wyywkxhi getPosOffset (DDDD)Lnet/minecraft/unmapped/C_vgpupfxx; + ARG 1 x + ARG 3 y + ARG 5 z + ARG 7 offsetMultiplier + METHOD m_yhxvynyv getRailPos (DDD)Lnet/minecraft/unmapped/C_vgpupfxx; + ARG 1 x + ARG 3 y + ARG 5 z diff --git a/mappings/net/minecraft/entity/vehicle/MinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/MinecartEntity.mapping index 92a8a03960..cac8989388 100644 --- a/mappings/net/minecraft/entity/vehicle/MinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/MinecartEntity.mapping @@ -1 +1,3 @@ CLASS net/minecraft/unmapped/C_hodmqzcj net/minecraft/entity/vehicle/MinecartEntity + FIELD f_dhnbkkty rotationOffset F + FIELD f_qwofdmlr playerRotationOffset F diff --git a/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping index 83d5587211..7966a0acb0 100644 --- a/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/unmapped/C_joafvsgg net/minecraft/entity/vehicle/TntMinecartEntity FIELD f_fuwpndte PRIME_TNT_STATUS B FIELD f_xeaundwi fuseTicks I + FIELD f_ygqtkild explosionPower F + FIELD f_yohgebbj EXPLOSION_POWER_KEY Ljava/lang/String; + FIELD f_ypuvkexd DEFAULT_EXPLOSION_POWER F METHOD m_bmxcgobn shouldDetonateFrom (Lnet/minecraft/unmapped/C_sbxfkpyv;)Z ARG 0 source METHOD m_hcisdzyn explode (D)V diff --git a/mappings/net/minecraft/entity/vehicle/VehicleEntity.mapping b/mappings/net/minecraft/entity/vehicle/VehicleEntity.mapping index 39c488ae65..d52af88f92 100644 --- a/mappings/net/minecraft/entity/vehicle/VehicleEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/VehicleEntity.mapping @@ -7,6 +7,9 @@ CLASS net/minecraft/unmapped/C_ogoqhclb net/minecraft/entity/vehicle/VehicleEnti METHOD m_gbbedxeg getDamageWobbleTicks ()I METHOD m_gbralwah isDestroyedBy (Lnet/minecraft/unmapped/C_sbxfkpyv;)Z ARG 1 source + METHOD m_jynbrcac killAndDropSelf (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;)V + ARG 2 source + METHOD m_mdfqmdmw killAndDropItem (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_vorddnax;)V METHOD m_ubjgxlhd setDamageWobbleTicks (I)V ARG 1 ticks METHOD m_votqnvdy getDamageWobbleSide ()I diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 942ee7386f..4344fae3ba 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/unmapped/C_mxrobsgg net/minecraft/server/network/ServerPlaye FIELD f_aigmlatx screenHandlerSyncId I FIELD f_ancsmfuf lastExperienceScore I FIELD f_awxwtkbc lastLevelScore I + FIELD f_bpaumbdz lastClientInput Lnet/minecraft/unmapped/C_graemaps; FIELD f_capnwlvs levitationStartPos Lnet/minecraft/unmapped/C_vgpupfxx; FIELD f_cfahbfba fallStartPos Lnet/minecraft/unmapped/C_vgpupfxx; FIELD f_czcwatdw lastAirScore I @@ -136,6 +137,7 @@ CLASS net/minecraft/unmapped/C_mxrobsgg net/minecraft/server/network/ServerPlaye ARG 1 overlay METHOD m_itdwcvgj worldChanged (Lnet/minecraft/unmapped/C_bdwnwhiu;)V ARG 1 origin + METHOD m_jjdnefmi getLastClientMovementIntent ()Lnet/minecraft/unmapped/C_vgpupfxx; METHOD m_juidebgy tickFallStartPos ()V METHOD m_kbplwriu calculateSpawnOffsetMultiplier (I)I ARG 1 horizontalSpawnArea diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 2bf23ad6bb..0dd9f11e24 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -93,6 +93,9 @@ CLASS net/minecraft/unmapped/C_zpccxxiz net/minecraft/util/math/MathHelper ARG 0 delta ARG 1 start ARG 2 end + METHOD m_fhdlaekg lerp (DLnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_vgpupfxx; + ARG 2 start + ARG 3 end METHOD m_fpdoqovb getInt (Ljava/lang/String;I)I ARG 0 string ARG 1 fallback diff --git a/mappings/net/minecraft/util/math/Vec3d.mapping b/mappings/net/minecraft/util/math/Vec3d.mapping index 1f09d2df6a..5eda7175e9 100644 --- a/mappings/net/minecraft/util/math/Vec3d.mapping +++ b/mappings/net/minecraft/util/math/Vec3d.mapping @@ -142,6 +142,8 @@ CLASS net/minecraft/unmapped/C_vgpupfxx net/minecraft/util/math/Vec3d METHOD m_mjeeyswf of (Lnet/minecraft/unmapped/C_ceivtqhh;)Lnet/minecraft/unmapped/C_vgpupfxx; COMMENT Copies the given vector. ARG 0 vec + METHOD m_mpspxixx projectOnto (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_vgpupfxx; + METHOD m_nmcmnhiy horizontal ()Lnet/minecraft/unmapped/C_vgpupfxx; METHOD m_ozbglzhr relativize (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_vgpupfxx; COMMENT Subtracts this vector from the given vector. COMMENT From 68bab3a8d6d15c9617e3a1cba64430ae2ff8ed6e Mon Sep 17 00:00:00 2001 From: ix0rai Date: Sat, 26 Oct 2024 21:01:57 -0500 Subject: [PATCH 15/24] fix casing issues --- mappings/net/minecraft/client/input/Input.mapping | 2 +- .../entity/vehicle/ExperimentalMinecartController.mapping | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/client/input/Input.mapping b/mappings/net/minecraft/client/input/Input.mapping index 24ce301186..a66cc01147 100644 --- a/mappings/net/minecraft/client/input/Input.mapping +++ b/mappings/net/minecraft/client/input/Input.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/unmapped/C_graemaps net/minecraft/client/input/Input - FIELD f_bltkqzwh EMPTY Lnet/minecraft/unmapped/C_graemaps; + FIELD f_bltkqzwh empty Lnet/minecraft/unmapped/C_graemaps; FIELD f_henmwcos pressingLeft Z FIELD f_vrmirqod pressingRight Z diff --git a/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping b/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping index 1d3456bdc4..a7fa2c79ee 100644 --- a/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping +++ b/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping @@ -49,7 +49,7 @@ CLASS net/minecraft/unmapped/C_btculrky net/minecraft/entity/vehicle/Experimenta METHOD m_zwxvpqxy tickClient ()V CLASS C_dzjsmtju PartialTickStep CLASS C_xoihtwzz Step - FIELD f_cpwhtplq ZERO Lnet/minecraft/unmapped/C_btculrky$C_xoihtwzz; + FIELD f_cpwhtplq zero Lnet/minecraft/unmapped/C_btculrky$C_xoihtwzz; FIELD f_detfpquq velocity Lnet/minecraft/unmapped/C_vgpupfxx; FIELD f_dkmnnaot yaw F FIELD f_mnuzwqgi pitch F From f25801c50923310335f94c083d47cc5969639a97 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Mon, 28 Oct 2024 16:55:45 -0500 Subject: [PATCH 16/24] improved target predicate names --- .../net/minecraft/entity/ai/brain/sensor/Sensor.mapping | 6 +++--- mappings/net/minecraft/entity/mob/PhantomEntity.mapping | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping index 67f0351e92..9ca23de899 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping @@ -25,14 +25,14 @@ CLASS net/minecraft/unmapped/C_brvrbzqh net/minecraft/entity/ai/brain/sensor/Sen METHOD m_dzzsgvsj tick (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;)V ARG 1 world ARG 2 entity - METHOD m_namfjgwr testAttackableTargetPredicateIgnoreVisibility (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z + METHOD m_namfjgwr canAttackIgnoreVisibility (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z ARG 1 entity ARG 2 target METHOD m_oaooofgj updateTargetingRanges (Lnet/minecraft/unmapped/C_usxaxydn;)V - METHOD m_pjqiwcnh testTargetPredicate (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z + METHOD m_pjqiwcnh canTarget (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z ARG 1 entity ARG 2 target - METHOD m_rtpssfaw testAttackableTargetPredicate (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z + METHOD m_rtpssfaw canAttack (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z ARG 1 entity ARG 2 target METHOD m_ssofdmup sense (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;)V diff --git a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping index 8a1a4438e7..7e3b4c8ccb 100644 --- a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/unmapped/C_xghtjqbw net/minecraft/entity/mob/PhantomEntity FIELD f_vxkfiqyo movementType Lnet/minecraft/unmapped/C_xghtjqbw$C_gzcnjufx; FIELD f_yomimisq TICKS_PER_FLAP I METHOD m_blndykop getFlapTickOffset ()I - METHOD m_fvqarcie testTargetPredicate (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_cjtyhinh;)Z + METHOD m_fvqarcie canTarget (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_cjtyhinh;)Z ARG 3 predicate METHOD m_qsmmbmsk onSizeChanged ()V METHOD m_vbiamydm getPhantomSize ()I From a8a9097079f35e10ab3525794ae9c699508d3e02 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Mon, 28 Oct 2024 16:57:59 -0500 Subject: [PATCH 17/24] fix `setProperties` divergence and speed names --- .../net/minecraft/entity/projectile/ProjectileEntity.mapping | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 7e79c41be8..617c4bfaf7 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -53,8 +53,8 @@ CLASS net/minecraft/unmapped/C_ltpsyvhj net/minecraft/entity/projectile/Projecti ARG 2 pitch ARG 3 yaw ARG 4 roll - ARG 5 modifierZ - ARG 6 modifierXYZ + ARG 5 speed + ARG 6 divergence METHOD m_pxcagbzy onSpawned (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;)V METHOD m_qspsfakl isOwner (Lnet/minecraft/unmapped/C_astfners;)Z ARG 1 entity From a9a092548890d110280a638f9601f6d180ad9d3b Mon Sep 17 00:00:00 2001 From: ix0rai Date: Mon, 28 Oct 2024 16:59:56 -0500 Subject: [PATCH 18/24] apply some suggestions Co-authored-by: Will --- mappings/net/minecraft/entity/passive/PassiveEntity.mapping | 2 +- .../net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping | 2 +- .../entity/vehicle/ExperimentalMinecartController.mapping | 2 +- mappings/net/minecraft/world/BlockView.mapping | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping index b577568627..643ec0e47b 100644 --- a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/unmapped/C_jvojbnla net/minecraft/entity/passive/PassiveEnti METHOD m_qxlffuwy isReadyToBreed ()Z METHOD m_rrykeatb setBreedingAge (I)V ARG 1 age - METHOD m_tjkaggcz getHappyTicksRemaining ()I + METHOD m_tjkaggcz getRemainingHappyTicks ()I METHOD m_xdpbetzz onGrowUp ()V CLASS C_uxhqdxwl PassiveData FIELD f_bhvaxmjs babyChance F diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index 3bc62ab94b..a320366e71 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -69,4 +69,4 @@ CLASS net/minecraft/unmapped/C_tahhkgty net/minecraft/entity/vehicle/AbstractMin METHOD m_zqqbmhzn hasCustomBlock ()Z METHOD m_zrztaorn (Ljava/util/EnumMap;)V ARG 0 map - METHOD m_zvxsupdf getCurrentPosOrRailBelow ()Lnet/minecraft/unmapped/C_hynzadkk; + METHOD m_zvxsupdf locateAffectingRailOrSelf ()Lnet/minecraft/unmapped/C_hynzadkk; diff --git a/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping b/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping index a7fa2c79ee..b074f8dd94 100644 --- a/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping +++ b/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping @@ -43,7 +43,7 @@ CLASS net/minecraft/unmapped/C_btculrky net/minecraft/entity/vehicle/Experimenta METHOD m_xucvbevm isDescending (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_wqmdpcsg;)Z ARG 1 velocity ARG 2 shape - METHOD m_yfseascf applySlopeVelocity (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_wqmdpcsg;)Lnet/minecraft/unmapped/C_vgpupfxx; + METHOD m_yfseascf applySlopeAcceleration (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_wqmdpcsg;)Lnet/minecraft/unmapped/C_vgpupfxx; ARG 1 velocity ARG 2 shape METHOD m_zwxvpqxy tickClient ()V diff --git a/mappings/net/minecraft/world/BlockView.mapping b/mappings/net/minecraft/world/BlockView.mapping index 747f8ca4a0..2d22400253 100644 --- a/mappings/net/minecraft/world/BlockView.mapping +++ b/mappings/net/minecraft/world/BlockView.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/unmapped/C_peaveboq net/minecraft/world/BlockView COMMENT Represents a scoped, read-only view of block states, fluid states and block entities. - FIELD f_evjnqixv MAX_BLOCK_ITERATIONS_COLLECTING_COLLISIONS I + FIELD f_evjnqixv MAX_COLLISION_COLLECTION_BLOCK_ITERATIONS METHOD m_bwuplpck (Lnet/minecraft/unmapped/C_rvvvywqd;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jdakttms; ARG 1 context ARG 2 pos From 6e526b643ae0321d319e557e7c27a65d85958c49 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Mon, 28 Oct 2024 17:01:21 -0500 Subject: [PATCH 19/24] fix `remainingHappyTicks` field --- mappings/net/minecraft/entity/passive/PassiveEntity.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping index 643ec0e47b..707e520e77 100644 --- a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/unmapped/C_jvojbnla net/minecraft/entity/passive/PassiveEntity FIELD f_epxqtcwc FORCED_AGE_PARTICLE_TICKS I - FIELD f_hnoazvab happyTicksRemaining I + FIELD f_hnoazvab remainingHappyTicks I FIELD f_lsykwgjd CHILD Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_rnhbullz breedingAge I FIELD f_xpxrrqcm BABY_AGE I From 73a9d6031d5676536064a889c708ba0cfdff54af Mon Sep 17 00:00:00 2001 From: ix0rai Date: Mon, 28 Oct 2024 17:03:00 -0500 Subject: [PATCH 20/24] more suggestions Co-authored-by: Will --- .../net/minecraft/entity/LivingEntity.mapping | 24 +++++++++++++++---- .../entity/player/PlayerInventory.mapping | 2 +- .../projectile/ProjectileEntity.mapping | 4 ++-- .../ExperimentalMinecartController.mapping | 2 +- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index f3d27f5fd6..da98d1a8ad 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -201,12 +201,26 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity COMMENT the effect to set ARG 2 source COMMENT the source entity or {@code null} for non-entity sources - METHOD m_emvhacmb isBeingSeenBy (Lnet/minecraft/unmapped/C_usxaxydn;DZZLjava/util/function/Predicate;[Ljava/util/function/DoubleSupplier;)Z - ARG 2 rotationCheckOffset - ARG 4 adjustToDistance + METHOD m_emvhacmb isSeenBy (Lnet/minecraft/unmapped/C_usxaxydn;DZZLjava/util/function/Predicate;[Ljava/util/function/DoubleSupplier;)Z + COMMENT @return {@code true} if the passed {@code entity} sees this entity and + COMMENT isn't {@code filter}ed, or {@code false} otherwise + ARG 1 + COMMENT the entity to check + ARG 2 tolerance + COMMENT the maximum allowable angle between the passed {@code entity}'s + COMMENT rotation and the vector between the entities + ARG 4 accountForDistance + COMMENT whether to reduce the {@code tolerance} based on distance ARG 5 visualShape - ARG 6 predicate - ARG 7 entityEyeYChecks + COMMENT whether to check the passed {@code entity}'s + COMMENT {@link net.minecraft.world.RaycastContext.ShapeType#VISUAL VISUAL} shape + COMMENT instead of its + COMMENT {@link net.minecraft.world.RaycastContext.ShapeType#COLLIDER COLLIDER} shape + ARG 6 filter + COMMENT an additional check to exclude entities whose gaze needn't be considered + ARG 7 eyeYsToCheck + COMMENT suppliers of eye Ys that should be checked; + COMMENT the first that results in a vector within the tolerance will be used METHOD m_eobwecax dropXp (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;)V ARG 2 attacker METHOD m_epkzhkqg deserializeBrain (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/unmapped/C_rjqjaxef; diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index 2c44a8f00b..6f52aeb48a 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -61,7 +61,7 @@ CLASS net/minecraft/unmapped/C_sxzqocrm net/minecraft/entity/player/PlayerInvent ARG 2 stack METHOD m_julzohay writeNbt (Lnet/minecraft/unmapped/C_hqhtfwlr;)Lnet/minecraft/unmapped/C_hqhtfwlr; ARG 1 nbtList - METHOD m_lhflraib createInventoryUpdatePacket (I)Lnet/minecraft/unmapped/C_yjakgqnt; + METHOD m_lhflraib createUpdatePacket (I)Lnet/minecraft/unmapped/C_yjakgqnt; ARG 1 slot METHOD m_mqaefcrf getOccupiedSlotWithRoomForStack (Lnet/minecraft/unmapped/C_sddaxwyk;)I ARG 1 stack diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 617c4bfaf7..e05ad5a909 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -38,8 +38,8 @@ CLASS net/minecraft/unmapped/C_ltpsyvhj net/minecraft/entity/projectile/Projecti METHOD m_joqridfr spawn (Lnet/minecraft/unmapped/C_ltpsyvhj$C_kpzjrlxz;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_usxaxydn;FFF)Lnet/minecraft/unmapped/C_ltpsyvhj; ARG 0 factory ARG 4 roll - ARG 5 modifierZ - ARG 6 modifierXYZ + ARG 5 speed + ARG 6 divergence METHOD m_jyeyoflu canBreakBlocks (Lnet/minecraft/unmapped/C_bdwnwhiu;)Z METHOD m_ltcpkbap updateRotation (FF)F ARG 0 prevRot diff --git a/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping b/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping index b074f8dd94..6d206cfe5f 100644 --- a/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping +++ b/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping @@ -59,7 +59,7 @@ CLASS net/minecraft/unmapped/C_btculrky net/minecraft/entity/vehicle/Experimenta CLASS C_yianzbtt MovementIteration FIELD f_atrvdqal hasDecelerated Z FIELD f_benbzlsn hasBoosted Z - FIELD f_ccpdmmpc hasGainedSlopeVelocity Z + FIELD f_ccpdmmpc hasAppliedSlopeAcceleration Z FIELD f_eqovgqok remainingMovement D FIELD f_vcuwlxde initial Z METHOD m_phqxttmg shouldContinue ()Z From 22978a76ed33fde8d11810da103a02d5d371bf2e Mon Sep 17 00:00:00 2001 From: ix0rai Date: Mon, 28 Oct 2024 17:03:17 -0500 Subject: [PATCH 21/24] teleport wording Co-authored-by: Will --- mappings/net/minecraft/entity/Entity.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 086f8070ac..2f5c3ba3e1 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -795,7 +795,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity COMMENT This is only called when the entity {@linkplain #hasWings() has wings} COMMENT and the entity {@linkplain #getMoveEffect() has any move effect}, from COMMENT {@link #addAirTravelEffects()}. - METHOD m_tjgpdfoe teleportCrossDimension (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sqhjwpkh;)Lnet/minecraft/unmapped/C_astfners; + METHOD m_tjgpdfoe teleportAcrossDimensions (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sqhjwpkh;)Lnet/minecraft/unmapped/C_astfners; ARG 2 target METHOD m_tjhbdkij isBeingRainedOn ()Z METHOD m_ttjwufim getY ()D From 898be54948ad86ca0572ea0ac82832f5c238dcb2 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Mon, 28 Oct 2024 17:07:28 -0500 Subject: [PATCH 22/24] `restIfInVShape` --- .../entity/vehicle/ExperimentalMinecartController.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping b/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping index b074f8dd94..f21b2c0d5b 100644 --- a/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping +++ b/mappings/net/minecraft/entity/vehicle/ExperimentalMinecartController.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/unmapped/C_btculrky net/minecraft/entity/vehicle/Experimenta ARG 1 yaw ARG 2 pitch METHOD m_jbchdtyf setLastLerpStep ()V - METHOD m_kmamcsdp restAtVShape (Lnet/minecraft/unmapped/C_wqmdpcsg;Lnet/minecraft/unmapped/C_wqmdpcsg;)Z + METHOD m_kmamcsdp restIfInVShape (Lnet/minecraft/unmapped/C_wqmdpcsg;Lnet/minecraft/unmapped/C_wqmdpcsg;)Z ARG 1 currentRailShape ARG 2 nextRailShape METHOD m_lcsmvxnj pushEntities (Lnet/minecraft/unmapped/C_hbcjzgoe;)Z From b1a8f860ceed5ef65e35befa0b20f2e5700a8266 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Mon, 28 Oct 2024 17:28:52 -0500 Subject: [PATCH 23/24] Update mappings/net/minecraft/util/random/RandomGenerator.mapping --- mappings/net/minecraft/util/random/RandomGenerator.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/net/minecraft/util/random/RandomGenerator.mapping b/mappings/net/minecraft/util/random/RandomGenerator.mapping index e62766d15a..19d898e61e 100644 --- a/mappings/net/minecraft/util/random/RandomGenerator.mapping +++ b/mappings/net/minecraft/util/random/RandomGenerator.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/unmapped/C_rlomrsco net/minecraft/util/random/RandomGenerato COMMENT the upper limit on values (exclusive) METHOD m_aokkzmee nextTriangular (DD)D COMMENT {@return a random {@code double} between {@code mode - deviation} and - COMMENT {@code mode + deviation} (both inclusive) with mode {@code mode}} + COMMENT {@code mode + deviation} (both exclusive) with mode {@code mode}} COMMENT COMMENT Because the return value follows a symmetric triangular distribution, COMMENT the distribution's mean and median are equal to {@code mode}. From d982504697ae3e6c0a634147913d8feba1f2cedd Mon Sep 17 00:00:00 2001 From: ix0rai Date: Mon, 28 Oct 2024 18:19:08 -0500 Subject: [PATCH 24/24] fix WorldEvents javadoc --- mappings/net/minecraft/world/WorldEvents.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping index af344df8db..3e7c57cf75 100644 --- a/mappings/net/minecraft/world/WorldEvents.mapping +++ b/mappings/net/minecraft/world/WorldEvents.mapping @@ -217,7 +217,7 @@ CLASS net/minecraft/unmapped/C_kkbhcwdu net/minecraft/world/WorldEvents FIELD f_rgtlhtzl EYE_OF_ENDER_BREAKS I COMMENT A thrown Eye of Ender breaks. COMMENT
Spawns several particles. - COMMENT

Called by {@link net.minecraft.entity.EyeOfEnderEntity#tick() EyeOfEnderEntity#tick} + COMMENT

Called by {@link net.minecraft.entity.projectile.thrown.EyeOfEnderEntity#tick() EyeOfEnderEntity#tick} FIELD f_rusjgtil WIND_CHARGE_SHOOT I FIELD f_sbzcuere BLOCK_SCRAPED I COMMENT A block is scraped.