Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

entity mappings #655

Merged
merged 30 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3ea998f
start working on entity mappings
ix0rai Oct 15, 2024
f6df2d1
some progress
ix0rai Oct 16, 2024
7e80216
Merge branch '1.21.2-pre5' into entities
github-actions[bot] Oct 17, 2024
cf449b6
more progress!
ix0rai Oct 17, 2024
b68cf48
Merge branch '1.21.2-rc1' into entities
github-actions[bot] Oct 17, 2024
de14456
`Entity` class fully mapped!
ix0rai Oct 17, 2024
742dad7
update
ix0rai Oct 18, 2024
a6b6b64
complete LivingEntity
ix0rai Oct 18, 2024
e76b8f1
glide -> fallFly
ix0rai Oct 18, 2024
8d2b9d6
lots of progress! (ai and mobs)
ix0rai Oct 19, 2024
fad9c78
mob entity completion!
ix0rai Oct 19, 2024
85e5704
Merge branch '1.21.2' into entities
github-actions[bot] Oct 22, 2024
2b60498
Merge branch '1.21.3' into entities
github-actions[bot] Oct 23, 2024
7ec1ae0
MORE
ix0rai Oct 24, 2024
14b19d7
boats!
ix0rai Oct 25, 2024
874314a
start working on minecarts
ix0rai Oct 25, 2024
3309777
complete passives and projectiles
ix0rai Oct 27, 2024
dc1d87b
COMPLETE
ix0rai Oct 27, 2024
68bab3a
fix casing issues
ix0rai Oct 27, 2024
f25801c
improved target predicate names
ix0rai Oct 28, 2024
a8a9097
fix `setProperties` divergence and speed names
ix0rai Oct 28, 2024
a9a0925
apply some suggestions
ix0rai Oct 28, 2024
6e526b6
fix `remainingHappyTicks` field
ix0rai Oct 28, 2024
73a9d60
more suggestions
ix0rai Oct 28, 2024
22978a7
teleport wording
ix0rai Oct 28, 2024
898be54
`restIfInVShape`
ix0rai Oct 28, 2024
ce10c8f
Merge remote-tracking branch 'origin/entities' into entities
ix0rai Oct 28, 2024
b1a8f86
Update mappings/net/minecraft/util/random/RandomGenerator.mapping
ix0rai Oct 28, 2024
d982504
fix WorldEvents javadoc
ix0rai Oct 28, 2024
b468c2e
Merge branch '1.21.3' into entities
ix0rai Nov 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions mappings/net/minecraft/block/AbstractBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/input/Input.mapping
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/unmapped/C_duiqsjgf net/minecraft/component/type/EquippableComponent
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
7 changes: 6 additions & 1 deletion mappings/net/minecraft/entity/AnimationState.mapping
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
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
METHOD m_drcnbqst isAnimating ()Z
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
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
13 changes: 13 additions & 0 deletions mappings/net/minecraft/entity/ElytraAnimationState.mapping
Original file line number Diff line number Diff line change
@@ -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
Loading
Loading