diff --git a/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping index d056f115e3..40d021acd8 100644 --- a/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2434 net/minecraft/data/server/EntityLootTableGenerator FIELD field_11344 NEEDS_ENTITY_ON_FIRE Lnet/minecraft/class_2048$class_2049; FIELD field_16543 lootTables Ljava/util/Map; - FIELD field_19339 ENTITY_TYPES_IN_MISC_CATEGORY_TO_CHECK Ljava/util/Set; + FIELD field_19339 ENTITY_TYPES_IN_MISC_GROUP_TO_CHECK Ljava/util/Set; METHOD method_10401 createForSheep (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; METHOD method_16368 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_52$class_53;)V METHOD method_16369 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V diff --git a/mappings/net/minecraft/entity/EntityCategory.mapping b/mappings/net/minecraft/entity/EntityCategory.mapping deleted file mode 100644 index 9f4f3f128b..0000000000 --- a/mappings/net/minecraft/entity/EntityCategory.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS net/minecraft/class_1311 net/minecraft/entity/EntityCategory - FIELD field_6295 animal Z - FIELD field_6296 BY_NAME Ljava/util/Map; - FIELD field_6297 spawnCap I - FIELD field_6298 peaceful Z - FIELD field_6304 name Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;IZI)V - ARG 4 spawnCap - ARG 5 peaceful - METHOD method_6133 getName ()Ljava/lang/String; - METHOD method_6134 getSpawnCap ()I - METHOD method_6135 isAnimal ()Z - METHOD method_6136 isPeaceful ()Z diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index ad5d2d3d17..1fef460ddf 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -9,17 +9,19 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_6072 summonable Z FIELD field_6088 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_6092 name Lnet/minecraft/class_2561; - FIELD field_6094 category Lnet/minecraft/class_1311; + FIELD field_6094 spawnGroup Lnet/minecraft/class_1311; FIELD field_6101 factory Lnet/minecraft/class_1299$class_4049; FIELD field_6106 translationKey Ljava/lang/String; METHOD (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;ZZZZLnet/minecraft/class_4048;II)V ARG 1 factory - ARG 2 category + ARG 2 spawnGroup ARG 3 saveable ARG 4 summonable ARG 5 fireImmune ARG 6 spawnableFarFromPlayer + ARG 7 dimensions ARG 8 despawnStartRange + ARG 9 trackTickInterval METHOD method_16351 getLootTableId ()Lnet/minecraft/class_2960; METHOD method_17683 createSimpleBoundingBox (DDD)Lnet/minecraft/class_238; ARG 1 feetX @@ -69,7 +71,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 3 name ARG 4 player ARG 5 pos - ARG 6 spawnType + ARG 6 spawnReason ARG 7 alignPosition ARG 8 invertY METHOD method_5889 createInstanceFromId (ILnet/minecraft/class_1937;)Lnet/minecraft/class_1297; @@ -77,7 +79,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 1 world METHOD method_5890 getId (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2960; ARG 0 type - METHOD method_5891 getCategory ()Lnet/minecraft/class_1311; + METHOD method_5891 getSpawnGroup ()Lnet/minecraft/class_1311; METHOD method_5892 getEntityFromTag (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;)Ljava/util/Optional; ARG 0 tag ARG 1 world @@ -87,7 +89,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 2 stack ARG 3 player ARG 4 pos - ARG 5 spawnType + ARG 5 spawnReason ARG 6 alignPosition ARG 7 invertY METHOD method_5895 register (Ljava/lang/String;Lnet/minecraft/class_1299$class_1300;)Lnet/minecraft/class_1299; @@ -103,7 +105,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 3 name ARG 4 player ARG 5 pos - ARG 6 spawnType + ARG 6 spawnReason ARG 7 alignPosition ARG 8 invertY CLASS class_1300 Builder @@ -113,12 +115,12 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_24087 maxTrackingRange I FIELD field_24088 trackingTickInterval I FIELD field_6148 factory Lnet/minecraft/class_1299$class_4049; - FIELD field_6149 category Lnet/minecraft/class_1311; + FIELD field_6149 spawnGroup Lnet/minecraft/class_1311; FIELD field_6150 summonable Z FIELD field_6151 saveable Z METHOD (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;)V ARG 1 factory - ARG 2 category + ARG 2 spawnGroup METHOD method_17687 setDimensions (FF)Lnet/minecraft/class_1299$class_1300; ARG 1 width ARG 2 height @@ -130,10 +132,10 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 1 trackingTickInterval METHOD method_5901 disableSummon ()Lnet/minecraft/class_1299$class_1300; METHOD method_5902 create (Lnet/minecraft/class_1311;)Lnet/minecraft/class_1299$class_1300; - ARG 0 category + ARG 0 spawnGroup METHOD method_5903 create (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;)Lnet/minecraft/class_1299$class_1300; ARG 0 factory - ARG 1 category + ARG 1 spawnGroup METHOD method_5904 disableSaving ()Lnet/minecraft/class_1299$class_1300; METHOD method_5905 build (Ljava/lang/String;)Lnet/minecraft/class_1299; ARG 1 id diff --git a/mappings/net/minecraft/entity/SpawnGroup.mapping b/mappings/net/minecraft/entity/SpawnGroup.mapping new file mode 100644 index 0000000000..6f4036f1bb --- /dev/null +++ b/mappings/net/minecraft/entity/SpawnGroup.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_1311 net/minecraft/entity/SpawnGroup + FIELD field_24461 despawnStartRange I + FIELD field_24462 immediateDespawnRange I + FIELD field_6295 animal Z + FIELD field_6296 BY_NAME Ljava/util/Map; + FIELD field_6297 capacity I + FIELD field_6298 peaceful Z + FIELD field_6304 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;IZ)V + ARG 3 name + ARG 4 capacity + ARG 5 peaceful + METHOD (Ljava/lang/String;ILjava/lang/String;IZI)V + ARG 3 name + ARG 4 spawnCap + ARG 5 peaceful + ARG 6 immediateDespawnRange + METHOD method_27919 getImmediateDespawnRange ()I + METHOD method_27920 getDespawnStartRange ()I + METHOD method_6133 getName ()Ljava/lang/String; + METHOD method_6134 getCapacity ()I + METHOD method_6135 isAnimal ()Z + METHOD method_6136 isPeaceful ()Z diff --git a/mappings/net/minecraft/entity/SpawnReason.mapping b/mappings/net/minecraft/entity/SpawnReason.mapping new file mode 100644 index 0000000000..f56f83ef87 --- /dev/null +++ b/mappings/net/minecraft/entity/SpawnReason.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_3730 net/minecraft/entity/SpawnReason diff --git a/mappings/net/minecraft/entity/SpawnRestriction.mapping b/mappings/net/minecraft/entity/SpawnRestriction.mapping index b48549ee7e..c69bd2262b 100644 --- a/mappings/net/minecraft/entity/SpawnRestriction.mapping +++ b/mappings/net/minecraft/entity/SpawnRestriction.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_1317 net/minecraft/entity/SpawnRestriction 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_6159 getLocation (Lnet/minecraft/class_1299;)Lnet/minecraft/class_1317$class_1319; @@ -31,6 +31,6 @@ CLASS net/minecraft/class_1317 net/minecraft/entity/SpawnRestriction 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 3 spawnReason ARG 4 pos ARG 5 random diff --git a/mappings/net/minecraft/entity/SpawnType.mapping b/mappings/net/minecraft/entity/SpawnType.mapping deleted file mode 100644 index 7bf6dec802..0000000000 --- a/mappings/net/minecraft/entity/SpawnType.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3730 net/minecraft/entity/SpawnType diff --git a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping index 46ad348067..d86e162b24 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_4119 net/minecraft/entity/ai/brain/task/FollowMobTask ARG 1 predicate ARG 2 maxDistance METHOD (Lnet/minecraft/class_1299;F)V + ARG 1 type ARG 2 maxDistance METHOD (Lnet/minecraft/class_1311;F)V + ARG 1 group ARG 2 maxDistance diff --git a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping index 82bb5fa667..a01608d94d 100644 --- a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping +++ b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_1551 net/minecraft/entity/mob/DrownedEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_7012 canDrownedAttackTarget (Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping b/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping index 74ccf87e21..4ff4d9f234 100644 --- a/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_1559 net/minecraft/entity/mob/EndermiteEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_26911 createEndermiteAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/mob/GhastEntity.mapping b/mappings/net/minecraft/entity/mob/GhastEntity.mapping index fc3ba5951c..7f97c9e7e6 100644 --- a/mappings/net/minecraft/entity/mob/GhastEntity.mapping +++ b/mappings/net/minecraft/entity/mob/GhastEntity.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_1571 net/minecraft/entity/mob/GhastEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_26913 createGhastAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping index 8e6aecfc6c..54b49c4ff5 100644 --- a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping +++ b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_1577 net/minecraft/entity/mob/GuardianEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_26915 createGuardianAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping index a75ff6c8a5..a82153ee75 100644 --- a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_4760 net/minecraft/entity/mob/HoglinEntity METHOD method_24349 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 2 spawnReason ARG 3 pos METHOD method_24658 isAdult ()Z METHOD method_24659 playFightSound ()V diff --git a/mappings/net/minecraft/entity/mob/HostileEntity.mapping b/mappings/net/minecraft/entity/mob/HostileEntity.mapping index 943f0e29fe..b6fd8452e1 100644 --- a/mappings/net/minecraft/entity/mob/HostileEntity.mapping +++ b/mappings/net/minecraft/entity/mob/HostileEntity.mapping @@ -7,13 +7,13 @@ CLASS net/minecraft/class_1588 net/minecraft/entity/mob/HostileEntity 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 2 spawnReason 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_26918 createHostileAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/mob/HuskEntity.mapping b/mappings/net/minecraft/entity/mob/HuskEntity.mapping index 86055da4f0..c67e2c2f26 100644 --- a/mappings/net/minecraft/entity/mob/HuskEntity.mapping +++ b/mappings/net/minecraft/entity/mob/HuskEntity.mapping @@ -2,6 +2,6 @@ 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 2 spawnReason ARG 3 pos ARG 4 random diff --git a/mappings/net/minecraft/entity/mob/MagmaCubeEntity.mapping b/mappings/net/minecraft/entity/mob/MagmaCubeEntity.mapping index ffec22b5a1..7b8d18000f 100644 --- a/mappings/net/minecraft/entity/mob/MagmaCubeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MagmaCubeEntity.mapping @@ -2,7 +2,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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_26917 createMagmaCubeAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index c44730223c..c3663b6185 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -48,7 +48,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_20820 canGather (Lnet/minecraft/class_1799;)Z @@ -102,7 +102,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_5943 initialize (Lnet/minecraft/class_1936;Lnet/minecraft/class_1266;Lnet/minecraft/class_3730;Lnet/minecraft/class_1315;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1315; ARG 1 world ARG 2 difficulty - ARG 3 spawnType + ARG 3 spawnReason ARG 4 entityData ARG 5 entityTag METHOD method_5944 getPathfindingPenalty (Lnet/minecraft/class_7;)F @@ -164,7 +164,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_5978 getLookPitchSpeed ()I METHOD method_5979 canSpawn (Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;)Z ARG 1 world - ARG 2 spawnType + ARG 2 spawnReason METHOD method_5980 setTarget (Lnet/minecraft/class_1309;)V ARG 1 target METHOD method_5983 onEatingGrass ()V diff --git a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping index e3f7ee0eec..bf0d701385 100644 --- a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_3732 net/minecraft/entity/mob/PatrolEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_22332 setPatrolling (Z)V diff --git a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping index 149c8d94b4..a873b433f4 100644 --- a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity METHOD method_24695 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_24696 equipAtChance (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping b/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping index 70acb95b39..5d7e28454c 100644 --- a/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_1614 net/minecraft/entity/mob/SilverfishEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_26922 createSilverfishAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping index 806f8fcb89..0983e15ca1 100644 --- a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_1621 net/minecraft/entity/mob/SlimeEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_24353 getJumpSoundPitch ()F diff --git a/mappings/net/minecraft/entity/mob/StrayEntity.mapping b/mappings/net/minecraft/entity/mob/StrayEntity.mapping index 194d123b76..8d8b80db81 100644 --- a/mappings/net/minecraft/entity/mob/StrayEntity.mapping +++ b/mappings/net/minecraft/entity/mob/StrayEntity.mapping @@ -2,6 +2,6 @@ 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 2 spawnReason ARG 3 pos ARG 4 random diff --git a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping index 9aac56f87b..7be8d2b695 100644 --- a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombifiedPiglinEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_20804 getAngryAt (Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping index e8a7d59445..19202aea35 100644 --- a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_1429 net/minecraft/entity/passive/AnimalEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_24650 breed (Lnet/minecraft/class_1937;Lnet/minecraft/class_1429;)V diff --git a/mappings/net/minecraft/entity/passive/BatEntity.mapping b/mappings/net/minecraft/entity/passive/BatEntity.mapping index 5fced58524..e742e96301 100644 --- a/mappings/net/minecraft/entity/passive/BatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BatEntity.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_1420 net/minecraft/entity/passive/BatEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_26878 createBatAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping index 36aa03cde3..b615bd50a3 100644 --- a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping +++ b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_1433 net/minecraft/entity/passive/DolphinEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_26884 createDolphinAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/passive/FishEntity.mapping b/mappings/net/minecraft/entity/passive/FishEntity.mapping index 08552da804..12ac0efb1e 100644 --- a/mappings/net/minecraft/entity/passive/FishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FishEntity.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_1422 net/minecraft/entity/passive/FishEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_26879 createFishAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping index 3a169fc33e..80a1b20d98 100644 --- a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_1438 net/minecraft/entity/passive/MooshroomEntity 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 2 spawnReason ARG 3 pos ARG 4 random CLASS class_4053 Type diff --git a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping index c13abcba2d..5288ba6322 100644 --- a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_3701 net/minecraft/entity/passive/OcelotEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_22329 getAttackDamage ()F diff --git a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping index 16472b3b27..3497cbd2b8 100644 --- a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_26889 createParrotAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping b/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping index b4d1ad524e..b0221c991f 100644 --- a/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_1456 net/minecraft/entity/passive/PolarBearEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_26891 createPolarBearAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index 609c668f48..93eaadcf37 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity METHOD method_20669 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 entity ARG 1 world - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos METHOD method_26892 createRabbitAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_6605 getJumpProgress (F)F diff --git a/mappings/net/minecraft/entity/passive/SquidEntity.mapping b/mappings/net/minecraft/entity/passive/SquidEntity.mapping index fb19ce817d..8d056265e7 100644 --- a/mappings/net/minecraft/entity/passive/SquidEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SquidEntity.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_1477 net/minecraft/entity/passive/SquidEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_26895 createSquidAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/passive/StriderEntity.mapping b/mappings/net/minecraft/entity/passive/StriderEntity.mapping index 943f00e0eb..7606539c98 100644 --- a/mappings/net/minecraft/entity/passive/StriderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/StriderEntity.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity METHOD method_26344 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_26345 getSpeed ()F diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping index 6ab5df3f21..1e2e40b88b 100644 --- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_1481 net/minecraft/entity/passive/TurtleEntity 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 2 spawnReason ARG 3 pos ARG 4 random METHOD method_26896 createTurtleAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping index 7ea5d26abd..5dff5ef047 100644 --- a/mappings/net/minecraft/world/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper FIELD field_24392 CHUNK_AREA I - FIELD field_24393 SPAWNABLE_CATEGORIES [Lnet/minecraft/class_1311; + FIELD field_24393 SPAWNABLE_GROUPS [Lnet/minecraft/class_1311; FIELD field_9292 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_24930 spawnEntitiesInChunk (Lnet/minecraft/class_1311;Lnet/minecraft/class_3218;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;Lnet/minecraft/class_1948$class_5261;Lnet/minecraft/class_1948$class_5259;)V - ARG 0 category + ARG 0 group ARG 1 world ARG 2 chunk ARG 3 pos @@ -23,7 +23,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 3 squaredDistance METHOD method_24934 canSpawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_1311;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1959$class_1964;Lnet/minecraft/class_2338$class_2339;D)Z ARG 0 world - ARG 1 category + ARG 1 group ARG 2 structureAccessor ARG 3 chunkGenerator ARG 4 spawnEntry @@ -54,7 +54,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper METHOD method_8659 containsSpawnEntry (Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Lnet/minecraft/class_1959$class_1964;Lnet/minecraft/class_2338;)Z ARG 0 structureAccessor ARG 1 chunkGenerator - ARG 2 category + ARG 2 group ARG 3 spawnEntry ARG 4 pos METHOD method_8660 canSpawn (Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z @@ -73,7 +73,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 2 state ARG 3 fluidState METHOD method_8663 spawnEntitiesInChunk (Lnet/minecraft/class_1311;Lnet/minecraft/class_3218;Lnet/minecraft/class_2818;Lnet/minecraft/class_1948$class_5261;Lnet/minecraft/class_1948$class_5259;)V - ARG 0 category + ARG 0 group ARG 1 world ARG 2 chunk ARG 3 checker @@ -81,7 +81,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper METHOD method_8664 pickRandomSpawnEntry (Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Ljava/util/Random;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959$class_1964; ARG 0 structureAccessor ARG 1 chunkGenerator - ARG 2 category + ARG 2 group ARG 3 random ARG 4 pos CLASS class_5259 Runner @@ -99,14 +99,15 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 3 chunk CLASS class_5262 Info FIELD field_24394 spawningChunkCount I - FIELD field_24395 categoryToCount Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap; + FIELD field_24395 groupToCount Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap; FIELD field_24396 densityField Lnet/minecraft/class_5263; - FIELD field_24397 categoryToCountView Lit/unimi/dsi/fastutil/objects/Object2IntMap; + FIELD field_24397 groupToCountView Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_24398 cachedPos Lnet/minecraft/class_2338; FIELD field_24399 cachedEntityType Lnet/minecraft/class_1299; FIELD field_24400 cachedDensityMass D METHOD (ILit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;Lnet/minecraft/class_5263;)V ARG 1 spawningChunkCount + ARG 2 groupToCount ARG 3 densityField METHOD method_27823 getSpawningChunkCount ()I METHOD method_27824 test (Lnet/minecraft/class_1299;Lnet/minecraft/class_2338;Lnet/minecraft/class_2791;)Z @@ -119,5 +120,5 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 1 entity ARG 2 chunk METHOD method_27826 isBelowCap (Lnet/minecraft/class_1311;)Z - ARG 1 category - METHOD method_27830 getCategoryToCount ()Lit/unimi/dsi/fastutil/objects/Object2IntMap; + ARG 1 group + METHOD method_27830 getGroupToCount ()Lit/unimi/dsi/fastutil/objects/Object2IntMap; diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index e406d219c5..26303ead92 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -65,7 +65,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_8697 getSkyColor ()I METHOD method_8698 getFoliageColor ()I METHOD method_8700 getEntitySpawnList (Lnet/minecraft/class_1311;)Ljava/util/List; - ARG 1 category + ARG 1 group METHOD method_8702 generateFeatureStep (Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1936;JLnet/minecraft/class_2919;Lnet/minecraft/class_2338;)V ARG 1 step ARG 2 structureAccessor @@ -94,7 +94,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_8707 computeTemperature (Lnet/minecraft/class_2338;)F ARG 1 blockPos METHOD method_8708 addSpawn (Lnet/minecraft/class_1311;Lnet/minecraft/class_1959$class_1964;)V - ARG 1 type + ARG 1 group ARG 2 spawnEntry METHOD method_8710 addStructureFeature (Lnet/minecraft/class_2975;)V ARG 1 configuredStructureFeature