mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ram (#2403) 

fixes a few bad names from shunpbups

Signed-off-by: liach <liach@users.noreply.github.com>

Co-authored-by: liach <liach@users.noreply.github.com>
This commit is contained in:
liach 2021-05-19 19:45:47 +07:00 committed by GitHub
parent 9d99817d84
commit 8fba2a7da0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 103 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mappings/net/minecraft/entity/LivingEntity.mapping
View File

@ -267,6 +267,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_36608 isPartOfGame ()Z
METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z
ARG 1 type
METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960;
@ -281,6 +282,9 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
METHOD method_6002 getDeathSound ()Lnet/minecraft/class_3414;
METHOD method_6003 getRoll ()I
METHOD method_6005 takeKnockback (DDD)V
ARG 1 strength
ARG 3 x
ARG 5 z
METHOD method_6006 setNearbySongPlaying (Lnet/minecraft/class_2338;Z)V
ARG 1 songPosition
ARG 2 playing

7
mappings/net/minecraft/entity/ai/TargetPredicate.mapping
View File

@ -4,6 +4,10 @@ CLASS net/minecraft/class_4051 net/minecraft/entity/ai/TargetPredicate
FIELD field_18098 useDistanceScalingFactor Z
FIELD field_28405 predicate Ljava/util/function/Predicate;
FIELD field_30263 MIN_DISTANCE D
FIELD field_33720 attackable Z
FIELD field_33721 respectsVisibility Z
METHOD <init> (Z)V
ARG 1 attackable
METHOD method_18418 setBaseMaxDistance (D)Lnet/minecraft/class_4051;
ARG 1 baseMaxDistance
METHOD method_18419 test (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
@ -13,3 +17,6 @@ CLASS net/minecraft/class_4051 net/minecraft/entity/ai/TargetPredicate
ARG 1 predicate
METHOD method_18424 ignoreDistanceScalingFactor ()Lnet/minecraft/class_4051;
METHOD method_33335 copy ()Lnet/minecraft/class_4051;
METHOD method_36625 createAttackable ()Lnet/minecraft/class_4051;
METHOD method_36626 createNonAttackable ()Lnet/minecraft/class_4051;
METHOD method_36627 visibleOnly ()Lnet/minecraft/class_4051;

66
mappings/net/minecraft/entity/ai/brain/task/PrepareRamTask.mapping Normal file
View File

@ -0,0 +1,66 @@
CLASS net/minecraft/class_6336 net/minecraft/entity/ai/brain/task/PrepareRamTask
COMMENT The task where an entity finds a target, a place to start its ram, and wait to
COMMENT start its ram.
COMMENT
COMMENT @param <E> the task owner, usually a goat
FIELD field_33461 RUN_TIME I
FIELD field_33462 cooldownFactory Ljava/util/function/ToIntFunction;
FIELD field_33463 minRamDistance I
FIELD field_33464 maxRamDistance I
FIELD field_33465 speed F
FIELD field_33466 targetPredicate Lnet/minecraft/class_4051;
FIELD field_33467 prepareTime I
FIELD field_33468 soundFactory Ljava/util/function/Function;
FIELD field_33469 prepareStartTime Ljava/util/Optional;
FIELD field_33470 ram Ljava/util/Optional;
METHOD <init> (Ljava/util/function/ToIntFunction;IIFLnet/minecraft/class_4051;ILjava/util/function/Function;)V
COMMENT Creates a ram preparation task. It has a fixed run time of {@value #RUN_TIME}.
ARG 1 cooldownFactory
COMMENT the factory for the cooldown, in ticks, of the ram task, given the entity
ARG 2 minDistance
COMMENT the min manhattan distance from the ram starting location to the ram target
ARG 3 maxDistance
COMMENT the max straight-line distance from the ram starting location to the ram target
ARG 4 speed
COMMENT the speed the entity walks at
ARG 5 targetPredicate
COMMENT the predicate for the ram target
ARG 6 prepareTime
COMMENT the prepare time, in ticks, the entity will stand between reaching the ram
COMMENT start position and the start of the ram
ARG 7 soundFactory
COMMENT the factory of the ram prepare sound given the entity
METHOD method_36261 (Lnet/minecraft/class_1309;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6336$class_6337;
ARG 1 start
METHOD method_36262 findRamStart (Lnet/minecraft/class_1314;Lnet/minecraft/class_1309;)Ljava/util/Optional;
ARG 1 entity
ARG 2 target
METHOD method_36263 canReach (Lnet/minecraft/class_1314;Lnet/minecraft/class_2338;)Z
ARG 1 entity
ARG 2 target
METHOD method_36264 (Lnet/minecraft/class_1314;Ljava/util/List;)Ljava/util/Optional;
ARG 2 mobs
METHOD method_36265 (Lnet/minecraft/class_1408;Lnet/minecraft/class_2338;)Z
ARG 1 start
METHOD method_36266 calculateRamTarget (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243;
ARG 1 start
ARG 2 end
METHOD method_36268 findRam (Lnet/minecraft/class_1314;Lnet/minecraft/class_1309;)V
ARG 1 entity
ARG 2 target
METHOD method_36270 (Lnet/minecraft/class_1314;Lnet/minecraft/class_1309;)V
ARG 2 mob
METHOD method_36272 (Lnet/minecraft/class_1314;Lnet/minecraft/class_1309;)Z
ARG 2 mob
CLASS class_6337 Ram
COMMENT A ram chosen during the preparation.
FIELD field_33471 start Lnet/minecraft/class_2338;
FIELD field_33472 end Lnet/minecraft/class_2338;
FIELD field_33473 entity Lnet/minecraft/class_1309;
METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_1309;)V
ARG 1 start
ARG 2 end
ARG 3 entity
METHOD method_36273 getStart ()Lnet/minecraft/class_2338;
METHOD method_36275 getEnd ()Lnet/minecraft/class_2338;
METHOD method_36276 getEntity ()Lnet/minecraft/class_1309;

20
mappings/net/minecraft/entity/ai/brain/task/RamImpactTask.mapping Normal file
View File

@ -0,0 +1,20 @@
CLASS net/minecraft/class_6338 net/minecraft/entity/ai/brain/task/RamImpactTask
FIELD field_33474 RUN_TIME I
FIELD field_33475 SPEED_STRENGTH_MULTIPLIER F
FIELD field_33476 cooldownRangeFactory Ljava/util/function/Function;
FIELD field_33477 targetPredicate Lnet/minecraft/class_4051;
FIELD field_33478 damage Ljava/util/function/ToIntFunction;
FIELD field_33479 speed F
FIELD field_33480 strengthMultiplierFactory Ljava/util/function/ToDoubleFunction;
FIELD field_33481 direction Lnet/minecraft/class_243;
FIELD field_33482 soundFactory Ljava/util/function/Function;
METHOD <init> (Ljava/util/function/Function;Lnet/minecraft/class_4051;Ljava/util/function/ToIntFunction;FLjava/util/function/ToDoubleFunction;Ljava/util/function/Function;)V
ARG 1 cooldownRangeFactory
ARG 2 targetPredicate
ARG 3 damage
ARG 4 speed
ARG 5 strengthMultiplierFactory
ARG 6 soundFactory
METHOD method_36279 finishRam (Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;)V
ARG 1 world
ARG 2 entity

1
mappings/net/minecraft/entity/ai/brain/task/RamTask.mapping
View File

@ -1 +0,0 @@
CLASS net/minecraft/class_6338 net/minecraft/entity/ai/brain/task/RamTask

7
mappings/net/minecraft/entity/passive/GoatBrain.mapping
View File

@ -7,7 +7,8 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain
FIELD field_30410 NORMAL_WALK_SPEED F
FIELD field_30411 LONG_JUMP_COOLDOWN_RANGE Lnet/minecraft/class_6019;
FIELD field_33499 RAM_COOLDOWN_RANGE Lnet/minecraft/class_6019;
FIELD field_33500 IS_GOAT_PREDICATE Lnet/minecraft/class_4051;
FIELD field_33500 RAM_TARGET_PREDICATE Lnet/minecraft/class_4051;
FIELD field_33693 SCREAMING_RAM_COOLDOWN_RANGE Lnet/minecraft/class_6019;
METHOD method_35181 getTemptItems ()Lnet/minecraft/class_1856;
METHOD method_35183 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095;
ARG 0 brain
@ -23,3 +24,7 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain
ARG 0 brain
METHOD method_36288 addRamActivities (Lnet/minecraft/class_4095;)V
ARG 0 brain
METHOD method_36289 (Lnet/minecraft/class_6053;)I
ARG 0 goat
METHOD method_36290 (Lnet/minecraft/class_6053;)Lnet/minecraft/class_6019;
ARG 0 goat