21w20a stuff (#2417)

* 21w20a stuff

* Apply suggestions from code review

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* AngledModelEntity

idk about the name but eh

* Update HoeItem.mapping

* Update FoodComponent.mapping

* stuff

* Update ItemCooldownManager.mapping

* Revert "Merge branch '21w20a-stuff' of https://github.com/Shnupbups/yarn into 21w20a-stuff"

This reverts commit 494e736d32, reversing
changes made to c481e02b48.

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
This commit is contained in:
Shnupbups 2021-05-24 23:46:09 +10:00 committed by GitHub
parent 54b99399c7
commit fd0d13ce44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 83 additions and 0 deletions

View File

@ -0,0 +1,6 @@
CLASS net/minecraft/class_6395 net/minecraft/client/item/UnclampedModelPredicateProvider
METHOD unclampedCall (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F
ARG 1 stack
ARG 2 world
ARG 3 entity
ARG 4 seed

View File

@ -27,3 +27,22 @@ CLASS net/minecraft/class_5772 net/minecraft/client/render/entity/model/AxolotlE
METHOD method_33298 setPlayingDeadAngles (F)V
METHOD method_33299 copyLegAngles ()V
COMMENT Copies and mirrors the left leg angles to the right leg angles.
METHOD method_37091 lerpAngleDegrees (FF)F
ARG 1 start
ARG 2 end
METHOD method_37092 lerpAngleDegress (FFF)F
ARG 1 delta
ARG 2 start
ARG 3 end
METHOD method_37093 updateAnglesMap (Lnet/minecraft/class_5762;)V
ARG 1 axolotl
METHOD method_37094 getAngles (Lnet/minecraft/class_630;)Lnet/minecraft/class_1160;
ARG 1 part
METHOD method_37095 setAngle (Lnet/minecraft/class_630;FFF)V
ARG 1 part
ARG 2 pitch
ARG 3 yaw
ARG 4 roll
METHOD method_37096 setAngles (Lnet/minecraft/class_630;Lnet/minecraft/class_1160;)V
ARG 1 part
ARG 2 angles

View File

@ -24,8 +24,14 @@ CLASS net/minecraft/class_806 net/minecraft/client/render/model/json/ModelOverri
CLASS class_5827 BakedOverride
FIELD field_28794 conditions [Lnet/minecraft/class_806$class_5828;
FIELD field_28795 model Lnet/minecraft/class_1087;
METHOD <init> ([Lnet/minecraft/class_806$class_5828;Lnet/minecraft/class_1087;)V
ARG 1 conditions
ARG 2 model
METHOD method_33700 test ([F)Z
ARG 1 values
CLASS class_5828 InlinedCondition
FIELD field_28796 index I
FIELD field_28797 threshold F
METHOD <init> (IF)V
ARG 1 index
ARG 2 threshold

View File

@ -0,0 +1,2 @@
CLASS net/minecraft/class_6375 net/minecraft/entity/AngledModelEntity
METHOD method_36976 getModelAngles ()Ljava/util/Map;

View File

@ -26,6 +26,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
FIELD field_29985 ID_KEY Ljava/lang/String;
FIELD field_29986 PASSENGERS_KEY Ljava/lang/String;
FIELD field_29994 UUID_KEY Ljava/lang/String;
FIELD field_33758 hasVisualFire Z
FIELD field_5951 ridingCooldown I
FIELD field_5952 onGround Z
FIELD field_5953 firstUpdate Z
@ -386,12 +387,14 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
COMMENT axis-aligned integer box is fully loaded in the world.
METHOD method_35049 getRemovalReason ()Lnet/minecraft/class_1297$class_5529;
METHOD method_36209 onRemoved ()V
METHOD method_36361 isGlowingLocal ()Z
METHOD method_36454 getYaw ()F
METHOD method_36455 getPitch ()F
METHOD method_36456 setYaw (F)V
ARG 1 yaw
METHOD method_36457 setPitch (F)V
ARG 1 pitch
METHOD method_36601 getBlockStateAtPos ()Lnet/minecraft/class_2680;
METHOD method_36971 canModifyAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z
ARG 1 world
ARG 2 pos

View File

@ -55,3 +55,6 @@ CLASS net/minecraft/class_6024 net/minecraft/entity/EntityStatuses
FIELD field_30049 SET_OP_LEVEL_0 B
FIELD field_30050 SET_OP_LEVEL_1 B
FIELD field_30051 SET_OP_LEVEL_2 B
FIELD field_33454 PREPARE_RAM B
FIELD field_33455 FINISH_RAM B
FIELD field_33691 ADD_DEATH_PARTICLES B

View File

@ -49,6 +49,7 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity
METHOD method_27314 getRotation (F)F
ARG 1 tickDelta
METHOD method_29271 copy ()Lnet/minecraft/class_1542;
METHOD method_35190 setNeverDespawn ()V
METHOD method_6972 tryMerge (Lnet/minecraft/class_1542;)V
ARG 1 other
METHOD method_6973 tryMerge ()V

View File

@ -245,6 +245,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
METHOD method_30126 getStackInHandSlot (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1799;
ARG 1 slot
METHOD method_30127 swapHandStacks ()V
METHOD method_30129 getEquipment ()Ljava/util/Map;
METHOD method_31079 positionInPortal (Lnet/minecraft/class_243;)Lnet/minecraft/class_243;
ARG 0 pos
METHOD method_32321 getCommandItemSlot (Lnet/minecraft/class_1309;Lnet/minecraft/class_1304;)Lnet/minecraft/class_5630;
@ -265,6 +266,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
METHOD method_35054 setNoDrag (Z)V
ARG 1 noDrag
METHOD method_36362 updateGlowing ()V
METHOD method_36549 addDeathParticles ()V
METHOD method_36608 isPartOfGame ()Z
METHOD method_36977 damageHelmet (Lnet/minecraft/class_1282;F)V
ARG 1 source

View File

@ -10,6 +10,7 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity
FIELD field_30391 VARIANT_KEY Ljava/lang/String;
FIELD field_30392 MAX_AIR I
FIELD field_30393 BUFF_DURATION I
FIELD field_33764 modelAngles Ljava/util/Map;
METHOD method_33219 setVariant (Lnet/minecraft/class_5762$class_5767;)V
ARG 1 variant
METHOD method_33221 shouldBabyBeDifferent (Ljava/util/Random;)Z

View File

@ -20,3 +20,6 @@ CLASS net/minecraft/class_1796 net/minecraft/entity/player/ItemCooldownManager
CLASS class_1797 Entry
FIELD field_8027 endTick I
FIELD field_8028 startTick I
METHOD <init> (Lnet/minecraft/class_1796;II)V
ARG 2 startTick
ARG 3 endTick

View File

@ -6,6 +6,13 @@ CLASS net/minecraft/class_4174 net/minecraft/item/FoodComponent
FIELD field_18617 alwaysEdible Z
FIELD field_18618 snack Z
FIELD field_18619 statusEffects Ljava/util/List;
METHOD <init> (IFZZZLjava/util/List;)V
ARG 1 hunger
ARG 2 saturationModifier
ARG 3 meat
ARG 4 alwaysEdible
ARG 5 snack
ARG 6 statusEffects
METHOD method_19230 getHunger ()I
COMMENT Gets the amount of hunger a food item will fill.
COMMENT

View File

@ -7,3 +7,14 @@ CLASS net/minecraft/class_1794 net/minecraft/item/HoeItem
ARG 4 settings
METHOD method_20279 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V
ARG 1 p
METHOD method_36984 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1838;)V
ARG 1 context
METHOD method_36985 getTillingConsumer (Lnet/minecraft/class_2680;Lnet/minecraft/class_1935;)Ljava/util/function/Consumer;
ARG 0 state
ARG 1 dropItem
METHOD method_36986 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1935;Lnet/minecraft/class_1838;)V
ARG 2 context
METHOD method_36987 usagePredicate (Lnet/minecraft/class_1838;)Z
ARG 0 context
METHOD method_36988 getTillingConsumer (Lnet/minecraft/class_2680;)Ljava/util/function/Consumer;
ARG 0 state

View File

@ -0,0 +1,5 @@
CLASS net/minecraft/class_6378 net/minecraft/structure/processor/ProtectedBlocksStructureProcessor
FIELD field_33771 protectedBlocksTag Lnet/minecraft/class_2960;
FIELD field_33772 CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Lnet/minecraft/class_2960;)V
ARG 1 protectedBlocksTag

View File

@ -39,3 +39,14 @@ CLASS net/minecraft/class_3031 net/minecraft/world/gen/feature/Feature
ARG 0 posToState
ARG 1 pos
ARG 2 predicate
METHOD method_36997 (Lnet/minecraft/class_3494;Lnet/minecraft/class_2680;)Z
ARG 1 state
METHOD method_36998 setBlockStateIf (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/function/Predicate;)V
ARG 1 world
ARG 2 pos
ARG 3 state
ARG 4 predicate
METHOD method_36999 notInBlockTagPredicate (Lnet/minecraft/class_2960;)Ljava/util/function/Predicate;
ARG 0 tagId
METHOD method_37000 (Lnet/minecraft/class_2680;)Z
ARG 0 state

View File

@ -56,6 +56,9 @@ constant entity_statuses net/minecraft/entity/EntityStatuses USE_FULL_DEBUG_INFO
constant entity_statuses net/minecraft/entity/EntityStatuses SET_OP_LEVEL_0
constant entity_statuses net/minecraft/entity/EntityStatuses SET_OP_LEVEL_1
constant entity_statuses net/minecraft/entity/EntityStatuses SET_OP_LEVEL_2
constant entity_statuses net/minecraft/entity/EntityStatuses PREPARE_RAM
constant entity_statuses net/minecraft/entity/EntityStatuses FINISH_RAM
constant entity_statuses net/minecraft/entity/EntityStatuses ADD_DEATH_PARTICLES
target_method net/minecraft/entity/Entity handleStatus (B)V
param 0 entity_statuses