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

Merge branch 'pull/569' into 19w13a 

# Conflicts:
#	mappings/net/minecraft/util/SectionRelativeLevelPropagator.mapping
This commit is contained in:
modmuss50 2019-03-29 16:10:36 +00:00
parent 4673cec044 0c326e4a68
commit 27ce8ae254
38 changed files with 200 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -22,7 +22,7 @@ plugins {
id 'maven-publish'
}
def minecraft_version = "19w13a"
def minecraft_version = "19w13b"
def ENV = System.getenv()
// Fetch build number from Jenkins

1
mappings/net/minecraft/block/BedrockBlock.mapping Normal file
View File

@ -0,0 +1 @@
CLASS blu net/minecraft/block/BedrockBlock

5
mappings/net/minecraft/block/BellBlock.mapping
View File

@ -13,6 +13,11 @@ CLASS blw net/minecraft/block/BellBlock
FIELD y HANGING_SHAPE Lcsa;
METHOD <init> (Lbly$c;)V
ARG 1 settings
METHOD a ring (Lbgv;Lbuw;Lbsz;Lcrc;)Z
ARG 1 world
ARG 2 state
ARG 3 blockEntity
ARG 4 hitPosition
METHOD a ring (Lbgv;Lev;)V
ARG 1 world
ARG 2 pos

1
mappings/net/minecraft/block/SmallTranslucentBlock.mapping Normal file
View File

@ -0,0 +1 @@
CLASS blb net/minecraft/block/SmallTranslucentBlock

6
mappings/net/minecraft/entity/ai/brain/WalkTarget.mapping
View File

@ -1,9 +1,9 @@
CLASS aot net/minecraft/entity/ai/brain/WalkTarget
FIELD a lookTarget Lakg;
FIELD b speedFactor F
FIELD b speed F
FIELD c completionRange I
METHOD <init> (Lakg;FI)V
ARG 2 speedFactor
ARG 2 speed
ARG 3 completionRange
METHOD <init> (Lcrg;FI)V
ARG 1 pos
@ -14,5 +14,5 @@ CLASS aot net/minecraft/entity/ai/brain/WalkTarget
ARG 2 speedFactor
ARG 3 completionRange
METHOD a getLookTarget ()Lakg;
METHOD b getSpeedFactor ()F
METHOD b getSpeed ()F
METHOD c getCompletionRange ()I

1
mappings/net/minecraft/entity/ai/brain/sensor/NearestBedSensor.mapping Normal file
View File

@ -0,0 +1 @@
CLASS apf net/minecraft/entity/ai/brain/sensor/NearestBedSensor

3
mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping
View File

@ -1,5 +1,8 @@
CLASS apk net/minecraft/entity/ai/brain/sensor/Sensor
FIELD a lastSenseTime J
FIELD b senseInterval I
METHOD <init> (I)V
ARG 1 senseInterval
METHOD a getOutputMemoryModules ()Ljava/util/Set;
METHOD a canSense (Lve;Laii;)Z
ARG 1 world

1
mappings/net/minecraft/entity/ai/brain/sensor/SensorType.mapping
View File

@ -1,4 +1,5 @@
CLASS apl net/minecraft/entity/ai/brain/sensor/SensorType
FIELD j factory Ljava/util/function/Supplier;
FIELD k id Lqr;
METHOD a create ()Lapk;
METHOD a register (Ljava/lang/String;Ljava/util/function/Supplier;)Lapl;

1
mappings/net/minecraft/entity/ai/brain/sensor/VillagerBabiesSensor.mapping Normal file
View File

@ -0,0 +1 @@
CLASS apm net/minecraft/entity/ai/brain/sensor/VillagerBabiesSensor

5
mappings/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.mapping Normal file
View File

@ -0,0 +1,5 @@
CLASS ajn net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask
FIELD a raid Lawq;
METHOD a createFirework (Lbam;I)Lbbp;
ARG 1 color
ARG 2 flight

15
mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping
View File

@ -1,4 +1,19 @@
CLASS ajq net/minecraft/entity/ai/brain/task/CompositeTask
CLASS ajq$a Order
FIELD c consumer Ljava/util/function/Consumer;
METHOD <init> (Ljava/util/function/Consumer;)V
ARG 1 consumer
METHOD a apply (Lali;)V
ARG 1 list
CLASS net/minecraft/entity/ai/brain/task/CompositeTask$b RunMode
METHOD a run (Lali;Lve;Laii;J)V
FIELD a requiredMemoryState Ljava/util/Set;
FIELD b memoriesToForgetWhenStopped Ljava/util/Set;
FIELD c order Lajq$a;
FIELD d runMode Lajq$b;
FIELD e tasks Lali;
METHOD <init> (Ljava/util/Set;Ljava/util/Set;Lajq$a;Lajq$b;Ljava/util/List;)V
ARG 1 requiredMemoryState
ARG 2 memoriesToForgetWhenStopped
ARG 4 runMode
ARG 5 tasks

1
mappings/net/minecraft/entity/ai/brain/task/EndRaidTask.mapping Normal file
View File

@ -0,0 +1 @@
CLASS akj net/minecraft/entity/ai/brain/task/EndRaidTask

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

@ -1 +0,0 @@
CLASS akh net/minecraft/entity/ai/brain/task/FindWalkTarget

4
mappings/net/minecraft/entity/ai/brain/task/FindWalkTargetTask.mapping Normal file
View File

@ -0,0 +1,4 @@
CLASS akh net/minecraft/entity/ai/brain/task/FindWalkTargetTask
FIELD a walkSpeed F
METHOD <init> (F)V
ARG 1 walkSpeed

1
mappings/net/minecraft/entity/ai/brain/task/ForgetBellRingTask.mapping Normal file
View File

@ -0,0 +1 @@
CLASS aki net/minecraft/entity/ai/brain/task/ForgetBellRingTask

23
mappings/net/minecraft/entity/ai/brain/task/GiveGiftsTask.mapping Normal file
View File

@ -0,0 +1,23 @@
CLASS ajr net/minecraft/entity/ai/brain/task/GiveGiftsTask
FIELD a GIFTS Ljava/util/Map;
FIELD b ticksLeft I
FIELD c done Z
FIELD d startTime J
METHOD <init> (I)V
ARG 1 delay
METHOD a getGifts (Lauz;)Ljava/util/List;
ARG 1 villager
METHOD a giveGifts (Lauz;Laii;)V
ARG 1 villager
ARG 2 recipient
METHOD a isCloseEnough (Lauz;Lavm;)Z
ARG 1 villager
ARG 2 player
METHOD a isHero (Lavm;)Z
ARG 1 player
METHOD a getNextGiftDelay (Lve;)I
ARG 0 world
METHOD b isNearestPlayerHero (Lauz;)Z
ARG 1 villager
METHOD c getNearestPlayerIfHero (Lauz;)Ljava/util/Optional;
ARG 1 villager

4
mappings/net/minecraft/entity/ai/brain/task/HideInHomeDuringRaidTask.mapping Normal file
View File

@ -0,0 +1,4 @@
CLASS ajy net/minecraft/entity/ai/brain/task/HideInHomeDuringRaidTask
METHOD <init> (IF)V
ARG 1 maxDistance
ARG 2 walkSpeed

14
mappings/net/minecraft/entity/ai/brain/task/HideInHomeTask.mapping Normal file
View File

@ -0,0 +1,14 @@
CLASS ajx net/minecraft/entity/ai/brain/task/HideInHomeTask
FIELD a walkSpeed F
FIELD b maxDistance I
FIELD c preferredDistance I
FIELD d useDifferentHomeEachTime Z
FIELD e lastHomeHiddenIn Lev;
FIELD f homePosition Ljava/util/Optional;
METHOD <init> (IFIZ)V
ARG 1 maxDistance
ARG 2 walkSpeed
ARG 3 preferredDistance
ARG 4 useDifferentHomeEachTime
METHOD a isValidHomeChoice (Lev;)Z
ARG 1 pos

31
mappings/net/minecraft/entity/ai/brain/task/JumpInBedTask.mapping Normal file
View File

@ -0,0 +1,31 @@
CLASS ajw net/minecraft/entity/ai/brain/task/JumpInBedTask
FIELD a walkSpeed F
FIELD b bed Lev;
FIELD c ticksOutOfBedUntilStopped I
FIELD d jumpsRemaining I
FIELD e ticksToNextJump I
METHOD <init> (F)V
ARG 1 walkSpeed
METHOD a getNearestBed (Laij;)Ljava/util/Optional;
ARG 1 mob
METHOD a setWalkTarget (Laij;Lev;)V
ARG 1 mob
ARG 2 pos
METHOD a isBedAt (Lve;Lev;)Z
ARG 1 world
ARG 2 pos
METHOD b shouldStartJumping (Lve;Laij;)Z
ARG 1 world
ARG 2 mob
METHOD c isAboveBed (Lve;Laij;)Z
ARG 1 world
ARG 2 mob
METHOD d isOnBed (Lve;Laij;)Z
ARG 1 world
ARG 2 mob
METHOD e isBedGoneTooLong (Lve;Laij;)Z
ARG 1 world
ARG 2 mob
METHOD f isDoneJumping (Lve;Laij;)Z
ARG 1 world
ARG 2 mob

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

@ -1,6 +1,7 @@
CLASS ajk net/minecraft/entity/ai/brain/task/LookTargetUtil
METHOD a lookAtAndWalkTowardsEachOther (Laii;Laii;)V
METHOD a walkTowards (Laii;Laii;I)V
METHOD a give (Laii;Lbbp;Laii;)V
METHOD a canSee (Laix;Laii;)Z
METHOD a canSee (Laix;Laor;Laid;)Z
METHOD b lookAtEachOther (Laii;Laii;)V

1
mappings/net/minecraft/entity/ai/brain/task/ReactToBellTask.mapping Normal file
View File

@ -0,0 +1 @@
CLASS akn net/minecraft/entity/ai/brain/task/ReactToBellTask

1
mappings/net/minecraft/entity/ai/brain/task/RingBellTask.mapping Normal file
View File

@ -0,0 +1 @@
CLASS akk net/minecraft/entity/ai/brain/task/RingBellTask

3
mappings/net/minecraft/entity/ai/brain/task/RunAroundAfterRaidTask.mapping Normal file
View File

@ -0,0 +1,3 @@
CLASS alf net/minecraft/entity/ai/brain/task/RunAroundAfterRaidTask
METHOD <init> (F)V
ARG 1 walkSpeed

1
mappings/net/minecraft/entity/ai/brain/task/SeekSkyAfterRaidWinTask.mapping Normal file
View File

@ -0,0 +1 @@
CLASS ajs net/minecraft/entity/ai/brain/task/SeekSkyAfterRaidWinTask

7
mappings/net/minecraft/entity/ai/brain/task/SeekSkyTask.mapping Normal file
View File

@ -0,0 +1,7 @@
CLASS akc net/minecraft/entity/ai/brain/task/SeekSkyTask
FIELD a speed F
METHOD <init> (F)V
ARG 1 speed
METHOD b (Lve;Laii;)Lcrg;
ARG 1 world
ARG 2 entity

1
mappings/net/minecraft/entity/ai/brain/task/StartRaidTask.mapping Normal file
View File

@ -0,0 +1 @@
CLASS akp net/minecraft/entity/ai/brain/task/StartRaidTask

6
mappings/net/minecraft/entity/ai/brain/task/Task.mapping
View File

@ -10,7 +10,11 @@ CLASS ajj net/minecraft/entity/ai/brain/task/Task
METHOD a getRequiredMemoryState ()Ljava/util/Set;
METHOD a isTimeLimitExceeded (J)Z
ARG 1 time
METHOD a shouldRun (Lve;Laii;)Z
METHOD a hasRequiredMemoryState (Laii;)Z
ARG 1 entity
METHOD a canRun (Lve;Laii;)Z
ARG 1 world
ARG 2 entity
METHOD a run (Lve;Laii;J)V
ARG 1 world
ARG 2 entity

4
mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping
View File

@ -1,4 +1,5 @@
CLASS alg net/minecraft/entity/ai/brain/task/VillagerTaskListProvider
METHOD a getPlayTasks (F)Lcom/google/common/collect/ImmutableList;
METHOD a getCoreTasks (Lavc;F)Lcom/google/common/collect/ImmutableList;
ARG 0 profession
METHOD b getWorkTasks (Lavc;F)Lcom/google/common/collect/ImmutableList;
@ -11,3 +12,6 @@ CLASS alg net/minecraft/entity/ai/brain/task/VillagerTaskListProvider
ARG 0 profession
METHOD f getPanicTasks (Lavc;F)Lcom/google/common/collect/ImmutableList;
ARG 0 profession
METHOD g getPreRaidTasks (Lavc;F)Lcom/google/common/collect/ImmutableList;
METHOD h getRaidTasks (Lavc;F)Lcom/google/common/collect/ImmutableList;
METHOD i getHideTasks (Lavc;F)Lcom/google/common/collect/ImmutableList;

2
mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping
View File

@ -3,3 +3,5 @@ CLASS amc net/minecraft/entity/ai/goal/DoorInteractGoal
FIELD d owner Laij;
FIELD e doorPos Lev;
METHOD a getDoor (Lbgv;Lev;)Z
METHOD a setDoorOpen (Z)V
ARG 1 open

5
mappings/net/minecraft/entity/ai/goal/GoToVillageGoal.mapping Normal file
View File

@ -0,0 +1,5 @@
CLASS ans net/minecraft/entity/ai/goal/GoToVillageGoal
FIELD a owner Laip;
FIELD b searchRange I
FIELD c targetPosition Lev;
METHOD g findOtherWaypoint ()V

4
mappings/net/minecraft/entity/ai/goal/LongDoorInteractGoal.mapping Normal file
View File

@ -0,0 +1,4 @@
CLASS ane net/minecraft/entity/ai/goal/LongDoorInteractGoal
FIELD b ticksLeft I
METHOD <init> (Laij;Z)V
ARG 1 owner

5
mappings/net/minecraft/entity/ai/goal/MoveToVillageCenterGoal.mapping
View File

@ -1,5 +0,0 @@
CLASS ans net/minecraft/entity/ai/goal/MoveToVillageCenterGoal
FIELD a owner Laip;
FIELD b searchRange I
FIELD c villageCenter Lev;
METHOD g findOtherWaypoint ()V

1
mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping
View File

@ -9,6 +9,7 @@ CLASS auv net/minecraft/entity/passive/AbstractTraderEntity
METHOD b afterUsing (Lbfz;)V
METHOD dR hasCustomer ()Z
METHOD dU getYesSound ()Lyh;
METHOD dV playCelebrateSound ()V
METHOD dW getInventory ()Lagz;
METHOD dY fillRecipes ()V
METHOD r getTradingSound (Z)Lyh;

10
mappings/net/minecraft/server/world/ServerWorld.mapping
View File

@ -45,9 +45,10 @@ CLASS ve net/minecraft/server/world/ServerWorld
METHOD a tickChunk (Lbww;I)V
ARG 1 chunk
ARG 2 randomTickSpeed
METHOD a isInterestingPointAt (Lev;I)Z
ARG 2 interest
METHOD a getPointOfInterestLevel (Lfo;)I
METHOD a isNearOccupiedPointOfInterest (Lev;I)Z
ARG 2 maxDistance
METHOD a getOccupiedPointOfInterestDistance (Lfo;)I
ARG 1 pos
METHOD a getEntity (Ljava/util/UUID;)Lahz;
METHOD a save (Lzr;ZZ)V
ARG 1 progressListener
@ -58,7 +59,8 @@ CLASS ve net/minecraft/server/world/ServerWorld
ARG 1 x
ARG 2 z
ARG 3 forced
METHOD b_ isVillageCenterAt (Lev;)Z
METHOD b_ isNearOccupiedPointOfInterest (Lev;)Z
ARG 1 pos
METHOD c_ getRaidAt (Lev;)Lawq;
METHOD d_ hasRaidAt (Lev;)Z
METHOD e removePlayer (Lvf;)V

3
mappings/net/minecraft/util/SectionRelativeLevelPropagator.mapping Normal file
View File

@ -0,0 +1,3 @@
CLASS va net/minecraft/util/SectionRelativeLevelPropagator
METHOD b getInitialLevel (J)I
ARG 1 id

1
mappings/net/minecraft/util/WeightedList.mapping
View File

@ -8,5 +8,6 @@ CLASS ali net/minecraft/util/WeightedList
METHOD b getElement ()Ljava/lang/Object;
FIELD a entries Ljava/util/List;
FIELD b random Ljava/util/Random;
METHOD a shuffle ()V
METHOD a add (Ljava/lang/Object;I)V
METHOD b stream ()Ljava/util/stream/Stream;

21
mappings/net/minecraft/util/math/Vec3i.mapping
View File

@ -3,9 +3,26 @@ CLASS fq net/minecraft/util/math/Vec3i
FIELD b y I
FIELD c z I
FIELD e ZERO Lfq;
METHOD a squaredDistanceToCenter (DDDZ)D
METHOD a getSquaredDistance (DDDZ)D
ARG 1 x
ARG 3 y
ARG 5 z
ARG 7 treatAsBlockPos
METHOD a isWithinDistance (Lfk;D)Z
ARG 1 pos
ARG 2 distance
METHOD a getSquaredDistance (Lfk;Z)D
ARG 1 pos
ARG 2 treatAsBlockPos
METHOD a isWithinDistance (Lfq;D)Z
ARG 1 vec
ARG 2 distance
METHOD d crossProduct (Lfq;)Lfq;
METHOD m squaredDistanceTo (Lfq;)D
ARG 1 vec
METHOD m getSquaredDistance (Lfq;)D
ARG 1 vec
METHOD n getManhattanDistance (Lfq;)I
ARG 1 vec
METHOD o getX ()I
METHOD p getY ()I
METHOD q getZ ()I

24
mappings/net/minecraft/village/PointOfInterestStorage.mapping
View File

@ -1,13 +1,14 @@
CLASS apw net/minecraft/village/PointOfInterestStorage
CLASS apw$a PathfindingFavorProvider
FIELD b pathfindingFavors Lit/unimi/dsi/fastutil/longs/Long2ByteMap;
CLASS apw$a PointOfInterestDistanceTracker
FIELD b distances Lit/unimi/dsi/fastutil/longs/Long2ByteMap;
METHOD a update ()V
CLASS apw$b OccupationStatus
FIELD a HAS_SPACE Lapw$b;
FIELD b IS_OCCUPIED Lapw$b;
FIELD c ANY Lapw$b;
FIELD d predicate Ljava/util/function/Predicate;
METHOD a getPredicate ()Ljava/util/function/Predicate;
FIELD a levelProcessor Lapw$a;
FIELD a pointOfInterestDistanceTracker Lapw$a;
METHOD a remove (Lev;)V
ARG 1 pos
METHOD a add (Lev;Lapz;)V
@ -16,7 +17,7 @@ CLASS apw net/minecraft/village/PointOfInterestStorage
METHOD a test (Lev;Ljava/util/function/Predicate;)Z
ARG 1 pos
ARG 2 predicate
METHOD a getLevel (Lfo;)I
METHOD a getDistanceFromNearestOccupied (Lfo;)I
ARG 1 pos
METHOD a get (Ljava/util/function/Predicate;JLapw$b;)Ljava/util/stream/Stream;
ARG 1 typePredicate
@ -30,6 +31,13 @@ CLASS apw net/minecraft/village/PointOfInterestStorage
ARG 1 typePredicate
ARG 2 pos
ARG 4 occupationStatus
METHOD a getPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lapw$b;Lev;ILjava/util/Random;)Ljava/util/Optional;
ARG 1 typePredicate
ARG 2 positionPredicate
ARG 3 occupationStatus
ARG 4 pos
ARG 5 radius
ARG 6 random
METHOD a getPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lev;I)Ljava/util/Optional;
ARG 1 typePredicate
ARG 2 positionPredicate
@ -48,5 +56,13 @@ CLASS apw net/minecraft/village/PointOfInterestStorage
ARG 2 positionPredicate
ARG 3 pos
ARG 4 radius
METHOD b getNearestPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lev;ILapw$b;)Ljava/util/Optional;
ARG 1 typePredicate
ARG 2 blockPosPredicate
ARG 3 pos
ARG 4 radius
ARG 5 occupationStatus
METHOD c getType (Lev;)Ljava/util/Optional;
ARG 1 pos
METHOD f isOccupied (J)Z
ARG 1 pos