From 249b75d84a5df6002abc9ee4b1d0f016500ea8d6 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Thu, 20 Dec 2018 09:45:46 +0100 Subject: [PATCH] Many villager-related mappings, some trade related ones and some new (#280) --- mappings/ajd.mapping | 5 -- mappings/ajw.mapping | 6 -- mappings/ajx.mapping | 4 -- mappings/dkj.mapping | 2 - mappings/dlg.mapping | 5 -- mappings/dop.mapping | 3 - .../client/gui/container/VillagerGui.mapping | 1 + .../entity/LivingEntityRenderer.mapping | 4 ++ .../entity/ModeledEntityRenderLayer.mapping | 4 ++ .../entity/ModeledEntityRenderer.mapping | 3 + .../entity/VillagerEntityRenderLayer.mapping | 21 +++++++ .../VillagerResourceMetadataReader.mapping | 4 ++ .../ZombieVillagerEntityRenderer.mapping | 2 +- .../entity/VillagerResourceMetadata.mapping | 9 +++ .../AnimationResourceMetadataReader.mapping | 4 +- .../LanguageResourceMetadataReader.mapping | 4 +- .../TextureResourceMetadataReader.mapping | 4 +- .../enchantment/EnchantmentHelper.mapping | 9 ++- .../net/minecraft/entity/LivingEntity.mapping | 4 ++ .../net/minecraft/entity/SpawnType.mapping | 1 + .../ai/goal/MoveToRaidCenterGoal.mapping | 7 +++ .../entity/ai/goal/VillagerFarmGoal.mapping | 8 +++ .../entity/ai/goal/VillagerStareGoal.mapping | 10 +++ .../ai/pathing/EntityNavigation.mapping | 6 ++ .../ai/pathing/SpiderNavigation.mapping | 2 + .../entity/boss/EntityWither.mapping | 2 +- .../data/TrackedDataHandlerRegistry.mapping | 1 + .../entity/mob/AbstractSkeletonEntity.mapping | 4 +- .../minecraft/entity/mob/BlazeEntity.mapping | 2 +- .../entity/mob/CaveSpiderEntity.mapping | 2 +- .../entity/mob/CreeperEntity.mapping | 2 +- .../entity/mob/DrownedEntity.mapping | 2 +- .../entity/mob/EndermanEntity.mapping | 2 +- .../entity/mob/EndermiteEntity.mapping | 2 +- .../minecraft/entity/mob/EvokerEntity.mapping | 4 +- .../minecraft/entity/mob/GhastEntity.mapping | 2 +- .../entity/mob/GuardianEntity.mapping | 2 +- .../entity/mob/IllagerBeastEntity.mapping | 5 +- .../entity/mob/IllusionerEntity.mapping | 6 +- .../minecraft/entity/mob/MobEntity.mapping | 5 +- .../minecraft/entity/mob/PatrolEntity.mapping | 19 ++++-- .../entity/mob/PhantomEntity.mapping | 4 +- .../entity/mob/PillagerEntity.mapping | 7 ++- .../entity/mob/ShulkerEntity.mapping | 4 +- .../entity/mob/SilverfishEntity.mapping | 2 +- .../minecraft/entity/mob/SlimeEntity.mapping | 4 +- .../minecraft/entity/mob/SpiderEntity.mapping | 4 +- .../minecraft/entity/mob/VexEntity.mapping | 4 +- .../entity/mob/VindicatorEntity.mapping | 6 +- .../minecraft/entity/mob/WitchEntity.mapping | 5 +- .../entity/mob/WitherSkeletonEntity.mapping | 2 +- .../minecraft/entity/mob/ZombieEntity.mapping | 5 +- .../entity/mob/ZombieVillagerEntity.mapping | 11 ++-- .../entity/passive/CatEntity.mapping | 4 +- .../entity/passive/ChickenEntity.mapping | 2 +- .../entity/passive/CowEntity.mapping | 2 +- .../entity/passive/DolphinEntity.mapping | 5 +- .../entity/passive/FishEntity.mapping | 1 - .../entity/passive/HorseBaseEntity.mapping | 4 +- .../entity/passive/HorseEntity.mapping | 2 +- .../entity/passive/IronGolemEntity.mapping | 2 +- .../entity/passive/LlamaEntity.mapping | 4 +- .../entity/passive/OcelotEntity.mapping | 4 +- .../entity/passive/PandaEntity.mapping | 5 +- .../entity/passive/ParrotEntity.mapping | 4 +- .../entity/passive/PigEntity.mapping | 2 +- .../entity/passive/PolarBearEntity.mapping | 4 +- .../entity/passive/PufferfishEntity.mapping | 2 +- .../entity/passive/RabbitEntity.mapping | 4 +- .../entity/passive/SheepEntity.mapping | 4 +- .../entity/passive/SnowmanEntity.mapping | 2 +- .../entity/passive/SquidEntity.mapping | 2 +- .../entity/passive/TropicalFishEntity.mapping | 2 + .../entity/passive/TurtleEntity.mapping | 4 +- .../entity/passive/VillagerEntity.mapping | 45 +++++++++++--- .../entity/passive/VillagerProfession.mapping | 3 - .../entity/passive/VillagerType.mapping | 6 -- .../entity/passive/WolfEntity.mapping | 2 +- .../entity/player/PlayerEntity.mapping | 1 + .../net/minecraft/entity/raid/Raid.mapping | 61 +++++++++++++++++-- .../minecraft/entity/raid/RaidManager.mapping | 13 +++- .../minecraft/entity/raid/RaidVictim.mapping | 3 + .../entity/raid/RaiderEntity.mapping | 13 +++- .../inventory/BasicInventory.mapping | 1 + .../net/minecraft/item/map/MapState.mapping | 5 ++ .../PackResourceMetadataReader.mapping | 4 +- .../metadata/ResourceMetadataReader.mapping | 2 +- .../server/network/ServerPlayerEntity.mapping | 2 +- .../server/world/ServerWorld.mapping | 2 + .../net/minecraft/sortme/SpawnHelper.mapping | 4 ++ .../minecraft/sortme/SpawnRestriction.mapping | 12 ++++ .../minecraft/village/SimpleVillager.mapping | 2 +- .../village/VillageProperties.mapping | 18 +++++- .../net/minecraft/village/Villager.mapping | 2 +- .../minecraft/village/VillagerData.mapping | 11 ++++ .../village/VillagerDataContainer.mapping | 2 + .../village/VillagerProfession.mapping | 3 + .../minecraft/village/VillagerTrades.mapping | 34 +++++++++++ .../minecraft/village/VillagerType.mapping | 6 ++ mappings/net/minecraft/world/World.mapping | 2 + 100 files changed, 431 insertions(+), 145 deletions(-) delete mode 100644 mappings/ajd.mapping delete mode 100644 mappings/ajw.mapping delete mode 100644 mappings/ajx.mapping delete mode 100644 mappings/dkj.mapping delete mode 100644 mappings/dlg.mapping delete mode 100644 mappings/dop.mapping create mode 100644 mappings/net/minecraft/client/render/entity/ModeledEntityRenderLayer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/ModeledEntityRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/VillagerEntityRenderLayer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/VillagerResourceMetadataReader.mapping create mode 100644 mappings/net/minecraft/client/renderer/entity/VillagerResourceMetadata.mapping create mode 100644 mappings/net/minecraft/entity/SpawnType.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/VillagerFarmGoal.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/VillagerStareGoal.mapping delete mode 100644 mappings/net/minecraft/entity/passive/VillagerProfession.mapping delete mode 100644 mappings/net/minecraft/entity/passive/VillagerType.mapping create mode 100644 mappings/net/minecraft/entity/raid/RaidVictim.mapping create mode 100644 mappings/net/minecraft/sortme/SpawnHelper.mapping create mode 100644 mappings/net/minecraft/sortme/SpawnRestriction.mapping create mode 100644 mappings/net/minecraft/village/VillagerData.mapping create mode 100644 mappings/net/minecraft/village/VillagerDataContainer.mapping create mode 100644 mappings/net/minecraft/village/VillagerProfession.mapping create mode 100644 mappings/net/minecraft/village/VillagerTrades.mapping create mode 100644 mappings/net/minecraft/village/VillagerType.mapping diff --git a/mappings/ajd.mapping b/mappings/ajd.mapping deleted file mode 100644 index 0c5a336152..0000000000 --- a/mappings/ajd.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS ajd - METHOD a canStart ()Z - METHOD a isTargetPos (Lbbt;Let;)Z - METHOD b shouldContinue ()Z - METHOD e tick ()V diff --git a/mappings/ajw.mapping b/mappings/ajw.mapping deleted file mode 100644 index 4e797b3ece..0000000000 --- a/mappings/ajw.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS ajw - METHOD a canStart ()Z - METHOD b shouldContinue ()Z - METHOD c start ()V - METHOD d onRemove ()V - METHOD e tick ()V diff --git a/mappings/ajx.mapping b/mappings/ajx.mapping deleted file mode 100644 index 5287e45c66..0000000000 --- a/mappings/ajx.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS ajx - METHOD a canStart ()Z - METHOD b shouldContinue ()Z - METHOD e tick ()V diff --git a/mappings/dkj.mapping b/mappings/dkj.mapping deleted file mode 100644 index 9b9bc190a5..0000000000 --- a/mappings/dkj.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS dkj - METHOD a bindTexture (Lqc;)V diff --git a/mappings/dlg.mapping b/mappings/dlg.mapping deleted file mode 100644 index 0084e96e0f..0000000000 --- a/mappings/dlg.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS dlg - METHOD a ()Z - METHOD a (Lagv;FFFFFFF)V - METHOD a onResourceReload (Lwj;)V - ARG 1 manager diff --git a/mappings/dop.mapping b/mappings/dop.mapping deleted file mode 100644 index dbe8d2e069..0000000000 --- a/mappings/dop.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS dop - METHOD a getKey ()Ljava/lang/String; - METHOD a read (Lcom/google/gson/JsonObject;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/client/gui/container/VillagerGui.mapping b/mappings/net/minecraft/client/gui/container/VillagerGui.mapping index a3b58f9278..a342ff87ee 100644 --- a/mappings/net/minecraft/client/gui/container/VillagerGui.mapping +++ b/mappings/net/minecraft/client/gui/container/VillagerGui.mapping @@ -18,6 +18,7 @@ CLASS cvi net/minecraft/client/gui/container/VillagerGui ARG 2 mouseY ARG 3 delta FIELD B villagerName Ljd; + FIELD C playerInventory Lara; FIELD w TEXTURE Lqc; FIELD x villager Lbat; FIELD y buttonPageNext Lcvi$a; diff --git a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping index 89ecca6fe8..24ae74ae8d 100644 --- a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping @@ -1,5 +1,8 @@ CLASS djs net/minecraft/client/render/entity/LivingEntityRenderer + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD f model Lcym; + FIELD h layers Ljava/util/List; + FIELD j texture Ldnf; METHOD a linearRotationInterpolation (FFF)F ARG 1 min ARG 2 max @@ -12,3 +15,4 @@ CLASS djs net/minecraft/client/render/entity/LivingEntityRenderer METHOD a addLayer (Ldmn;)Z METHOD c (Lahe;F)F ARG 1 entity + METHOD d getModel ()Lcym; diff --git a/mappings/net/minecraft/client/render/entity/ModeledEntityRenderLayer.mapping b/mappings/net/minecraft/client/render/entity/ModeledEntityRenderLayer.mapping new file mode 100644 index 0000000000..8731442cf7 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/ModeledEntityRenderLayer.mapping @@ -0,0 +1,4 @@ +CLASS dmn net/minecraft/client/render/entity/ModeledEntityRenderLayer + FIELD a parent Ldkj; + METHOD a bindTexture (Lqc;)V + METHOD c getModel ()Lcym; diff --git a/mappings/net/minecraft/client/render/entity/ModeledEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ModeledEntityRenderer.mapping new file mode 100644 index 0000000000..ae6db4fd3d --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/ModeledEntityRenderer.mapping @@ -0,0 +1,3 @@ +CLASS dkj net/minecraft/client/render/entity/ModeledEntityRenderer + METHOD a bindTexture (Lqc;)V + METHOD d getModel ()Lcym; diff --git a/mappings/net/minecraft/client/render/entity/VillagerEntityRenderLayer.mapping b/mappings/net/minecraft/client/render/entity/VillagerEntityRenderLayer.mapping new file mode 100644 index 0000000000..2bbbf0bc50 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/VillagerEntityRenderLayer.mapping @@ -0,0 +1,21 @@ +CLASS dlg net/minecraft/client/render/entity/VillagerEntityRenderLayer + FIELD a LEVEL_TO_ID Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + FIELD b villagerTypeToHat Lit/unimi/dsi/fastutil/objects/Object2ObjectMap; + FIELD c professionToHat Lit/unimi/dsi/fastutil/objects/Object2ObjectMap; + FIELD d resourceManager Lwh; + FIELD e entityType Ljava/lang/String; + METHOD a ()Z + METHOD a (Lagv;FFFFFFF)V + METHOD a render (Lahe;FFFFFFF)V + ARG 12 villageTypeHat + ARG 13 professionHat + METHOD a getHatType (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Ljava/lang/String;Lex;Ljava/lang/Object;)Ldoo$a; + ARG 1 hatLookUp + ARG 2 keyType + ARG 3 registry + ARG 4 key + METHOD a findTexture (Ljava/lang/String;Lqc;)Lqc; + ARG 1 keyType + ARG 2 keyId + METHOD a onResourceReload (Lwj;)V + ARG 1 manager diff --git a/mappings/net/minecraft/client/render/entity/VillagerResourceMetadataReader.mapping b/mappings/net/minecraft/client/render/entity/VillagerResourceMetadataReader.mapping new file mode 100644 index 0000000000..fd26bc5911 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/VillagerResourceMetadataReader.mapping @@ -0,0 +1,4 @@ +CLASS dop net/minecraft/client/render/entity/VillagerResourceMetadataReader + METHOD a getKey ()Ljava/lang/String; + METHOD a fromJson (Lcom/google/gson/JsonObject;)Ljava/lang/Object; + METHOD b fromJson (Lcom/google/gson/JsonObject;)Ldoo; diff --git a/mappings/net/minecraft/client/render/entity/ZombieVillagerEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ZombieVillagerEntityRenderer.mapping index 9394480712..98d8b16565 100644 --- a/mappings/net/minecraft/client/render/entity/ZombieVillagerEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ZombieVillagerEntityRenderer.mapping @@ -1,5 +1,5 @@ CLASS dlp net/minecraft/client/render/entity/ZombieVillagerEntityRenderer - FIELD a VILLAGER_SKIN Lqc; + FIELD a ZOMBIE_VILLAGER_SKIN Lqc; METHOD a getTexture (Lagv;)Lqc; METHOD a getTexture (Lahf;)Lqc; METHOD a getTexture (Laqn;)Lqc; diff --git a/mappings/net/minecraft/client/renderer/entity/VillagerResourceMetadata.mapping b/mappings/net/minecraft/client/renderer/entity/VillagerResourceMetadata.mapping new file mode 100644 index 0000000000..1d4e3abf88 --- /dev/null +++ b/mappings/net/minecraft/client/renderer/entity/VillagerResourceMetadata.mapping @@ -0,0 +1,9 @@ +CLASS doo net/minecraft/client/renderer/entity/VillagerResourceMetadata + CLASS doo$a HatType + FIELD d byName Ljava/util/Map; + FIELD e name Ljava/lang/String; + METHOD a getName ()Ljava/lang/String; + METHOD a from (Ljava/lang/String;)Ldoo$a; + FIELD a READER Ldop; + FIELD b hatType Ldoo$a; + METHOD a getHatType ()Ldoo$a; diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadataReader.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadataReader.mapping index 6004932cec..8eeca08545 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadataReader.mapping +++ b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadataReader.mapping @@ -1,4 +1,4 @@ CLASS don net/minecraft/client/resource/metadata/AnimationResourceMetadataReader METHOD a getKey ()Ljava/lang/String; - METHOD a read (Lcom/google/gson/JsonObject;)Ljava/lang/Object; - METHOD b read (Lcom/google/gson/JsonObject;)Ldom; + METHOD a fromJson (Lcom/google/gson/JsonObject;)Ljava/lang/Object; + METHOD b fromJson (Lcom/google/gson/JsonObject;)Ldom; diff --git a/mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadataReader.mapping b/mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadataReader.mapping index ec675e8e3f..85c5e08700 100644 --- a/mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadataReader.mapping +++ b/mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadataReader.mapping @@ -1,4 +1,4 @@ CLASS dos net/minecraft/client/resource/metadata/LanguageResourceMetadataReader METHOD a getKey ()Ljava/lang/String; - METHOD a read (Lcom/google/gson/JsonObject;)Ljava/lang/Object; - METHOD b read (Lcom/google/gson/JsonObject;)Ldor; + METHOD a fromJson (Lcom/google/gson/JsonObject;)Ljava/lang/Object; + METHOD b fromJson (Lcom/google/gson/JsonObject;)Ldor; diff --git a/mappings/net/minecraft/client/resource/metadata/TextureResourceMetadataReader.mapping b/mappings/net/minecraft/client/resource/metadata/TextureResourceMetadataReader.mapping index 054ba0cad6..96055c91f9 100644 --- a/mappings/net/minecraft/client/resource/metadata/TextureResourceMetadataReader.mapping +++ b/mappings/net/minecraft/client/resource/metadata/TextureResourceMetadataReader.mapping @@ -1,4 +1,4 @@ CLASS dow net/minecraft/client/resource/metadata/TextureResourceMetadataReader METHOD a getKey ()Ljava/lang/String; - METHOD a read (Lcom/google/gson/JsonObject;)Ljava/lang/Object; - METHOD b read (Lcom/google/gson/JsonObject;)Ldov; + METHOD a fromJson (Lcom/google/gson/JsonObject;)Ljava/lang/Object; + METHOD b fromJson (Lcom/google/gson/JsonObject;)Ldov; diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index 228f37c299..6d7946fc16 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -32,8 +32,11 @@ CLASS azu net/minecraft/enchantment/EnchantmentHelper ARG 1 num ARG 2 enchantmentPower ARG 3 rstack - METHOD a (Ljava/util/Random;Lawo;IZ)Lawo; + METHOD a enchant (Ljava/util/Random;Lawo;IZ)Lawo; ARG 0 random + ARG 1 target + ARG 2 level + ARG 3 hasTreasure METHOD b getKnockback (Lahe;)I ARG 0 entity METHOD b onTargetDamaged (Lahe;Lagv;)V @@ -42,9 +45,11 @@ CLASS azu net/minecraft/enchantment/EnchantmentHelper METHOD b getRandomEnchantedEquipment (Lazs;Lahe;)Lawo; ARG 0 enchantment ARG 1 entity - METHOD b (Ljava/util/Random;Lawo;IZ)Ljava/util/List; + METHOD b getEnchantments (Ljava/util/Random;Lawo;IZ)Ljava/util/List; ARG 0 random ARG 1 stack + ARG 2 level + ARG 3 hasTreasure METHOD c getFireAspect (Lahe;)I ARG 0 entity METHOD c getLure (Lawo;)I diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index eb15c5ee41..038429eacc 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -6,6 +6,7 @@ CLASS ahe net/minecraft/entity/LivingEntity FIELD aS prevHeadPitch F FIELD aV playerHitTimer I FIELD aW dead Z + FIELD aX despawnCounter I FIELD av LIVING_FLAGS Lpr; FIELD ax preferredHand Lafo; FIELD az stuckArrowTimer I @@ -94,6 +95,7 @@ CLASS ahe net/minecraft/entity/LivingEntity METHOD cf getRand ()Ljava/util/Random; METHOD cg getAttacker ()Lahe; METHOD ch getLastAttackedTime ()I + METHOD ck getDespawnCounter ()I METHOD cm clearPotionSwirls ()V METHOD cn clearPotionEffects ()Z METHOD co getPotionEffects ()Ljava/util/Collection; @@ -103,6 +105,7 @@ CLASS ahe net/minecraft/entity/LivingEntity METHOD cy getDamageTracker ()Lagd; METHOD d applyDamage (Lage;F)V ARG 1 damageSource + METHOD d removeStatusEffect (Lagn;)Z METHOD d isPotionEffective (Lago;)Z METHOD d getCurrentExperience (Larb;)I METHOD da getActiveItem ()Lawo; @@ -114,6 +117,7 @@ CLASS ahe net/minecraft/entity/LivingEntity METHOD k updateMovement ()V METHOD k setYaw (F)V METHOD l setHealth (F)V + METHOD m setDespawnCounter (I)V METHOD n initAi ()V METHOD n getFallSound (I)Lxm; METHOD o setStuckArrows (I)V diff --git a/mappings/net/minecraft/entity/SpawnType.mapping b/mappings/net/minecraft/entity/SpawnType.mapping new file mode 100644 index 0000000000..509d9a6641 --- /dev/null +++ b/mappings/net/minecraft/entity/SpawnType.mapping @@ -0,0 +1 @@ +CLASS ahh net/minecraft/entity/SpawnType diff --git a/mappings/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.mapping new file mode 100644 index 0000000000..5b53553776 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.mapping @@ -0,0 +1,7 @@ +CLASS ajx net/minecraft/entity/ai/goal/MoveToRaidCenterGoal + FIELD a owner Lasg; + METHOD a canStart ()Z + METHOD a includeFreeRaiders (Lasf;)V + METHOD b shouldContinue ()Z + METHOD e tick ()V + METHOD g moveToAlternativePosition ()V diff --git a/mappings/net/minecraft/entity/ai/goal/VillagerFarmGoal.mapping b/mappings/net/minecraft/entity/ai/goal/VillagerFarmGoal.mapping new file mode 100644 index 0000000000..a89ace8c02 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/VillagerFarmGoal.mapping @@ -0,0 +1,8 @@ +CLASS ajd net/minecraft/entity/ai/goal/VillagerFarmGoal + FIELD f owner Laqr; + FIELD g seed Z + FIELD h breed Z + METHOD a canStart ()Z + METHOD a isTargetPos (Lbbt;Let;)Z + METHOD b shouldContinue ()Z + METHOD e tick ()V diff --git a/mappings/net/minecraft/entity/ai/goal/VillagerStareGoal.mapping b/mappings/net/minecraft/entity/ai/goal/VillagerStareGoal.mapping new file mode 100644 index 0000000000..1d6cea3ab0 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/VillagerStareGoal.mapping @@ -0,0 +1,10 @@ +CLASS ajw net/minecraft/entity/ai/goal/VillagerStareGoal + FIELD a owner Laqr; + FIELD b target Lahe; + FIELD c speed D + FIELD d timeLeft I + METHOD a canStart ()Z + METHOD b shouldContinue ()Z + METHOD c start ()V + METHOD d onRemove ()V + METHOD e tick ()V diff --git a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping index 7fad4053d7..85417b26e4 100644 --- a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping @@ -7,7 +7,13 @@ CLASS alg net/minecraft/entity/ai/pathing/EntityNavigation FIELD r pathNodeNavigator Lchm; METHOD a createPathNodeNavigator ()Lchm; METHOD a findPathTo (DDD)Lchk; + METHOD a startMovingTo (DDDD)Z + ARG 7 speed METHOD a findPathTo (Lagv;)Lchk; + METHOD a startMovingTo (Lagv;D)Z + ARG 2 speed + METHOD a startMovingAlong (Lchk;D)Z + ARG 2 speed METHOD a isValidPosition (Let;)Z METHOD b isAtValidPosition ()Z METHOD b findPathTo (Let;)Lchk; diff --git a/mappings/net/minecraft/entity/ai/pathing/SpiderNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/SpiderNavigation.mapping index 5f0ef6e9e3..eadedbc3a9 100644 --- a/mappings/net/minecraft/entity/ai/pathing/SpiderNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/SpiderNavigation.mapping @@ -2,5 +2,7 @@ CLASS ali net/minecraft/entity/ai/pathing/SpiderNavigation METHOD (Lahf;Lbbp;)V ARG 1 entity METHOD a findPathTo (Lagv;)Lchk; + METHOD a startMovingTo (Lagv;D)Z + ARG 2 speed METHOD b findPathTo (Let;)Lchk; METHOD d tick ()V diff --git a/mappings/net/minecraft/entity/boss/EntityWither.mapping b/mappings/net/minecraft/entity/boss/EntityWither.mapping index 7a60c8ef3b..38d0c18461 100644 --- a/mappings/net/minecraft/entity/boss/EntityWither.mapping +++ b/mappings/net/minecraft/entity/boss/EntityWither.mapping @@ -39,7 +39,7 @@ CLASS aoj net/minecraft/entity/boss/EntityWither METHOD dz hasArmsRaised ()Z METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD n canStartRiding (Lagv;)Z METHOD q getTrackedEntityId (I)I METHOD s setArmsRaised (Z)V diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping index 35f401dd06..730acab958 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping @@ -182,6 +182,7 @@ CLASS pt net/minecraft/entity/data/TrackedDataHandlerRegistry FIELD n FACING Lps; FIELD o OPTIONAL_UUID Lps; FIELD p TAG_COMPOUND Lps; + FIELD q VILLAGER_DATA Lps; METHOD a get (I)Lps; ARG 0 id METHOD a register (Lps;)V diff --git a/mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping b/mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping index f500f059db..51ff7ac1a9 100644 --- a/mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping +++ b/mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping @@ -10,7 +10,7 @@ CLASS apc net/minecraft/entity/mob/AbstractSkeletonEntity ARG 1 slot METHOD a attack (Lahe;F)V ARG 1 target - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a playStepSound (Let;Lbpm;)V ARG 1 pos @@ -20,6 +20,6 @@ CLASS apc net/minecraft/entity/mob/AbstractSkeletonEntity METHOD ca initAttributes ()V METHOD dz hasArmsRaised ()Z METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD s setArmsRaised (Z)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/BlazeEntity.mapping b/mappings/net/minecraft/entity/mob/BlazeEntity.mapping index 9f71b3561f..2e99513695 100644 --- a/mappings/net/minecraft/entity/mob/BlazeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BlazeEntity.mapping @@ -17,5 +17,5 @@ CLASS apd net/minecraft/entity/mob/BlazeEntity METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V METHOD l isFireActive ()Z - METHOD n ()V + METHOD n prepareGoals ()V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/CaveSpiderEntity.mapping b/mappings/net/minecraft/entity/mob/CaveSpiderEntity.mapping index 7ebcb3a361..fbd64896d1 100644 --- a/mappings/net/minecraft/entity/mob/CaveSpiderEntity.mapping +++ b/mappings/net/minecraft/entity/mob/CaveSpiderEntity.mapping @@ -1,5 +1,5 @@ CLASS ape net/minecraft/entity/mob/CaveSpiderEntity - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD bG getEyeHeight ()F METHOD ca initAttributes ()V diff --git a/mappings/net/minecraft/entity/mob/CreeperEntity.mapping b/mappings/net/minecraft/entity/mob/CreeperEntity.mapping index be5cf700de..73ce9b7d6c 100644 --- a/mappings/net/minecraft/entity/mob/CreeperEntity.mapping +++ b/mappings/net/minecraft/entity/mob/CreeperEntity.mapping @@ -22,5 +22,5 @@ CLASS apf net/minecraft/entity/mob/CreeperEntity METHOD dC setIgnited ()V METHOD e getHurtSound (Lage;)Lxm; METHOD l isCharged ()Z - METHOD n ()V + METHOD n prepareGoals ()V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping index 545d2eecf6..d4d20b3953 100644 --- a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping +++ b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping @@ -29,7 +29,7 @@ CLASS aph net/minecraft/entity/mob/DrownedEntity METHOD a initEquipment (Lafn;)V METHOD a attack (Lahe;F)V ARG 1 target - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a canSpawn (Lbbq;Lahh;)Z METHOD af getSoundSwim ()Lxm; diff --git a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping index 35b6965037..cbaa3cf16f 100644 --- a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping @@ -34,5 +34,5 @@ CLASS apj net/minecraft/entity/mob/EndermanEntity METHOD e getHurtSound (Lage;)Lxm; METHOD f setTarget (Lahe;)V METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping b/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping index 9221772e8e..47cdbf6c3d 100644 --- a/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping @@ -15,4 +15,4 @@ CLASS apk net/minecraft/entity/mob/EndermiteEntity METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V METHOD k setYaw (F)V - METHOD n ()V + METHOD n prepareGoals ()V diff --git a/mappings/net/minecraft/entity/mob/EvokerEntity.mapping b/mappings/net/minecraft/entity/mob/EvokerEntity.mapping index 5fc411f6ad..2e2f77d62d 100644 --- a/mappings/net/minecraft/entity/mob/EvokerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EvokerEntity.mapping @@ -37,8 +37,10 @@ CLASS apm net/minecraft/entity/mob/EvokerEntity METHOD b writeCustomDataToTag (Lhs;)V METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; + METHOD d addBonusForWave (IZ)V + ARG 1 wave METHOD dS getWololoTarget ()Lamr; METHOD e getHurtSound (Lage;)Lxm; - METHOD n ()V + METHOD n prepareGoals ()V METHOD r isTeammate (Lagv;)Z METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/GhastEntity.mapping b/mappings/net/minecraft/entity/mob/GhastEntity.mapping index 277ffa1013..f2af741842 100644 --- a/mappings/net/minecraft/entity/mob/GhastEntity.mapping +++ b/mappings/net/minecraft/entity/mob/GhastEntity.mapping @@ -36,5 +36,5 @@ CLASS apn net/minecraft/entity/mob/GhastEntity METHOD ds getFireballStrength ()I METHOD e getHurtSound (Lage;)Lxm; METHOD l isShooting ()Z - METHOD n ()V + METHOD n prepareGoals ()V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping index 5862f45a47..c30693fd78 100644 --- a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping +++ b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping @@ -22,5 +22,5 @@ CLASS app net/minecraft/entity/mob/GuardianEntity METHOD cv getDeathSound ()Lxm; METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/IllagerBeastEntity.mapping b/mappings/net/minecraft/entity/mob/IllagerBeastEntity.mapping index b5db07f297..8b95d47ee0 100644 --- a/mappings/net/minecraft/entity/mob/IllagerBeastEntity.mapping +++ b/mappings/net/minecraft/entity/mob/IllagerBeastEntity.mapping @@ -17,6 +17,9 @@ CLASS apr net/minecraft/entity/mob/IllagerBeastEntity METHOD bP getPrimaryPassenger ()Lagv; METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; + METHOD d addBonusForWave (IZ)V + ARG 1 wave + METHOD dC canLead ()Z METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V diff --git a/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping b/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping index 44574e3316..1e197ad54d 100644 --- a/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping @@ -16,14 +16,16 @@ CLASS aps net/minecraft/entity/mob/IllusionerEntity METHOD D getAmbientSound ()Lxm; METHOD a attack (Lahe;F)V ARG 1 target - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; + METHOD d addBonusForWave (IZ)V + ARG 1 wave METHOD dz hasArmsRaised ()Z METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD r isTeammate (Lagv;)Z METHOD s setArmsRaised (Z)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 5c721bf8a2..846c433b92 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -42,10 +42,11 @@ CLASS ahf net/minecraft/entity/mob/MobEntity ARG 1 slot METHOD a setEquippedStack (Laha;Lawo;)V ARG 1 slot + METHOD a pickupItem (Laoy;)V METHOD a canBeLeashedBy (Larb;)Z METHOD a interactMob (Larb;Lafo;)Z ARG 1 player - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a canSpawn (Lbbq;Lahh;)Z METHOD a getPathNodeTypeWeight (Lchg;)F @@ -84,7 +85,7 @@ CLASS ahf net/minecraft/entity/mob/MobEntity ARG 0 stack METHOD f setTarget (Lahe;)V METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD o createBodyControl ()Laib; METHOD p getLookControl ()Laig; METHOD p setCanPickUpLoot (Z)V diff --git a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping index 357eeef3b8..1fb60f80a6 100644 --- a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping @@ -5,15 +5,22 @@ CLASS apv net/minecraft/entity/mob/PatrolEntity METHOD d onRemove ()V METHOD e tick ()V FIELD a patrolTarget Let; - FIELD b isLeader Z - FIELD c isPatrolling Z + FIELD b patrolLeader Z + FIELD c patrolling Z METHOD (Lagz;Lbbp;)V ARG 1 type - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a readCustomDataFromTag (Lhs;)V METHOD aK getHeightOffset ()D METHOD b writeCustomDataToTag (Lhs;)V - METHOD c canImmediatelyDespawn (D)Z - ARG 1 distanceSquared - METHOD n ()V + METHOD dC canLead ()Z + METHOD dD getPatrolTarget ()Let; + METHOD dE hasPatrolTarget ()Z + METHOD dF isPatrolLeader ()Z + METHOD dH hasNoRaid ()Z + METHOD dI setRandomRaidCenter ()V + METHOD dJ isRaidCenterSet ()Z + METHOD g setRaidCenter (Let;)V + METHOD n prepareGoals ()V + METHOD t setPatrolLeader (Z)V diff --git a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping index 4a4ab9cb17..f584cc0181 100644 --- a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping @@ -27,7 +27,7 @@ CLASS apw net/minecraft/entity/mob/PhantomEntity METHOD W_ update ()V METHOD a shouldRenderAtDistance (D)Z METHOD a setSize (I)V - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a readCustomDataFromTag (Lhs;)V METHOD a onTrackedDataSet (Lpr;)V @@ -41,6 +41,6 @@ CLASS apw net/minecraft/entity/mob/PhantomEntity METHOD ds getSize ()I METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD o createBodyControl ()Laib; METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/PillagerEntity.mapping b/mappings/net/minecraft/entity/mob/PillagerEntity.mapping index 5c3ddd85b7..5f1cc4f0a6 100644 --- a/mappings/net/minecraft/entity/mob/PillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PillagerEntity.mapping @@ -6,7 +6,8 @@ CLASS apy net/minecraft/entity/mob/PillagerEntity METHOD a initEquipment (Lafn;)V METHOD a attack (Lahe;F)V ARG 1 target - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a pickupItem (Laoy;)V + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a canSpawn (Lbbq;Lahh;)Z METHOD a readCustomDataFromTag (Lhs;)V @@ -15,9 +16,11 @@ CLASS apy net/minecraft/entity/mob/PillagerEntity ARG 1 distanceSquared METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; + METHOD d addBonusForWave (IZ)V + ARG 1 wave METHOD dz hasArmsRaised ()Z METHOD e getHurtSound (Lage;)Lxm; - METHOD n ()V + METHOD n prepareGoals ()V METHOD r isTeammate (Lagv;)Z METHOD s setArmsRaised (Z)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping index 8facd34fbd..be38525e7f 100644 --- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping @@ -44,7 +44,7 @@ CLASS aqb net/minecraft/entity/mob/ShulkerEntity ARG 2 x ARG 4 y ARG 6 z - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a readCustomDataFromTag (Lhs;)V METHOD a onTrackedDataSet (Lpr;)V @@ -62,6 +62,6 @@ CLASS aqb net/minecraft/entity/mob/ShulkerEntity METHOD g setAttachedBlock (Let;)V METHOD i pushAwayFrom (Lagv;)V METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD o createBodyControl ()Laib; METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping b/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping index 1958902c4f..2cb139d5bd 100644 --- a/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping @@ -20,4 +20,4 @@ CLASS aqc net/minecraft/entity/mob/SilverfishEntity METHOD cv getDeathSound ()Lxm; METHOD e getHurtSound (Lage;)Lxm; METHOD k setYaw (F)V - METHOD n ()V + METHOD n prepareGoals ()V diff --git a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping index fc616fd7ea..d470c96022 100644 --- a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping @@ -24,7 +24,7 @@ CLASS aqe net/minecraft/entity/mob/SlimeEntity METHOD R getType ()Lagz; METHOD W_ update ()V METHOD X invalidate ()V - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a canSpawn (Lbbq;Lahh;)Z METHOD a readCustomDataFromTag (Lhs;)V @@ -36,5 +36,5 @@ CLASS aqe net/minecraft/entity/mob/SlimeEntity METHOD dy getSize ()I METHOD e getHurtSound (Lage;)Lxm; METHOD i pushAwayFrom (Lagv;)V - METHOD n ()V + METHOD n prepareGoals ()V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping index 99ae5c0d98..ca156ab7b5 100644 --- a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping @@ -10,7 +10,7 @@ CLASS aqg net/minecraft/entity/mob/SpiderEntity METHOD A_ canClimb ()Z METHOD D getAmbientSound ()Lxm; METHOD W_ update ()V - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a slowMovement (Lbpm;Lcmd;)V ARG 1 state @@ -25,5 +25,5 @@ CLASS aqg net/minecraft/entity/mob/SpiderEntity METHOD d isPotionEffective (Lago;)Z METHOD e getHurtSound (Lage;)Lxm; METHOD l getCanClimb ()Z - METHOD n ()V + METHOD n prepareGoals ()V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/VexEntity.mapping b/mappings/net/minecraft/entity/mob/VexEntity.mapping index a9801c0d95..3083d2367b 100644 --- a/mappings/net/minecraft/entity/mob/VexEntity.mapping +++ b/mappings/net/minecraft/entity/mob/VexEntity.mapping @@ -28,7 +28,7 @@ CLASS aqi net/minecraft/entity/mob/VexEntity ARG 2 x ARG 4 y ARG 6 z - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a readCustomDataFromTag (Lhs;)V METHOD aA getLightmapCoordinates ()I @@ -39,5 +39,5 @@ CLASS aqi net/minecraft/entity/mob/VexEntity METHOD e getHurtSound (Lage;)Lxm; METHOD g setBounds (Let;)V METHOD l getOwner ()Lahf; - METHOD n ()V + METHOD n prepareGoals ()V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping b/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping index 0a46e1da7d..9301ff4014 100644 --- a/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping +++ b/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping @@ -14,13 +14,15 @@ CLASS aqj net/minecraft/entity/mob/VindicatorEntity METHOD D getAmbientSound ()Lxm; METHOD I mobTick ()V METHOD a initEquipment (Lafn;)V - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a readCustomDataFromTag (Lhs;)V METHOD b writeCustomDataToTag (Lhs;)V METHOD b setCustomName (Ljd;)V METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; + METHOD d addBonusForWave (IZ)V + ARG 1 wave METHOD e getHurtSound (Lage;)Lxm; - METHOD n ()V + METHOD n prepareGoals ()V METHOD r isTeammate (Lagv;)Z diff --git a/mappings/net/minecraft/entity/mob/WitchEntity.mapping b/mappings/net/minecraft/entity/mob/WitchEntity.mapping index 2956fc5290..e23cd49a60 100644 --- a/mappings/net/minecraft/entity/mob/WitchEntity.mapping +++ b/mappings/net/minecraft/entity/mob/WitchEntity.mapping @@ -7,10 +7,13 @@ CLASS aqk net/minecraft/entity/mob/WitchEntity METHOD bG getEyeHeight ()F METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; + METHOD d addBonusForWave (IZ)V + ARG 1 wave + METHOD dC canLead ()Z METHOD dz hasArmsRaised ()Z METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V METHOD l isDrinking ()Z - METHOD n ()V + METHOD n prepareGoals ()V METHOD s setArmsRaised (Z)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/WitherSkeletonEntity.mapping b/mappings/net/minecraft/entity/mob/WitherSkeletonEntity.mapping index bc13a8ab4a..6122aaa2fa 100644 --- a/mappings/net/minecraft/entity/mob/WitherSkeletonEntity.mapping +++ b/mappings/net/minecraft/entity/mob/WitherSkeletonEntity.mapping @@ -2,7 +2,7 @@ CLASS aql net/minecraft/entity/mob/WitherSkeletonEntity METHOD D getAmbientSound ()Lxm; METHOD a initEquipment (Lafn;)V METHOD a dropEquipment (Lage;IZ)V - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD bG getEyeHeight ()F METHOD cv getDeathSound ()Lxm; diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index 4e2fc35aad..ac3fcb7e1f 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -3,6 +3,7 @@ CLASS aqm net/minecraft/entity/mob/ZombieEntity METHOD a onDestroyBlock (Lbbp;Let;)V METHOD a tickStepping (Lbbq;Let;)V METHOD i getDesiredSquaredDistanceToTarget ()D + CLASS aqm$b FIELD a BABY_SPEED_ID Ljava/util/UUID; FIELD bD BABY Lpr; FIELD bF ARMS_RAISED Lpr; @@ -19,7 +20,7 @@ CLASS aqm net/minecraft/entity/mob/ZombieEntity ARG 1 source ARG 2 amount METHOD a dropEquipment (Lage;IZ)V - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a playStepSound (Let;Lbpm;)V ARG 1 pos @@ -38,7 +39,7 @@ CLASS aqm net/minecraft/entity/mob/ZombieEntity METHOD dz hasArmsRaised ()Z METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD s setArmsRaised (Z)V METHOD t setBreakDoors (Z)V METHOD u setChild (Z)V diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping index d90529f5cc..6fbf54bc43 100644 --- a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping @@ -1,12 +1,12 @@ CLASS aqn net/minecraft/entity/mob/ZombieVillagerEntity FIELD a CONVERTING Lpr; FIELD bD conversionTimer I - FIELD bE converionStarter Ljava/util/UUID; - FIELD bF offers Lhs; - FIELD b PROFESSION Lpr; + FIELD bE converter Ljava/util/UUID; + FIELD bF offerData Lhs; + FIELD b VILLAGER_DATA Lpr; METHOD D getAmbientSound ()Lxm; METHOD W_ update ()V - METHOD a setProfession (Laqs;)V + METHOD a setVillagerData (Laqs;)V METHOD a interactMob (Larb;Lafo;)Z ARG 1 player METHOD a readCustomDataFromTag (Lhs;)V @@ -20,6 +20,7 @@ CLASS aqn net/minecraft/entity/mob/ZombieVillagerEntity METHOD dC getSkull ()Lawo; METHOD dH isConverting ()Z METHOD dK finishConversion ()V - METHOD dM ()Laqs; + METHOD dM getVillagerData ()Laqs; METHOD e getHurtSound (Lage;)Lxm; + METHOD g setOfferData (Lhs;)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index c5b1be0b65..4ea54f64bf 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -24,7 +24,7 @@ CLASS amb net/minecraft/entity/passive/CatEntity METHOD a interactMob (Larb;Lafo;)Z ARG 1 player METHOD a setCollarColor (Lavl;)V - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a readCustomDataFromTag (Lhs;)V METHOD b createChild (Lags;)Lamb; @@ -40,6 +40,6 @@ CLASS amb net/minecraft/entity/passive/CatEntity METHOD dJ getOcelotType ()I METHOD dM getCollarColor ()Lavl; METHOD e getHurtSound (Lage;)Lxm; - METHOD n ()V + METHOD n prepareGoals ()V METHOD q getOcelotType (I)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping index 1b2a5d0b4d..f60624c07f 100644 --- a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping @@ -18,4 +18,4 @@ CLASS amc net/minecraft/entity/passive/ChickenEntity METHOD d getCurrentExperience (Larb;)I METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V diff --git a/mappings/net/minecraft/entity/passive/CowEntity.mapping b/mappings/net/minecraft/entity/passive/CowEntity.mapping index 67ad68068a..57e3053b54 100644 --- a/mappings/net/minecraft/entity/passive/CowEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CowEntity.mapping @@ -13,4 +13,4 @@ CLASS ame net/minecraft/entity/passive/CowEntity METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; METHOD e getHurtSound (Lage;)Lxm; - METHOD n ()V + METHOD n prepareGoals ()V diff --git a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping index 44205b5fef..8ed6209133 100644 --- a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping +++ b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping @@ -22,10 +22,11 @@ CLASS amf net/minecraft/entity/passive/DolphinEntity METHOD e tick ()V METHOD D getAmbientSound ()Lxm; METHOD W_ update ()V + METHOD a pickupItem (Laoy;)V METHOD a canBeLeashedBy (Larb;)Z METHOD a interactMob (Larb;Lafo;)Z ARG 1 player - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a canSpawn (Lbbq;Lahh;)Z METHOD a readCustomDataFromTag (Lhs;)V @@ -38,6 +39,6 @@ CLASS amf net/minecraft/entity/passive/DolphinEntity METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; METHOD e getHurtSound (Lage;)Lxm; - METHOD n ()V + METHOD n prepareGoals ()V METHOD n canStartRiding (Lagv;)Z METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/FishEntity.mapping b/mappings/net/minecraft/entity/passive/FishEntity.mapping index 30a87894d5..3dcc3da8f3 100644 --- a/mappings/net/minecraft/entity/passive/FishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FishEntity.mapping @@ -26,6 +26,5 @@ CLASS alx net/minecraft/entity/passive/FishEntity METHOD dz hasSelfControl ()Z METHOD f copyDataToStack (Lawo;)V METHOD k updateMovement ()V - METHOD l getFishBucketStack ()Lawo; METHOD n ()V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping index b7358bde4e..cd86224b19 100644 --- a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping @@ -16,7 +16,7 @@ CLASS ana net/minecraft/entity/passive/HorseBaseEntity ARG 2 amount METHOD a createChild (Lags;)Lags; METHOD a canBeLeashedBy (Larb;)Z - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a playStepSound (Let;Lbpm;)V ARG 1 pos @@ -44,7 +44,7 @@ CLASS ana net/minecraft/entity/passive/HorseBaseEntity METHOD dW isSaddled ()Z METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD q getHorseFlag (I)Z METHOD r setTemper (I)V METHOD u setTame (Z)V diff --git a/mappings/net/minecraft/entity/passive/HorseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseEntity.mapping index cce55e8674..3e54495553 100644 --- a/mappings/net/minecraft/entity/passive/HorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseEntity.mapping @@ -13,7 +13,7 @@ CLASS anc net/minecraft/entity/passive/HorseEntity METHOD a createChild (Lags;)Lags; METHOD a interactMob (Larb;Lafo;)Z ARG 1 player - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a readCustomDataFromTag (Lhs;)V METHOD b writeCustomDataToTag (Lhs;)V diff --git a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping index d4da372266..6e1a1fb44e 100644 --- a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping +++ b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping @@ -16,6 +16,6 @@ CLASS amh net/minecraft/entity/passive/IronGolemEntity METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V METHOD l getVillageProperties ()Lalq; - METHOD n ()V + METHOD n prepareGoals ()V METHOD s setPlayerCreated (Z)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index a44dc546c5..5c77a3783c 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -11,7 +11,7 @@ CLASS ane net/minecraft/entity/passive/LlamaEntity METHOD a createChild (Lags;)Lags; METHOD a attack (Lahe;F)V ARG 1 target - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a playStepSound (Let;Lbpm;)V ARG 1 pos @@ -30,7 +30,7 @@ CLASS ane net/minecraft/entity/passive/LlamaEntity METHOD ei getVariant ()I METHOD en isFollowing ()Z METHOD eo getFollowing ()Lane; - METHOD n ()V + METHOD n prepareGoals ()V METHOD s setArmsRaised (Z)V METHOD t setVariant (I)V METHOD u setStrength (I)V diff --git a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping index 04e01ac910..3e69356e7d 100644 --- a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping @@ -10,7 +10,7 @@ CLASS amj net/minecraft/entity/passive/OcelotEntity METHOD a createChild (Lags;)Lags; METHOD a interactMob (Larb;Lafo;)Z ARG 1 player - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a canSpawn (Lbbq;Lahh;)Z METHOD a readCustomDataFromTag (Lhs;)V @@ -22,5 +22,5 @@ CLASS amj net/minecraft/entity/passive/OcelotEntity METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; METHOD e getHurtSound (Lage;)Lxm; - METHOD n ()V + METHOD n prepareGoals ()V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index 4a5d7335a7..81e9a67ad4 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -38,10 +38,11 @@ CLASS amk net/minecraft/entity/passive/PandaEntity ARG 2 amount METHOD a createChild (Lags;)Lags; METHOD a setAttacker (Lahe;)V + METHOD a pickupItem (Laoy;)V METHOD a canBeLeashedBy (Larb;)Z METHOD a interactMob (Larb;Lafo;)Z ARG 1 player - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a playStepSound (Let;Lbpm;)V ARG 1 pos @@ -50,5 +51,5 @@ CLASS amk net/minecraft/entity/passive/PandaEntity METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; METHOD e getHurtSound (Lage;)Lxm; - METHOD n ()V + METHOD n prepareGoals ()V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping index bb530aa04d..c1f3af2be3 100644 --- a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping @@ -8,7 +8,7 @@ CLASS aml net/minecraft/entity/passive/ParrotEntity METHOD a createChild (Lags;)Lags; METHOD a interactMob (Larb;Lafo;)Z ARG 1 player - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a canSpawn (Lbbq;Lahh;)Z METHOD a playStepSound (Let;Lbpm;)V @@ -26,6 +26,6 @@ CLASS aml net/minecraft/entity/passive/ParrotEntity METHOD dJ getVariant ()I METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD q setVariant (I)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/PigEntity.mapping b/mappings/net/minecraft/entity/passive/PigEntity.mapping index 57a57dd8a8..fc822aaced 100644 --- a/mappings/net/minecraft/entity/passive/PigEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PigEntity.mapping @@ -16,6 +16,6 @@ CLASS amm net/minecraft/entity/passive/PigEntity METHOD cv getDeathSound ()Lxm; METHOD dz isSaddled ()Z METHOD e getHurtSound (Lage;)Lxm; - METHOD n ()V + METHOD n prepareGoals ()V METHOD s setSaddled (Z)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping b/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping index 9658a7270e..c4d7b6ff79 100644 --- a/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping @@ -11,7 +11,7 @@ CLASS amn net/minecraft/entity/passive/PolarBearEntity METHOD D getAmbientSound ()Lxm; METHOD W_ update ()V METHOD a createChild (Lags;)Lags; - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a canSpawn (Lbbq;Lahh;)Z METHOD a playStepSound (Let;Lbpm;)V @@ -19,5 +19,5 @@ CLASS amn net/minecraft/entity/passive/PolarBearEntity METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; METHOD e getHurtSound (Lage;)Lxm; - METHOD n ()V + METHOD n prepareGoals ()V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping index e013333f84..788b0c4314 100644 --- a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping @@ -16,5 +16,5 @@ CLASS amo net/minecraft/entity/passive/PufferfishEntity METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V METHOD l getFishBucketStack ()Lawo; - METHOD n ()V + METHOD n prepareGoals ()V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index 1c3c6e691c..a71e1276dd 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -23,7 +23,7 @@ CLASS amp net/minecraft/entity/passive/RabbitEntity ARG 1 source ARG 2 amount METHOD a createChild (Lags;)Lags; - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a canSpawn (Lbbq;Lahh;)Z METHOD a readCustomDataFromTag (Lhs;)V @@ -36,7 +36,7 @@ CLASS amp net/minecraft/entity/passive/RabbitEntity METHOD dB getRabbitType ()I METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD o doJump (Z)V METHOD q setRabbitType (I)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index 65ff1591ab..b5ea38532b 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -10,7 +10,7 @@ CLASS amr net/minecraft/entity/passive/SheepEntity ARG 1 player METHOD a getRgbColor (Lavl;)[F ARG 0 dyeColor - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a playStepSound (Let;Lbpm;)V ARG 1 pos @@ -25,6 +25,6 @@ CLASS amr net/minecraft/entity/passive/SheepEntity METHOD dB isSheared ()Z METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD s setSheared (Z)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/SnowmanEntity.mapping b/mappings/net/minecraft/entity/passive/SnowmanEntity.mapping index 3637c6ca35..e6ce335d69 100644 --- a/mappings/net/minecraft/entity/passive/SnowmanEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnowmanEntity.mapping @@ -15,6 +15,6 @@ CLASS amt net/minecraft/entity/passive/SnowmanEntity METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V METHOD l hasPumpkin ()Z - METHOD n ()V + METHOD n prepareGoals ()V METHOD s setArmsRaised (Z)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/SquidEntity.mapping b/mappings/net/minecraft/entity/passive/SquidEntity.mapping index ceb313688c..32308bd936 100644 --- a/mappings/net/minecraft/entity/passive/SquidEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SquidEntity.mapping @@ -17,4 +17,4 @@ CLASS amu net/minecraft/entity/passive/SquidEntity METHOD cv getDeathSound ()Lxm; METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V diff --git a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping index 494f5fa4ca..20f9ec8628 100644 --- a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping @@ -27,6 +27,8 @@ CLASS amv net/minecraft/entity/passive/TropicalFishEntity ARG 0 variety ARG 1 baseColor ARG 2 patternColor + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + ARG 3 difficulty METHOD a readCustomDataFromTag (Lhs;)V METHOD b getToolTipForVariant (I)Ljava/lang/String; ARG 0 variant diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping index 89f190f4f4..5b2917dd99 100644 --- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping @@ -46,7 +46,7 @@ CLASS amw net/minecraft/entity/passive/TurtleEntity METHOD a createChild (Lags;)Lags; METHOD a onStruckByLightning (Laov;)V METHOD a canBeLeashedBy (Larb;)Z - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a canSpawn (Lbbq;Lahh;)Z METHOD a playStepSound (Let;Lbpm;)V @@ -65,6 +65,6 @@ CLASS amw net/minecraft/entity/passive/TurtleEntity METHOD g setHomePos (Let;)V METHOD h setTravelPos (Let;)V METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD s setHasEgg (Z)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 316ade3d5c..6762343c85 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -1,30 +1,45 @@ CLASS aqr net/minecraft/entity/passive/VillagerEntity - FIELD bD VILLAGER_TYPE Lpr; - FIELD bH properties Lalq; + FIELD bD VILLAGER_DATA Lpr; + FIELD bE findVillageCountdown I + FIELD bF inMating Z + FIELD bG staring Z + FIELD bH village Lalq; + FIELD bI currentCustomer Larb; FIELD bJ recipeList Lbav; + FIELD bK unlockTradeCountdown I + FIELD bL unlockTrade Z + FIELD bM willingToMate Z + FIELD bN customerName Ljava/lang/String; + FIELD bO recentlyRescued Z + FIELD bP goalsSet Z FIELD bQ inventory Lafx; METHOD (Lbbp;Laqw;)V ARG 1 world METHOD D getAmbientSound ()Lxm; METHOD I mobTick ()V + METHOD O_ getVillage ()Lalq; METHOD P_ getCurrentCustomer ()Larb; METHOD Q getDisplayName ()Ljd; + METHOD Q_ getRaid ()Lasf; METHOD a onDeath (Lage;)V METHOD a createChild (Lags;)Lags; METHOD a setAttacker (Lahe;)V METHOD a onStruckByLightning (Laov;)V - METHOD a setVillagerType (Laqs;)V + METHOD a pickupItem (Laoy;)V + METHOD a setVillagerData (Laqs;)V METHOD a canBeLeashedBy (Larb;)Z METHOD a interactMob (Larb;Lafo;)Z ARG 1 player + METHOD a canPickUp (Lawj;)Z METHOD a onSellingItem (Lawo;)V METHOD a useRecipe (Lbau;)V - METHOD a setRecipeList (Lbav;)V - METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; + METHOD a setServerRecipes (Lbav;)V + METHOD a prepareEntityData (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a readCustomDataFromTag (Lhs;)V METHOD a_ setCurrentCustomer (Larb;)V METHOD b createChild (Lags;)Laqr; + METHOD b setRecipes (Lbav;)V METHOD b writeCustomDataToTag (Lhs;)V METHOD bG getEyeHeight ()F METHOD c getRecipes ()Lbav; @@ -33,9 +48,25 @@ CLASS aqr net/minecraft/entity/passive/VillagerEntity METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; METHOD d getVillagerWorld ()Lbbp; + METHOD d hasEnoughFood (I)Z + METHOD dA isStaring ()Z + METHOD dB isTrading ()Z + METHOD dC setRecentlyRescued ()V METHOD dD getInventory ()Lafx; - METHOD dM ()Laqs; + METHOD dE hasFoodForWilling ()Z + METHOD dG canBreed ()Z + METHOD dH hasSeed ()Z + METHOD dI setSpecificGoals ()V + METHOD dJ levelUp ()V + METHOD dK addTrades ()V + METHOD dM getVillagerData ()Laqs; + METHOD dz isInMating ()Z METHOD e getVillagerPos ()Let; METHOD e getHurtSound (Lage;)Lxm; - METHOD n ()V + METHOD n prepareGoals ()V + METHOD s setInMating (Z)V + METHOD t setStaring (Z)V + METHOD u isWillingToMate (Z)Z + ARG 1 update + METHOD v setWillingToMate (Z)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/VillagerProfession.mapping b/mappings/net/minecraft/entity/passive/VillagerProfession.mapping deleted file mode 100644 index 5593db8764..0000000000 --- a/mappings/net/minecraft/entity/passive/VillagerProfession.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS aqu net/minecraft/entity/passive/VillagerProfession - METHOD a register (Ljava/lang/String;)Laqu; - ARG 0 id diff --git a/mappings/net/minecraft/entity/passive/VillagerType.mapping b/mappings/net/minecraft/entity/passive/VillagerType.mapping deleted file mode 100644 index da76baca4f..0000000000 --- a/mappings/net/minecraft/entity/passive/VillagerType.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS aqw net/minecraft/entity/passive/VillagerType - FIELD h BIOME_MAP Ljava/util/Map; - METHOD a forBiome (Lbco;)Laqw; - ARG 0 biome - METHOD a register (Ljava/lang/String;)Laqw; - ARG 0 id diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 4d0b5353ef..efead01751 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -29,7 +29,7 @@ CLASS amy net/minecraft/entity/passive/WolfEntity METHOD e getHurtSound (Lage;)Lxm; METHOD f setTarget (Lahe;)V METHOD k updateMovement ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD t setTamed (Z)V METHOD v setAngry (Z)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 49c34400b5..bb39132a2a 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -90,6 +90,7 @@ CLASS arb net/minecraft/entity/player/PlayerEntity ARG 1 recipes METHOD a addChatMessage (Ljd;Z)V ARG 1 message + METHOD a increaseStat (Lqc;)V METHOD a playSoundAtEntity (Lxm;FF)V ARG 1 sound ARG 2 volume diff --git a/mappings/net/minecraft/entity/raid/Raid.mapping b/mappings/net/minecraft/entity/raid/Raid.mapping index cf3468743c..96fdc1de8e 100644 --- a/mappings/net/minecraft/entity/raid/Raid.mapping +++ b/mappings/net/minecraft/entity/raid/Raid.mapping @@ -5,8 +5,13 @@ CLASS asf net/minecraft/entity/raid/Raid FIELD c PILLAGER Lasf$a; FIELD d WITCH Lasf$a; FIELD e ILLAGER_BEAST Lasf$a; + FIELD g type Lagz; + FIELD h firstWave I FIELD a ILLAGER_BANNER Lawo; + FIELD b waveToLeader Ljava/util/Map; + FIELD c waveToRaiders Ljava/util/Map; FIELD d ticksActive J + FIELD e center Let; FIELD f world Lbbp; FIELD g markedForRemoval Z FIELD h villageProperties Lalq; @@ -16,24 +21,72 @@ CLASS asf net/minecraft/entity/raid/Raid FIELD l totalHealth F FIELD m badOmenLevel I FIELD n active Z - FIELD o groupsSpawned I + FIELD o wavesSpawned I + FIELD p bar Luo; FIELD q postRaidTicks I FIELD r preRaidTicks I + FIELD s volume Lclz; FIELD t random Ljava/util/Random; METHOD (ILbbp;Lalq;)V ARG 1 id ARG 2 world - METHOD a setVillageProperties (Lalq;)V + ARG 3 village + METHOD a setRaidLeader (ILasg;)V + ARG 1 wave + METHOD a addRaider (ILasg;Let;Z)V + ARG 1 wave + ARG 2 raider + ARG 3 pos + ARG 4 existing + ARG 5 spawned + METHOD a addToWave (ILasg;Z)Z + ARG 1 wave + ARG 3 countHealth + METHOD a setVillage (Lalq;)V + METHOD a start (Larb;)V + METHOD a getSpawnCount (Lasf$a;Ljava/util/Random;I)I + ARG 2 wave + METHOD a removeFromWave (Lasg;Z)V + ARG 2 countHealth METHOD a setWorld (Lbbp;)V + METHOD a getPillagerSpawnLocation (Lbbp;I)Let; + METHOD a playRaidHorn (Let;)V METHOD a fromTag (Lhs;)V + METHOD a getBadOmenLevel (Ljava/util/Random;Z)I + ARG 1 centerSet + METHOD b getLeader (I)Lasg; + METHOD b addToWave (ILasg;)Z + ARG 1 wave + METHOD b getBonusSpawnCount (Lasf$a;Ljava/util/Random;I)I + ARG 2 wave + METHOD b spawnNextWave (Let;)V + ARG 2 spawnedLeader + ARG 3 nextWave METHOD b toTag (Lhs;)Lhs; METHOD c getWorld ()Lbbp; + METHOD c removeLeader (I)V + ARG 1 wave + METHOD d isOnGoing ()Z + METHOD e getVolume ()Lclz; METHOD f hasStarted ()Z METHOD g getGroupsSpawned ()I + METHOD h getMaxAcceptableBadOmenLevel ()I METHOD i getBadOmenLevel ()I + METHOD j invalidate ()V METHOD k isMarkedForRemoval ()Z - METHOD o getVillageProperties ()Lalq; - METHOD q getId ()I + METHOD l tick ()V + METHOD m getCurrentRaiderHealth ()F + METHOD n getRaiderCount ()I + METHOD o getVillage ()Lalq; + METHOD p getCenter ()Let; + METHOD q getRaidId ()I METHOD r isActive ()Z + METHOD s isInRaidDistance ()Ljava/util/function/Predicate; + METHOD t updateBarToPlayers ()V + METHOD u hasSpawnedAllGroups ()Z + METHOD v removeObsoleteRaiders ()V + ARG 2 toRemove + METHOD w updateBar ()V + METHOD x canSpawnRaiders ()Z METHOD y markDirty ()V METHOD z getIllagerBanner ()Lawo; diff --git a/mappings/net/minecraft/entity/raid/RaidManager.mapping b/mappings/net/minecraft/entity/raid/RaidManager.mapping index 7669b43df7..4b26dc408e 100644 --- a/mappings/net/minecraft/entity/raid/RaidManager.mapping +++ b/mappings/net/minecraft/entity/raid/RaidManager.mapping @@ -1,13 +1,22 @@ CLASS ash net/minecraft/entity/raid/RaidManager FIELD a raids Ljava/util/Map; + FIELD b playerTimestamp Ljava/util/Map; FIELD c world Lbbp; FIELD d nextAvailableId I - FIELD e tick I + FIELD e currentTime I METHOD a tick ()V METHOD a getRaid (I)Lasf; - ARG 1 id + METHOD a checkRaid (Lalq;)V + METHOD a isLivingAroundVillage (Lalq;Lahe;)Z + METHOD a startRaid (Lalq;Larb;)Lasf; + METHOD a addTimestamp (Larb;)V + METHOD a isValidRaiderFor (Lasg;Lasf;)Z METHOD a setWorld (Lbbp;)V METHOD a getOrCreateRaid (Lbbp;Lalq;)Lasf; + METHOD a nameFor (Lbsf;)Ljava/lang/String; METHOD a fromTag (Lhs;)V + METHOD b isPeaceful ()Z + METHOD b canStartRaid (Lalq;Larb;)Z + METHOD b removeTimestamp (Larb;)V METHOD b toTag (Lhs;)Lhs; METHOD c nextId ()I diff --git a/mappings/net/minecraft/entity/raid/RaidVictim.mapping b/mappings/net/minecraft/entity/raid/RaidVictim.mapping new file mode 100644 index 0000000000..b5311edac1 --- /dev/null +++ b/mappings/net/minecraft/entity/raid/RaidVictim.mapping @@ -0,0 +1,3 @@ +CLASS aho net/minecraft/entity/raid/RaidVictim + METHOD O_ getVillage ()Lalq; + METHOD Q_ getRaid ()Lasf; diff --git a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping index ea8821a895..390335eeba 100644 --- a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping +++ b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping @@ -1,23 +1,32 @@ CLASS asg net/minecraft/entity/raid/RaiderEntity - CLASS asg$a + CLASS asg$a PickupBannerAsLeaderGoal METHOD a canStart ()Z METHOD e tick ()V + FIELD a OBTAINABLE_ILLAGER_BANNER_ITEM Ljava/util/function/Predicate; FIELD bD hasRaidGoal Z + FIELD bE outOfRaidCounter I FIELD b wave I FIELD c raid Lasf; METHOD (Lagz;Lbbp;)V ARG 1 type METHOD G cannotDespawn ()Z METHOD a onDeath (Lage;)V + METHOD a pickupItem (Laoy;)V METHOD a setRaid (Lasf;)V METHOD a readCustomDataFromTag (Lhs;)V METHOD b setWave (I)V METHOD b writeCustomDataToTag (Lhs;)V METHOD c canImmediatelyDespawn (D)Z ARG 1 distanceSquared + METHOD d setOutOfRaidCounter (I)V + METHOD d addBonusForWave (IZ)V + METHOD dH hasNoRaid ()Z METHOD dM hasRaidGoal ()Z METHOD dN getRaid ()Lasf; + METHOD dO hasActiveRaid ()Z METHOD dP getWave ()I + METHOD dQ getOutOfRaidCounter ()I METHOD k updateMovement ()V - METHOD n ()V + METHOD l getOnGoingRaid ()Lasf; + METHOD n prepareGoals ()V METHOD u setHasRaidGoal (Z)V diff --git a/mappings/net/minecraft/inventory/BasicInventory.mapping b/mappings/net/minecraft/inventory/BasicInventory.mapping index 2230a615f7..65cb2295f8 100644 --- a/mappings/net/minecraft/inventory/BasicInventory.mapping +++ b/mappings/net/minecraft/inventory/BasicInventory.mapping @@ -14,6 +14,7 @@ CLASS afx net/minecraft/inventory/BasicInventory ARG 1 slot METHOD a addListener (Lafk;)V METHOD a canPlayerUseInv (Larb;)Z + METHOD a add (Lawo;)Lawo; METHOD a provideRecipeInputs (Lard;)V METHOD a setCustomName (Ljd;)V METHOD b removeInvStack (I)Lawo; diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index f26272c243..381774bf92 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -1,5 +1,10 @@ CLASS chy net/minecraft/item/map/MapState + CLASS chy$a + FIELD a xCenter I + FIELD b zCenter I + FIELD c dimension Lbsg; FIELD d showIcons Z + FIELD e unlimitedTracking Z FIELD f scale B FIELD g colorArray [B FIELD i icons Ljava/util/Map; diff --git a/mappings/net/minecraft/resource/metadata/PackResourceMetadataReader.mapping b/mappings/net/minecraft/resource/metadata/PackResourceMetadataReader.mapping index e629cb7643..6242afce79 100644 --- a/mappings/net/minecraft/resource/metadata/PackResourceMetadataReader.mapping +++ b/mappings/net/minecraft/resource/metadata/PackResourceMetadataReader.mapping @@ -1,4 +1,4 @@ CLASS vv net/minecraft/resource/metadata/PackResourceMetadataReader METHOD a getKey ()Ljava/lang/String; - METHOD a read (Lcom/google/gson/JsonObject;)Ljava/lang/Object; - METHOD b read (Lcom/google/gson/JsonObject;)Lvu; + METHOD a fromJson (Lcom/google/gson/JsonObject;)Ljava/lang/Object; + METHOD b fromJson (Lcom/google/gson/JsonObject;)Lvu; diff --git a/mappings/net/minecraft/resource/metadata/ResourceMetadataReader.mapping b/mappings/net/minecraft/resource/metadata/ResourceMetadataReader.mapping index 0546ed8f5b..e9e5f3ee18 100644 --- a/mappings/net/minecraft/resource/metadata/ResourceMetadataReader.mapping +++ b/mappings/net/minecraft/resource/metadata/ResourceMetadataReader.mapping @@ -1,3 +1,3 @@ CLASS vt net/minecraft/resource/metadata/ResourceMetadataReader METHOD a getKey ()Ljava/lang/String; - METHOD a read (Lcom/google/gson/JsonObject;)Ljava/lang/Object; + METHOD a fromJson (Lcom/google/gson/JsonObject;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 46f4d6ead3..67269e16c3 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -84,7 +84,7 @@ CLASS us net/minecraft/server/network/ServerPlayerEntity METHOD f attack (Lagv;)V METHOD g createCooldownManager ()Lawk; METHOD m closeContainer ()V - METHOD n ()V + METHOD n prepareGoals ()V METHOD s getServerWorld ()Luq; METHOD t isSpectator ()Z METHOD u isCreative ()Z diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index e3159d6619..5c1a31003b 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -13,6 +13,7 @@ CLASS uq net/minecraft/server/world/ServerWorld METHOD G getBlockTickScheduler ()Lbcg; METHOD a setTime (J)V METHOD a spawnEntity (Lagv;)Z + METHOD a summonParticle (Lagv;B)V METHOD a createExplosion (Lagv;Lage;DDDFZZ)Lbbi; ARG 1 entity ARG 3 x @@ -26,6 +27,7 @@ CLASS uq net/minecraft/server/world/ServerWorld ARG 1 pos ARG 2 block ARG 3 first + METHOD a locateStructure (Ljava/lang/String;Let;IZ)Let; METHOD a getEntityByUuid (Ljava/util/UUID;)Lagv; METHOD a tick (Ljava/util/function/BooleanSupplier;)V METHOD a loadEntities (Ljava/util/stream/Stream;)V diff --git a/mappings/net/minecraft/sortme/SpawnHelper.mapping b/mappings/net/minecraft/sortme/SpawnHelper.mapping new file mode 100644 index 0000000000..12249f2927 --- /dev/null +++ b/mappings/net/minecraft/sortme/SpawnHelper.mapping @@ -0,0 +1,4 @@ +CLASS bcb net/minecraft/sortme/SpawnHelper + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a canSpawn (Lahq$b;Lbbt;Let;Lagz;)Z + METHOD a isClearForSpawn (Lbbb;Let;Lbpm;Lcfd;)Z diff --git a/mappings/net/minecraft/sortme/SpawnRestriction.mapping b/mappings/net/minecraft/sortme/SpawnRestriction.mapping new file mode 100644 index 0000000000..3bd34e7489 --- /dev/null +++ b/mappings/net/minecraft/sortme/SpawnRestriction.mapping @@ -0,0 +1,12 @@ +CLASS ahq net/minecraft/sortme/SpawnRestriction + CLASS ahq$a Entry + FIELD a heightMapType Lbst$a; + FIELD b location Lahq$b; + FIELD c blockTag Lye; + CLASS ahq$b Location + FIELD a mapping Ljava/util/Map; + METHOD a getLocation (Lagz;)Lahq$b; + METHOD a register (Lagz;Lahq$b;Lbst$a;)V + METHOD a register (Lagz;Lahq$b;Lbst$a;Lye;)V + METHOD a canSpawn (Lagz;Lbpm;)Z + METHOD b getHeightMapType (Lagz;)Lbst$a; diff --git a/mappings/net/minecraft/village/SimpleVillager.mapping b/mappings/net/minecraft/village/SimpleVillager.mapping index 3c32a24a65..e3daa6e507 100644 --- a/mappings/net/minecraft/village/SimpleVillager.mapping +++ b/mappings/net/minecraft/village/SimpleVillager.mapping @@ -9,7 +9,7 @@ CLASS aqp net/minecraft/village/SimpleVillager METHOD Q getDisplayName ()Ljd; METHOD a onSellingItem (Lawo;)V METHOD a useRecipe (Lbau;)V - METHOD a setRecipeList (Lbav;)V + METHOD a setServerRecipes (Lbav;)V METHOD a_ setCurrentCustomer (Larb;)V METHOD c getRecipes ()Lbav; METHOD d getVillagerWorld ()Lbbp; diff --git a/mappings/net/minecraft/village/VillageProperties.mapping b/mappings/net/minecraft/village/VillageProperties.mapping index fb4b787044..9fc150d22b 100644 --- a/mappings/net/minecraft/village/VillageProperties.mapping +++ b/mappings/net/minecraft/village/VillageProperties.mapping @@ -11,7 +11,8 @@ CLASS alq net/minecraft/village/VillageProperties FIELD g tick I FIELD h populationSize I FIELD i lastVillagerDeath I - FIELD k players Ljava/util/Map; + FIELD j raidId I + FIELD k playerRatings Ljava/util/Map; FIELD l attackerInfos Ljava/util/List; FIELD m golems I METHOD a getCenter ()Let; @@ -20,21 +21,34 @@ CLASS alq net/minecraft/village/VillageProperties METHOD a addDoor (Lalp;)V METHOD a setWorld (Lbbp;)V METHOD a isInRadius (Let;)Z + METHOD a isInRaidDistance (Let;I)Z + ARG 2 raidBonus METHOD a deserialize (Lhs;)V + METHOD a getRating (Ljava/lang/String;)I + ARG 1 username + METHOD a changeRating (Ljava/lang/String;I)I + ARG 1 username + ARG 2 rating METHOD b getRadius ()I + METHOD b changeAllRatings (I)V METHOD b getNearestAttacker (Lahe;)Lahe; METHOD b getClosestDoor (Let;)Lalp; METHOD b serialize (Lhs;)V METHOD c getDoorCount ()I - METHOD c getNearestPlayer (Lahe;)Larb; + METHOD c setRaidId (I)V + METHOD c getNearestUnpopularPlayer (Lahe;)Larb; METHOD c getNearestDoor (Let;)Lalp; METHOD d getStableTicks ()I + METHOD d isUnpopular (Ljava/lang/String;)Z METHOD e getPopulationSize ()I METHOD e getDoorAtPosition (Let;)Lalp; METHOD f getDoors ()Ljava/util/List; METHOD g hasNoDoors ()Z METHOD g isValidDoor (Let;)Z METHOD h onVillagerDeath ()V + METHOD i hasRecentDeath ()Z + METHOD j getRaidId ()I + METHOD k getRaid ()Lasf; METHOD l countGolems ()V METHOD m countVillagers ()V METHOD n clearOutdatedAttackerInfo ()V diff --git a/mappings/net/minecraft/village/Villager.mapping b/mappings/net/minecraft/village/Villager.mapping index 07d20b0dd0..86e6a07eee 100644 --- a/mappings/net/minecraft/village/Villager.mapping +++ b/mappings/net/minecraft/village/Villager.mapping @@ -3,7 +3,7 @@ CLASS bat net/minecraft/village/Villager METHOD Q getDisplayName ()Ljd; METHOD a onSellingItem (Lawo;)V METHOD a useRecipe (Lbau;)V - METHOD a setRecipeList (Lbav;)V + METHOD a setServerRecipes (Lbav;)V METHOD a_ setCurrentCustomer (Larb;)V METHOD c getRecipes ()Lbav; METHOD d getVillagerWorld ()Lbbp; diff --git a/mappings/net/minecraft/village/VillagerData.mapping b/mappings/net/minecraft/village/VillagerData.mapping new file mode 100644 index 0000000000..98c09aafce --- /dev/null +++ b/mappings/net/minecraft/village/VillagerData.mapping @@ -0,0 +1,11 @@ +CLASS aqs net/minecraft/village/VillagerData + FIELD a type Laqw; + FIELD b profession Laqu; + FIELD c level I + METHOD a getType ()Laqw; + METHOD a withLevel (I)Laqs; + METHOD a withProfession (Laqu;)Laqs; + METHOD a withType (Laqw;)Laqs; + METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Ljava/lang/Object; + METHOD b getProfession ()Laqu; + METHOD c getLevel ()I diff --git a/mappings/net/minecraft/village/VillagerDataContainer.mapping b/mappings/net/minecraft/village/VillagerDataContainer.mapping new file mode 100644 index 0000000000..e690899f99 --- /dev/null +++ b/mappings/net/minecraft/village/VillagerDataContainer.mapping @@ -0,0 +1,2 @@ +CLASS aqt net/minecraft/village/VillagerDataContainer + METHOD dM getVillagerData ()Laqs; diff --git a/mappings/net/minecraft/village/VillagerProfession.mapping b/mappings/net/minecraft/village/VillagerProfession.mapping new file mode 100644 index 0000000000..9564e46b4a --- /dev/null +++ b/mappings/net/minecraft/village/VillagerProfession.mapping @@ -0,0 +1,3 @@ +CLASS aqu net/minecraft/village/VillagerProfession + METHOD a register (Ljava/lang/String;)Laqu; + ARG 0 id diff --git a/mappings/net/minecraft/village/VillagerTrades.mapping b/mappings/net/minecraft/village/VillagerTrades.mapping new file mode 100644 index 0000000000..64c7acda83 --- /dev/null +++ b/mappings/net/minecraft/village/VillagerTrades.mapping @@ -0,0 +1,34 @@ +CLASS aqv net/minecraft/village/VillagerTrades + CLASS aqv$a BuyItemFactory + FIELD a bought Lawj; + FIELD b range Laqv$g; + METHOD a create (Lbat;Ljava/util/Random;)Lbau; + CLASS aqv$b EnchantBookFactory + METHOD a create (Lbat;Ljava/util/Random;)Lbau; + CLASS aqv$c SellEnchantedToolFactory + FIELD a sold Lawo; + FIELD b range Laqv$g; + METHOD a create (Lbat;Ljava/util/Random;)Lbau; + CLASS aqv$d ProcessBoughtFactory + FIELD a bought Lawo; + FIELD b boughtRange Laqv$g; + FIELD c result Lawo; + FIELD d resultRange Laqv$g; + METHOD a create (Lbat;Ljava/util/Random;)Lbau; + CLASS aqv$e BuyOrSellOnPriceFactory + FIELD a item Lawo; + FIELD b range Laqv$g; + METHOD a create (Lbat;Ljava/util/Random;)Lbau; + CLASS aqv$f Factory + METHOD a create (Lbat;Ljava/util/Random;)Lbau; + CLASS aqv$g PriceRange + FIELD a lower I + FIELD b range I + METHOD a getPrice (Ljava/util/Random;)I + CLASS aqv$h SellMapFactory + FIELD a range Laqv$g; + FIELD b structure Ljava/lang/String; + METHOD a create (Lbat;Ljava/util/Random;)Lbau; + FIELD a PROFESSION_TO_LEVELED_TRADE Ljava/util/Map; + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a copyToFastUtilMap (Lcom/google/common/collect/ImmutableMap;)Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; diff --git a/mappings/net/minecraft/village/VillagerType.mapping b/mappings/net/minecraft/village/VillagerType.mapping new file mode 100644 index 0000000000..a117497272 --- /dev/null +++ b/mappings/net/minecraft/village/VillagerType.mapping @@ -0,0 +1,6 @@ +CLASS aqw net/minecraft/village/VillagerType + FIELD h biomeToType Ljava/util/Map; + METHOD a forBiome (Lbco;)Laqw; + ARG 0 biome + METHOD a create (Ljava/lang/String;)Laqw; + ARG 0 id diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 40f10889a8..f18acc6331 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -92,6 +92,7 @@ CLASS bbp net/minecraft/world/World ARG 2 pos METHOD a setTime (J)V METHOD a spawnEntity (Lagv;)Z + METHOD a summonParticle (Lagv;B)V METHOD a (Lagv;DD)Larb; ARG 1 entity METHOD a createExplosion (Lagv;DDDFZ)Lbbi; @@ -200,6 +201,7 @@ CLASS bbp net/minecraft/world/World METHOD a getEntities (Ljava/lang/Class;Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 entityClass METHOD a getPlayerByName (Ljava/lang/String;)Larb; + METHOD a locateStructure (Ljava/lang/String;Let;IZ)Let; METHOD a addBlockEntities (Ljava/util/Collection;)V METHOD a getEntityByUuid (Ljava/util/UUID;)Lagv; METHOD a tick (Ljava/util/function/BooleanSupplier;)V