From 61628fa98eab20a9ca9f988e5a93e17582c3b7a0 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 28 Feb 2023 23:21:44 +1100 Subject: [PATCH] Misc small things (#3517) * Misc small things Looked at the mapping stats graph and went through and mapped some things * Update BuiltinBiomes.mapping * Update mappings/net/minecraft/world/gen/structure/RuinedPortalStructure.mapping --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../render/entity/model/SinglePartEntityModel.mapping | 4 ++++ .../minecraft/entity/ai/control/LookControl.mapping | 2 ++ .../net/minecraft/entity/mob/IllusionerEntity.mapping | 4 ++++ .../net/minecraft/entity/mob/PhantomEntity.mapping | 2 ++ mappings/net/minecraft/fluid/FlowableFluid.mapping | 1 + mappings/net/minecraft/item/BrushItem.mapping | 7 +++++++ .../minecraft/structure/MineshaftGenerator.mapping | 2 +- .../structure/OceanMonumentGenerator.mapping | 11 ++++++++--- .../net/minecraft/world/biome/BuiltinBiomes.mapping | 4 ++-- .../world/gen/feature/IcebergFeature.mapping | 6 ++++++ .../world/gen/structure/RuinedPortalStructure.mapping | 8 ++++++++ 11 files changed, 45 insertions(+), 6 deletions(-) diff --git a/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping index 5ad1b50f20..894b611a51 100644 --- a/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping @@ -18,3 +18,7 @@ CLASS net/minecraft/class_5597 net/minecraft/client/render/entity/model/SinglePa ARG 4 speedMultiplier METHOD method_43783 (Lnet/minecraft/class_7184;Lnet/minecraft/class_7094;)V ARG 2 state + METHOD method_48741 animateMovement (Lnet/minecraft/class_7184;FFFF)V + ARG 1 animation + ARG 2 limbAngle + ARG 3 limbDistance diff --git a/mappings/net/minecraft/entity/ai/control/LookControl.mapping b/mappings/net/minecraft/entity/ai/control/LookControl.mapping index 769ae13949..e528c71ebd 100644 --- a/mappings/net/minecraft/entity/ai/control/LookControl.mapping +++ b/mappings/net/minecraft/entity/ai/control/LookControl.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1333 net/minecraft/entity/ai/control/LookControl COMMENT The look control adjusts a mob's rotations to look at a target position. + FIELD field_35103 lookAtTimer I FIELD field_6358 maxPitchChange F FIELD field_6359 maxYawChange F FIELD field_6361 entity Lnet/minecraft/class_1308; @@ -26,6 +27,7 @@ CLASS net/minecraft/class_1333 net/minecraft/entity/ai/control/LookControl ARG 1 pitch METHOD method_37356 (Ljava/lang/Float;)V ARG 1 yaw + METHOD method_38970 isLookingAtSpecificPosition ()Z METHOD method_6225 getLookX ()D METHOD method_6226 lookAt (Lnet/minecraft/class_1297;FF)V ARG 1 entity diff --git a/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping b/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping index 20e8e60411..054d5430fb 100644 --- a/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_1581 net/minecraft/entity/mob/IllusionerEntity + FIELD field_7296 mirrorSpellTimer I + FIELD field_7297 mirrorCopyOffsets [[Lnet/minecraft/class_243; METHOD method_26916 createIllusionerAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_7065 getMirrorCopyOffsets (F)[Lnet/minecraft/class_243; + ARG 1 tickDelta CLASS class_1582 BlindTargetGoal FIELD field_7298 targetId I CLASS class_1583 GiveInvisibilityGoal diff --git a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping index 9533e14019..3258235f63 100644 --- a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_1593 net/minecraft/entity/mob/PhantomEntity + FIELD field_28641 WING_FLAP_TICKS I FIELD field_7312 circlingCenter Lnet/minecraft/class_2338; FIELD field_7313 SIZE Lnet/minecraft/class_2940; FIELD field_7314 targetPosition Lnet/minecraft/class_243; FIELD field_7315 movementType Lnet/minecraft/class_1593$class_1594; + METHOD method_33588 getWingFlapTickOffset ()I METHOD method_7084 getPhantomSize ()I METHOD method_7091 setPhantomSize (I)V ARG 1 size diff --git a/mappings/net/minecraft/fluid/FlowableFluid.mapping b/mappings/net/minecraft/fluid/FlowableFluid.mapping index 3be74fb276..cfc95a194d 100644 --- a/mappings/net/minecraft/fluid/FlowableFluid.mapping +++ b/mappings/net/minecraft/fluid/FlowableFluid.mapping @@ -85,6 +85,7 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid METHOD method_15749 isFlowBlocked (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 1 world ARG 2 pos + ARG 3 direction METHOD method_15750 getFlowing ()Lnet/minecraft/class_3611; METHOD method_15751 getStill ()Lnet/minecraft/class_3611; METHOD method_15752 isMatchingAndStill (Lnet/minecraft/class_3610;)Z diff --git a/mappings/net/minecraft/item/BrushItem.mapping b/mappings/net/minecraft/item/BrushItem.mapping index 4beb98914f..7ae89c9dbd 100644 --- a/mappings/net/minecraft/item/BrushItem.mapping +++ b/mappings/net/minecraft/item/BrushItem.mapping @@ -1,5 +1,12 @@ CLASS net/minecraft/class_8162 net/minecraft/item/BrushItem + METHOD method_49183 (Lnet/minecraft/class_1309;)V + ARG 0 user METHOD method_49184 addDustParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_3965;Lnet/minecraft/class_2680;Lnet/minecraft/class_243;)V ARG 1 world ARG 2 hitResult ARG 3 state + ARG 4 userRotation + CLASS class_8163 DustParticlesOffset + METHOD method_49185 fromSide (Lnet/minecraft/class_243;Lnet/minecraft/class_2350;)Lnet/minecraft/class_8162$class_8163; + ARG 0 userRotation + ARG 1 side diff --git a/mappings/net/minecraft/structure/MineshaftGenerator.mapping b/mappings/net/minecraft/structure/MineshaftGenerator.mapping index 2c2bea8024..28e06a2183 100644 --- a/mappings/net/minecraft/structure/MineshaftGenerator.mapping +++ b/mappings/net/minecraft/structure/MineshaftGenerator.mapping @@ -82,7 +82,7 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator ARG 4 y ARG 5 z ARG 6 box - METHOD method_36422 (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIII)Z + METHOD method_36422 hasSolidNeighborBlocks (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIII)Z ARG 1 world ARG 2 box ARG 3 x diff --git a/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping b/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping index afed40a863..1d0c73d79c 100644 --- a/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping +++ b/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping @@ -7,6 +7,9 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator CLASS class_3372 SimpleRoomFactory CLASS class_3373 SimpleRoomTopFactory CLASS class_3374 Base + FIELD field_14464 entryPieceSetting Lnet/minecraft/class_3366$class_3388; + FIELD field_14465 children Ljava/util/List; + FIELD field_14466 coreRoomPieceSetting Lnet/minecraft/class_3366$class_3388; METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD (Lnet/minecraft/class_5819;IILnet/minecraft/class_2350;)V @@ -156,10 +159,12 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator ARG 2 box ARG 3 x ARG 4 z - METHOD method_14775 (Lnet/minecraft/class_3341;IIII)Z + METHOD method_14775 boxIntersects (Lnet/minecraft/class_3341;IIII)Z ARG 1 box - ARG 2 x - ARG 4 z + ARG 2 x1 + ARG 3 z1 + ARG 4 x2 + ARG 5 z2 METHOD method_35445 createBox (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;III)Lnet/minecraft/class_3341; ARG 0 orientation ARG 1 setting diff --git a/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping b/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping index bf539ee377..f54f1db54e 100644 --- a/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping +++ b/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5504 net/minecraft/world/biome/BuiltinBiomes METHOD method_40363 bootstrap (Lnet/minecraft/class_7891;)V ARG 0 biomeRegisterable - METHOD method_49391 (Lnet/minecraft/class_7891;)V - ARG 0 biomeRegistry + METHOD method_49391 bootstrapOneTwenty (Lnet/minecraft/class_7891;)V + ARG 0 biomeRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping b/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping index c9ed8cec33..36f3db5045 100644 --- a/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping @@ -20,6 +20,7 @@ CLASS net/minecraft/class_3074 net/minecraft/world/gen/feature/IcebergFeature ARG 2 pos ARG 4 height METHOD method_13419 (Lnet/minecraft/class_5819;III)I + ARG 1 random ARG 2 y ARG 3 height ARG 4 factor @@ -29,6 +30,7 @@ CLASS net/minecraft/class_3074 net/minecraft/world/gen/feature/IcebergFeature ARG 1 x ARG 2 z ARG 3 pos + ARG 5 random METHOD method_13422 clearSnowAbove (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos @@ -42,6 +44,7 @@ CLASS net/minecraft/class_3074 net/minecraft/world/gen/feature/IcebergFeature METHOD method_13425 placeBlockOrSnow (Lnet/minecraft/class_2338;Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;IIZZLnet/minecraft/class_2680;)V ARG 1 pos ARG 2 world + ARG 3 random ARG 4 heightRemaining ARG 5 height ARG 6 lessSnow @@ -49,6 +52,7 @@ CLASS net/minecraft/class_3074 net/minecraft/world/gen/feature/IcebergFeature ARG 8 state METHOD method_13426 placeAt (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;IIIIIIZIDZLnet/minecraft/class_2680;)V ARG 1 world + ARG 2 random ARG 3 pos ARG 4 height ARG 5 offsetX @@ -58,9 +62,11 @@ CLASS net/minecraft/class_3074 net/minecraft/world/gen/feature/IcebergFeature ARG 14 placeSnow ARG 15 state METHOD method_13427 (Lnet/minecraft/class_5819;III)I + ARG 1 random ARG 2 y ARG 3 height ARG 4 factor METHOD method_13428 (Lnet/minecraft/class_5819;Lnet/minecraft/class_1936;IILnet/minecraft/class_2338;ZIDI)V + ARG 1 random ARG 2 world ARG 5 pos diff --git a/mappings/net/minecraft/world/gen/structure/RuinedPortalStructure.mapping b/mappings/net/minecraft/world/gen/structure/RuinedPortalStructure.mapping index d61a38fd8e..aa9f84e422 100644 --- a/mappings/net/minecraft/world/gen/structure/RuinedPortalStructure.mapping +++ b/mappings/net/minecraft/world/gen/structure/RuinedPortalStructure.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/structure/RuinedPortalStr METHOD (Lnet/minecraft/class_3195$class_7302;Lnet/minecraft/class_5183$class_7155;)V ARG 1 config ARG 2 setup + METHOD method_27205 (Lnet/minecraft/class_2794;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;Lnet/minecraft/class_2338;)Lnet/minecraft/class_4966; + ARG 3 pos METHOD method_27209 isColdAt (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)Z ARG 0 pos ARG 1 biome @@ -26,6 +28,12 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/structure/RuinedPortalStr ARG 6 box ARG 7 world ARG 8 noiseConfig + METHOD method_41682 shouldPlaceAirPocket (Lnet/minecraft/class_2919;F)Z + ARG 0 random + ARG 1 probability + METHOD method_41683 (Lnet/minecraft/class_5183$class_7155;Lnet/minecraft/class_5189$class_5190;Lnet/minecraft/class_2338;Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_7138;Lnet/minecraft/class_2960;Lnet/minecraft/class_3499;Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;Lnet/minecraft/class_2338;Lnet/minecraft/class_6626;)V + ARG 10 collector METHOD method_41684 (Lnet/minecraft/class_5183;)Ljava/util/List; ARG 0 structure CLASS class_7155 Setup + FIELD field_37814 CODEC Lcom/mojang/serialization/Codec;