From cf449b692f6f744872aad00584c40b5e8e3c30b1 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Wed, 16 Oct 2024 21:40:23 -0500 Subject: [PATCH] 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