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

Spawn restriction mappings (#858) 

* Spawn restriction mappings

* SpawnRestriction.canSpawnAt -> canSpawn for consistency

* Some tweaks

* Suggestions

* isValidSpawnHeight -> isValidSpawnDepth

* SpawnRestriction.Predicate => SpawnPredicate

* Parameter names
This commit is contained in:
Juuxel 2019-09-29 20:40:10 +03:00 committed by Modmuss50
parent 439ffb8933
commit 976473470a
24 changed files with 176 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mappings/net/minecraft/entity/SpawnRestriction.mapping
View File

@ -1,14 +1,36 @@
CLASS net/minecraft/class_1317 net/minecraft/entity/SpawnRestriction
CLASS class_1318 Entry
FIELD field_6314 heightMapType Lnet/minecraft/class_2902$class_2903;
FIELD field_19349 predicate Lnet/minecraft/class_1317$class_4306;
FIELD field_6314 heightmapType Lnet/minecraft/class_2902$class_2903;
FIELD field_6315 location Lnet/minecraft/class_1317$class_1319;
METHOD <init> (Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_1317$class_4306;)V
ARG 1 heightMapType
ARG 1 heightmapType
ARG 2 location
ARG 3 predicate
CLASS class_1319 Location
FIELD field_6313 mapping Ljava/util/Map;
METHOD method_20637 setRestrictions (Lnet/minecraft/class_1299;Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_1317$class_4306;)V
METHOD <init> (Ljava/lang/String;I)V
ARG 1 name
ARG 2 id
CLASS class_4306 SpawnPredicate
METHOD test (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 1 type
ARG 2 world
ARG 3 spawnType
ARG 4 pos
ARG 5 random
FIELD field_6313 RESTRICTIONS Ljava/util/Map;
METHOD method_20637 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_1317$class_4306;)V
ARG 0 type
ARG 1 location
ARG 2 heightmapType
ARG 3 predicate
METHOD method_20638 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_6159 getLocation (Lnet/minecraft/class_1299;)Lnet/minecraft/class_1317$class_1319;
ARG 0 type
METHOD method_6160 getHeightMapType (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2902$class_2903;
METHOD method_6160 getHeightmapType (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2902$class_2903;
ARG 0 type

9
mappings/net/minecraft/entity/mob/DrownedEntity.mapping
View File

@ -37,6 +37,15 @@ CLASS net/minecraft/class_1551 net/minecraft/entity/mob/DrownedEntity
FIELD field_7232 landNavigation Lnet/minecraft/class_1409;
FIELD field_7233 targetingUnderwater Z
FIELD field_7234 waterNavigation Lnet/minecraft/class_1412;
METHOD method_20672 isValidSpawnDepth (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z
ARG 0 world
ARG 1 pos
METHOD method_20673 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_7013 setTargetingUnderwater (Z)V
ARG 1 targetingUnderwater
METHOD method_7018 isTargetingUnderwater ()Z

6
mappings/net/minecraft/entity/mob/EndermiteEntity.mapping
View File

@ -1,6 +1,12 @@
CLASS net/minecraft/class_1559 net/minecraft/entity/mob/EndermiteEntity
FIELD field_7250 lifeTime I
FIELD field_7251 playerSpawned Z
METHOD method_20674 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_7022 setPlayerSpawned (Z)V
ARG 1 playerSpawned
METHOD method_7023 isPlayerSpawned ()Z

6
mappings/net/minecraft/entity/mob/GhastEntity.mapping
View File

@ -16,6 +16,12 @@ CLASS net/minecraft/class_1571 net/minecraft/entity/mob/GhastEntity
ARG 1 ghast
FIELD field_7272 fireballStrength I
FIELD field_7273 SHOOTING Lnet/minecraft/class_2940;
METHOD method_20675 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_7048 setShooting (Z)V
ARG 1 shooting
METHOD method_7049 getFireballStrength ()I

6
mappings/net/minecraft/entity/mob/GuardianEntity.mapping
View File

@ -26,6 +26,12 @@ CLASS net/minecraft/class_1577 net/minecraft/entity/mob/GuardianEntity
FIELD field_7288 cachedBeamTarget Lnet/minecraft/class_1309;
FIELD field_7289 wanderGoal Lnet/minecraft/class_1379;
FIELD field_7290 BEAM_TARGET_ID Lnet/minecraft/class_2940;
METHOD method_20676 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_7052 getBeamTarget ()Lnet/minecraft/class_1309;
METHOD method_7053 getTailAngle (F)F
ARG 1 tickDelta

16
mappings/net/minecraft/entity/mob/HostileEntity.mapping
View File

@ -2,5 +2,21 @@ CLASS net/minecraft/class_1588 net/minecraft/entity/mob/HostileEntity
METHOD <init> (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V
ARG 1 type
METHOD method_16827 updateDespawnCounter ()V
METHOD method_20679 isSpawnDark (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 world
ARG 1 pos
ARG 2 random
METHOD method_20680 canSpawnInDark (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_20681 canSpawnIgnoreLightLevel (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_7076 isAngryAt (Lnet/minecraft/class_1657;)Z
ARG 1 player

6
mappings/net/minecraft/entity/mob/HuskEntity.mapping
View File

@ -1 +1,7 @@
CLASS net/minecraft/class_1576 net/minecraft/entity/mob/HuskEntity
METHOD method_20677 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random

6
mappings/net/minecraft/entity/mob/MagmaCubeEntity.mapping
View File

@ -1 +1,7 @@
CLASS net/minecraft/class_1589 net/minecraft/entity/mob/MagmaCubeEntity
METHOD method_20678 canMagmaCubeSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random

6
mappings/net/minecraft/entity/mob/MobEntity.mapping
View File

@ -44,6 +44,12 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
METHOD method_19540 setAttacking (Z)V
ARG 1 attacking
METHOD method_20240 getLookYawSpeed ()I
METHOD method_20636 canMobSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F
METHOD method_5930 setForwardSpeed (F)V
ARG 1 forwardSpeed

6
mappings/net/minecraft/entity/mob/PatrolEntity.mapping
View File

@ -24,3 +24,9 @@ CLASS net/minecraft/class_3732 net/minecraft/entity/mob/PatrolEntity
METHOD method_16472 hasNoRaid ()Z
METHOD method_16485 canLead ()Z
METHOD method_16915 isRaidCenterSet ()Z
METHOD method_20739 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random

6
mappings/net/minecraft/entity/mob/SilverfishEntity.mapping
View File

@ -11,3 +11,9 @@ CLASS net/minecraft/class_1614 net/minecraft/entity/mob/SilverfishEntity
ARG 1 silverfish
METHOD method_7136 onHurt ()V
FIELD field_7366 callForHelpGoal Lnet/minecraft/class_1614$class_1616;
METHOD method_20684 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random

6
mappings/net/minecraft/entity/mob/SlimeEntity.mapping
View File

@ -32,6 +32,12 @@ CLASS net/minecraft/class_1621 net/minecraft/entity/mob/SlimeEntity
FIELD field_7389 targetStretch F
FIELD field_7390 SLIME_SIZE Lnet/minecraft/class_2940;
FIELD field_7391 onGroundLastTick Z
METHOD method_20685 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_7152 getSize ()I
METHOD method_7153 getJumpSound ()Lnet/minecraft/class_3414;
METHOD method_7154 getTicksUntilNextJump ()I

6
mappings/net/minecraft/entity/mob/StrayEntity.mapping
View File

@ -1 +1,7 @@
CLASS net/minecraft/class_1627 net/minecraft/entity/mob/StrayEntity
METHOD method_20686 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random

6
mappings/net/minecraft/entity/mob/ZombiePigmanEntity.mapping
View File

@ -10,4 +10,10 @@ CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombiePigmanEntity
FIELD field_7309 anger I
FIELD field_7310 angerTarget Ljava/util/UUID;
FIELD field_7311 ATTACKING_SPEED_BOOST_UUID Ljava/util/UUID;
METHOD method_20682 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_7079 isAngry ()Z

5
mappings/net/minecraft/entity/passive/AnimalEntity.mapping
View File

@ -4,6 +4,11 @@ CLASS net/minecraft/class_1429 net/minecraft/entity/passive/AnimalEntity
METHOD <init> (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V
ARG 1 type
METHOD method_20663 isValidNaturalSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_6474 canBreedWith (Lnet/minecraft/class_1429;)Z
ARG 1 other
METHOD method_6475 eat (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V

6
mappings/net/minecraft/entity/passive/BatEntity.mapping
View File

@ -2,6 +2,12 @@ CLASS net/minecraft/class_1420 net/minecraft/entity/passive/BatEntity
FIELD field_18100 CLOSE_PLAYER_PREDICATE Lnet/minecraft/class_4051;
FIELD field_6728 BAT_FLAGS Lnet/minecraft/class_2940;
FIELD field_6729 hangingPosition Lnet/minecraft/class_2338;
METHOD method_20661 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_6449 setRoosting (Z)V
METHOD method_6450 isRoosting ()Z
METHOD method_6451 isTodayAroundHalloween ()Z

6
mappings/net/minecraft/entity/passive/DolphinEntity.mapping
View File

@ -20,6 +20,12 @@ CLASS net/minecraft/class_1433 net/minecraft/entity/passive/DolphinEntity
FIELD field_6748 CAN_TAKE Ljava/util/function/Predicate;
FIELD field_6749 MOISTNESS Lnet/minecraft/class_2940;
FIELD field_6750 HAS_FISH Lnet/minecraft/class_2940;
METHOD method_20664 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_6484 isCloseToTarget ()Z
METHOD method_6486 setHasFish (Z)V
ARG 1 hasFish

5
mappings/net/minecraft/entity/passive/FishEntity.mapping
View File

@ -11,6 +11,11 @@ CLASS net/minecraft/class_1422 net/minecraft/entity/passive/FishEntity
METHOD <init> (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V
ARG 1 type
METHOD method_20662 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_6452 getFishBucketItem ()Lnet/minecraft/class_1799;
METHOD method_6453 isFromBucket ()Z
METHOD method_6454 setFromBucket (Z)V

6
mappings/net/minecraft/entity/passive/MooshroomEntity.mapping
View File

@ -19,3 +19,9 @@ CLASS net/minecraft/class_1438 net/minecraft/entity/passive/MooshroomEntity
METHOD method_18435 getMooshroomType ()Lnet/minecraft/class_1438$class_4053;
METHOD method_18436 getStewEffectFrom (Lnet/minecraft/class_1799;)Lorg/apache/commons/lang3/tuple/Pair;
ARG 1 flower
METHOD method_20665 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random

6
mappings/net/minecraft/entity/passive/OcelotEntity.mapping
View File

@ -24,3 +24,9 @@ CLASS net/minecraft/class_3701 net/minecraft/entity/passive/OcelotEntity
METHOD method_16102 setTrusting (Z)V
ARG 1 trusting
METHOD method_16103 updateFleeing ()V
METHOD method_20666 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random

6
mappings/net/minecraft/entity/passive/ParrotEntity.mapping
View File

@ -6,6 +6,12 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity
FIELD field_6825 TAMING_INGREDIENTS Ljava/util/Set;
FIELD field_6826 ATTR_VARIANT Lnet/minecraft/class_2940;
FIELD field_6828 COOKIE Lnet/minecraft/class_1792;
METHOD method_20667 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_6580 getSoundPitch (Ljava/util/Random;)F
ARG 0 random
METHOD method_6581 isInAir ()Z

6
mappings/net/minecraft/entity/passive/PolarBearEntity.mapping
View File

@ -7,6 +7,12 @@ CLASS net/minecraft/class_1456 net/minecraft/entity/passive/PolarBearEntity
FIELD field_6838 lastWarningAnimationProgress F
FIELD field_6839 warningSoundCooldown I
FIELD field_6840 WARNING Lnet/minecraft/class_2940;
METHOD method_20668 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_6600 isWarning ()Z
METHOD method_6601 getWarningAnimationProgress (F)F
ARG 1 tickDelta

6
mappings/net/minecraft/entity/passive/SquidEntity.mapping
View File

@ -9,6 +9,12 @@ CLASS net/minecraft/class_1477 net/minecraft/entity/passive/SquidEntity
FIELD field_6909 constantVelocityZ F
FIELD field_6910 constantVelocityX F
FIELD field_6911 constantVelocityY F
METHOD method_20670 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_6669 squirt ()V
METHOD method_6670 setConstantVelocity (FFF)V
METHOD method_6672 hasConstantVelocity ()Z

6
mappings/net/minecraft/entity/passive/TurtleEntity.mapping
View File

@ -69,6 +69,12 @@ CLASS net/minecraft/class_1481 net/minecraft/entity/passive/TurtleEntity
FIELD field_6923 DIGGING_SAND Lnet/minecraft/class_2940;
FIELD field_6924 LAND_BOUND Lnet/minecraft/class_2940;
FIELD field_6925 ACTIVELY_TRAVELLING Lnet/minecraft/class_2940;
METHOD method_20671 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_6676 setDiggingSand (Z)V
ARG 1 diggingSand
METHOD method_6679 hasEgg ()Z