Skip to content

Commit

Permalink
start working on 100%ing entities
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Mar 26, 2024
1 parent 84a64b5 commit 01c1927
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 8 deletions.
17 changes: 15 additions & 2 deletions mappings/net/minecraft/entity/LivingEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,10 +326,11 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
COMMENT Gets the amount of health this entity has in half-hearts.
COMMENT
COMMENT @return the amount of health of this entity
METHOD m_kobcxaqs getJumpStrength ()F
METHOD m_ktkvypgf enterCombat ()V
METHOD m_kwjgylty swimUpward (Lnet/minecraft/unmapped/C_ednuhnnn;)V
ARG 1 tag
METHOD m_kzhoqled (Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_sddaxwyk;)V
METHOD m_kzhoqled equipStack (Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_sddaxwyk;)V
ARG 1 slot
METHOD m_lagxpcmk onStatusEffectRemoved (Lnet/minecraft/unmapped/C_wpfizwve;)V
ARG 1 effect
Expand Down Expand Up @@ -367,6 +368,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
COMMENT
COMMENT <p>This checks both the entity's main and off hand.
ARG 1 predicate
METHOD m_msbyrsaa getAllArmorItems ()Ljava/lang/Iterable;
METHOD m_mzepiaxw getControlledMovementInput (Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_vgpupfxx;
COMMENT Returns the movement input when this entity is controlled by a player.
COMMENT
Expand Down Expand Up @@ -426,11 +428,14 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
METHOD m_pwoagvwv getArmorInSlot (Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 slot
METHOD m_qhbjdevp getMaxRelativeHeadRotation ()F
METHOD m_qjxxiksy getHandItems ()Ljava/lang/Iterable;
METHOD m_qlumoklh onDismounted (Lnet/minecraft/unmapped/C_astfners;)V
ARG 1 vehicle
METHOD m_qlwogvxq spawnItemParticles (Lnet/minecraft/unmapped/C_sddaxwyk;I)V
ARG 1 stack
ARG 2 count
METHOD m_qmfzkten getJumpStrength (F)F
ARG 1 multiplier
METHOD m_qrjyiaeu getScaleFactor ()F
METHOD m_qsbhsxhz isAffectedBySplashPotions ()Z
METHOD m_qsfhmwnj getAttributeBaseValue (Lnet/minecraft/unmapped/C_cjzoxshv;)D
Expand Down Expand Up @@ -576,7 +581,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
METHOD m_wsbfbafs getAbsorptionAmount ()F
METHOD m_wslmhwgl getAttacker ()Lnet/minecraft/unmapped/C_usxaxydn;
METHOD m_wunuznfv isInCreativeMode ()Z
METHOD m_xcvctlld (Lnet/minecraft/unmapped/C_yuycoehb;)Z
METHOD m_xcvctlld canUseSlot (Lnet/minecraft/unmapped/C_yuycoehb;)Z
ARG 1 slot
METHOD m_xgwxqkgb swingHand (Lnet/minecraft/unmapped/C_laxmzoqs;)V
ARG 1 hand
Expand All @@ -585,11 +590,16 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
METHOD m_xotweprj indicateDamage (DD)V
ARG 1 x
ARG 3 z
METHOD m_xqeoerfz getArmorItems ()Ljava/lang/Iterable;
METHOD m_xuirzakp getEquippedStack (Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 slot
METHOD m_xusebikf wouldNotSuffocateInPose (Lnet/minecraft/unmapped/C_ufdjspmk;)Z
ARG 1 pose
METHOD m_xuxedegf isBaby ()Z
METHOD m_xvjkmxro getEquippedItems ()Ljava/lang/Iterable;
COMMENT Gets all equipped items on this entity, including all armor and items in hand.
COMMENT @see #getAllArmorItems
COMMENT @see #getHandItems
METHOD m_xvjtogym setAbsorptionAmountInternal (F)V
ARG 1 absorptionAmount
METHOD m_xzvpzpbu removeStatusEffect (Lnet/minecraft/unmapped/C_cjzoxshv;)Z
Expand Down Expand Up @@ -637,6 +647,9 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
METHOD m_zgpfruit getAttributeInstance (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_lzukavpx;
ARG 1 attribute
METHOD m_zhwrgbmx getPoses ()Lcom/google/common/collect/ImmutableList;
METHOD m_zjpztqou lerpHeadYaw (ID)V
ARG 1 headTrackingIncrements
ARG 2 serverHeadYaw
METHOD m_zrgxyjwv hasStatusEffect (Lnet/minecraft/unmapped/C_cjzoxshv;)Z
ARG 1 effect
METHOD m_ztpokzjz getDamageTiltStrength ()F
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ CLASS net/minecraft/unmapped/C_lzukavpx net/minecraft/entity/attribute/EntityAtt
ARG 1 uuid
METHOD m_gbtcpwti hasModifier (Lnet/minecraft/unmapped/C_hdbqsqsm;)Z
ARG 1 modifier
METHOD m_gktfmzhg addIfAbsent (Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;)Ljava/util/Map;
METHOD m_gtfjwrju readNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)V
ARG 1 nbt
METHOD m_hzjnirrj getModifiers ()Ljava/util/Set;
Expand All @@ -30,6 +31,7 @@ CLASS net/minecraft/unmapped/C_lzukavpx net/minecraft/entity/attribute/EntityAtt
ARG 1 modifier
METHOD m_mgkvtsyq clearModifiers ()V
METHOD m_mrmrewks updateModifier (Lnet/minecraft/unmapped/C_hdbqsqsm;)V
ARG 1 modifier
METHOD m_mxlwhbkp getAttribute ()Lnet/minecraft/unmapped/C_cjzoxshv;
METHOD m_oczhaipt computeValue ()D
COMMENT Computes this attribute's value, taking modifiers into account.
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/boss/BossBarManager.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ CLASS net/minecraft/unmapped/C_xtwgkoiw net/minecraft/entity/boss/BossBarManager
ARG 1 player
METHOD m_orrnpvup readNbt (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V
ARG 1 nbt
ARG 2 lookupProvider
METHOD m_sdqhvakq add (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_rdaqiwdt;)Lnet/minecraft/unmapped/C_izahjvwf;
ARG 1 id
ARG 2 displayName
METHOD m_tlvnkkxf remove (Lnet/minecraft/unmapped/C_izahjvwf;)V
ARG 1 bossBar
METHOD m_yslgusfr toNbt (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hhlwcnih;
ARG 1 lookupProvider
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/boss/CommandBossBar.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ CLASS net/minecraft/unmapped/C_izahjvwf net/minecraft/entity/boss/CommandBossBar
METHOD m_qkafyrxa (Lnet/minecraft/unmapped/C_cpwnhism;)Lnet/minecraft/unmapped/C_cpwnhism;
ARG 1 style
METHOD m_qnxyeypi toNbt (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hhlwcnih;
ARG 1 lookupProvider
METHOD m_sayczpmf fromNbt (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_izahjvwf;
ARG 0 nbt
ARG 1 id
ARG 2 lookupProvider
METHOD m_shcbnoqq getMaxValue ()I
METHOD m_sjepyxhx getValue ()I
METHOD m_udwgbkwv onPlayerConnect (Lnet/minecraft/unmapped/C_mxrobsgg;)V
Expand Down
7 changes: 5 additions & 2 deletions mappings/net/minecraft/entity/damage/DamageTracker.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@ CLASS net/minecraft/unmapped/C_xkhemiqp net/minecraft/entity/damage/DamageTracke
METHOD m_hhqevfbq onDamage (Lnet/minecraft/unmapped/C_sbxfkpyv;F)V
ARG 1 damageSource
ARG 2 originalHealth
METHOD m_lagkuzok (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/unmapped/C_rdaqiwdt;
METHOD m_lagkuzok formatDeathMessage (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/unmapped/C_rdaqiwdt;
ARG 1 entity
ARG 2 displayName
ARG 3 customItemTranslationKey
ARG 4 baseTranslationKey
METHOD m_lwhoscrp getBiggestFall ()Lnet/minecraft/unmapped/C_opjrpnsy;
METHOD m_ufintojk isAttackerLiving (Lnet/minecraft/unmapped/C_sbxfkpyv;)Z
ARG 0 damageSource
METHOD m_xfvrnbnv (Lnet/minecraft/unmapped/C_opjrpnsy;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_rdaqiwdt;
METHOD m_xfvrnbnv getFallingDeathMessage (Lnet/minecraft/unmapped/C_opjrpnsy;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_rdaqiwdt;
ARG 1 damage
METHOD m_xmrbfkiy getDeathMessage ()Lnet/minecraft/unmapped/C_rdaqiwdt;
1 change: 1 addition & 0 deletions mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ CLASS net/minecraft/unmapped/C_fegtripb net/minecraft/entity/data/TrackedDataHan
FIELD f_izuxtjlv FIREWORK_DATA Lnet/minecraft/unmapped/C_xrzqxzbg;
FIELD f_jkldjhwk LONG Lnet/minecraft/unmapped/C_xrzqxzbg;
FIELD f_jymqxprw WOLF_VARIANT Lnet/minecraft/unmapped/C_xrzqxzbg;
FIELD f_kolazbza PARTICLES Lnet/minecraft/unmapped/C_xrzqxzbg;
FIELD f_kpwqpgno TAG_COMPOUND Lnet/minecraft/unmapped/C_xrzqxzbg;
FIELD f_kyenxrse QUATERNIONF Lnet/minecraft/unmapped/C_xrzqxzbg;
FIELD f_mzinrkcd INTEGER Lnet/minecraft/unmapped/C_xrzqxzbg;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ CLASS net/minecraft/unmapped/C_nknvrhfn net/minecraft/entity/decoration/ArmorSta
METHOD m_ldbykolm poseToNbt ()Lnet/minecraft/unmapped/C_hhlwcnih;
METHOD m_lvksyjqf isSlotDisabled (Lnet/minecraft/unmapped/C_yuycoehb;)Z
ARG 1 slot
METHOD m_nendfomc createAttributes ()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus;
METHOD m_npsgczto playBreakSound ()V
METHOD m_pgcyrpjv spawnBreakParticles ()V
METHOD m_phaftboj getLeftLegRotation ()Lnet/minecraft/unmapped/C_eocijcdh;
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/entity/mob/MobEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity
FIELD f_irlmhwzh navigation Lnet/minecraft/unmapped/C_atbvfjwi;
FIELD f_iymvakla LEASH_KEY Ljava/lang/String;
FIELD f_kfwdpftf positionTargetRange F
FIELD f_mhavoyoi bodyArmor Lnet/minecraft/unmapped/C_sddaxwyk;
FIELD f_mxvsbror armorItems Lnet/minecraft/unmapped/C_rnrfftze;
FIELD f_nwzksedo goalSelector Lnet/minecraft/unmapped/C_qospjrjn;
FIELD f_nzzqwalu pathfindingPenalties Ljava/util/Map;
Expand Down Expand Up @@ -62,6 +63,7 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity
ARG 1 pos
METHOD m_erwclnrx setLeftHanded (Z)V
ARG 1 leftHanded
METHOD m_faldjosq getBodyArmor ()Lnet/minecraft/unmapped/C_sddaxwyk;
METHOD m_fgmsyatf canBeLeashedBy (Lnet/minecraft/unmapped/C_jzrpycqo;)Z
ARG 1 player
METHOD m_fisapugx getJumpControl ()Lnet/minecraft/unmapped/C_tmduotiw;
Expand Down Expand Up @@ -125,6 +127,8 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity
METHOD m_mbyporyt createBodyControl ()Lnet/minecraft/unmapped/C_vofymfgv;
METHOD m_mowaxfbl isLeftHanded ()Z
METHOD m_mrbrckqf isDisallowedInPeaceful ()Z
METHOD m_msbyrsaa ()Ljava/lang/Iterable;
COMMENT Gets armor items on this entity, taking into account body armor items.
METHOD m_mufhzdfi isInWalkTargetRange ()Z
METHOD m_mztbwniz movesIndependently ()Z
COMMENT When true, causes this entity to take over pathfinding for its controlling passenger.
Expand Down Expand Up @@ -161,6 +165,7 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity
METHOD m_swfiqufm prefersNewEquipment (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
ARG 1 newStack
ARG 2 oldStack
METHOD m_szhnkfyu canWearBodyArmour ()Z
METHOD m_tjejbxzp canUseRangedWeapon (Lnet/minecraft/unmapped/C_axrfhndl;)Z
ARG 1 weapon
METHOD m_todoiyds clearGoalsAndTasks (Ljava/util/function/Predicate;)V
Expand Down
18 changes: 14 additions & 4 deletions mappings/net/minecraft/text/Text.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,18 +140,28 @@ CLASS net/minecraft/unmapped/C_rdaqiwdt net/minecraft/text/Text
COMMENT the supplied {@code length}.
ARG 1 length
COMMENT the max length allowed for the string representation of the text
CLASS C_iyijrxyu Serializer
COMMENT Represents a JSON serializer for {@link Text}.
CLASS C_iyijrxyu SerializationUtil
FIELD f_avuxccfb GSON Lcom/google/gson/Gson;
METHOD m_avvlujlm fromLenientJson (Ljava/lang/String;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_npqneive;
ARG 0 json
METHOD m_caetnclp fromJsonNullable (Lcom/google/gson/JsonElement;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_npqneive;
METHOD m_eorwnzsk toJson (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/lang/String;
ARG 0 text
METHOD m_fsepqjma (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lcom/google/gson/JsonElement;
METHOD m_fsepqjma toJsonElement (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lcom/google/gson/JsonElement;
ARG 0 text
CLASS C_poyaemhx
ARG 1 lookupProvider
METHOD m_npeyudcr fromJson (Ljava/lang/String;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_npqneive;
METHOD m_rjdnjbxy fromJson (Lcom/google/gson/JsonElement;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_npqneive;
ARG 0 json
ARG 1 lookupProvider
CLASS C_poyaemhx Serializer
COMMENT Represents a JSON serializer for {@link Text}.
FIELD f_utvsiwsp lookupProvider Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;
METHOD deserialize deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
ARG 1 jsonElement
ARG 2 type
ARG 3 context
METHOD serialize serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
ARG 1 text
ARG 2 type
ARG 3 context

3 comments on commit 01c1927

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 01c1927, 198 file(s) were updated with 1942 line(s) added and 1827 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-03-27 00:01:39.996019797 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-03-27 00:00:30.903552711 +0000
@@ -332,7 +332,7 @@
             BlockPos lv = pointer.pos().offset(pointer.state().get(DispenserBlock.FACING));
 
             for (HorseBaseEntity lv2 : pointer.world()
-               .getEntitiesByClass(HorseBaseEntity.class, new Box(lv), entity -> entity.isAlive() && entity.m_szhnkfyu())) {
+               .getEntitiesByClass(HorseBaseEntity.class, new Box(lv), entity -> entity.isAlive() && entity.canWearBodyArmour())) {
                if (lv2.m_rvknxdfs(stack) && !lv2.m_rpistqzo() && lv2.isTame()) {
                   lv2.m_utndsklm(stack.split(1));
                   this.setSuccess(true);
diff -bur namedTargetSrc/net/minecraft/block/entity/BannerBlockEntity.java namedSrc/net/minecraft/block/entity/BannerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BannerBlockEntity.java	2024-03-27 00:01:39.972019635 +0000
+++ namedSrc/net/minecraft/block/entity/BannerBlockEntity.java	2024-03-27 00:00:30.875552514 +0000
@@ -117,7 +117,7 @@
       }
 
       if (this.customName != null) {
-         nbt.putString("CustomName", Text.Serializer.toJson(this.customName, arg2));
+         nbt.putString("CustomName", Text.SerializationUtil.toJson(this.customName, arg2));
       }
    }
 
@@ -128,7 +128,7 @@
    public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
       super.readNbt(nbt, lookupProvider);
       if (nbt.contains("CustomName", NbtElement.STRING_TYPE)) {
-         this.customName = Text.Serializer.m_npeyudcr(nbt.getString("CustomName"), lookupProvider);
+         this.customName = Text.SerializationUtil.fromJson(nbt.getString("CustomName"), lookupProvider);
       }
 
       if (nbt.contains("patterns")) {
diff -bur namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-03-27 00:01:39.968019609 +0000
+++ namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-03-27 00:00:30.871552486 +0000
@@ -446,7 +446,7 @@
       this.primary = readStatusEffect(nbt, "primary_effect");
       this.secondary = readStatusEffect(nbt, "secondary_effect");
       if (nbt.contains("CustomName", NbtElement.STRING_TYPE)) {
-         this.customName = Text.Serializer.m_npeyudcr(nbt.getString("CustomName"), lookupProvider);
+         this.customName = Text.SerializationUtil.fromJson(nbt.getString("CustomName"), lookupProvider);
       }
 
       this.lock = ContainerLock.fromNbt(nbt);
@@ -462,7 +462,7 @@
       writeStatusEffect(nbt, "secondary_effect", this.secondary);
       nbt.putInt("Levels", this.level);
       if (this.customName != null) {
-         nbt.putString("CustomName", Text.Serializer.toJson(this.customName, arg2));
+         nbt.putString("CustomName", Text.SerializationUtil.toJson(this.customName, arg2));
       }
 
       this.lock.writeNbt(nbt);
diff -bur namedTargetSrc/net/minecraft/block/entity/EnchantingTableBlockEntity.java namedSrc/net/minecraft/block/entity/EnchantingTableBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/EnchantingTableBlockEntity.java	2024-03-27 00:01:39.992019771 +0000
+++ namedSrc/net/minecraft/block/entity/EnchantingTableBlockEntity.java	2024-03-27 00:00:30.899552683 +0000
@@ -97,7 +97,7 @@
    protected void writeNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
       super.writeNbt(nbt, arg2);
       if (this.hasCustomName()) {
-         nbt.putString("CustomName", Text.Serializer.toJson(this.customName, arg2));
+         nbt.putString("CustomName", Text.SerializationUtil.toJson(this.customName, arg2));
       }
    }
 
@@ -108,7 +108,7 @@
    public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
       super.readNbt(nbt, lookupProvider);
       if (nbt.contains("CustomName", NbtElement.STRING_TYPE)) {
-         this.customName = Text.Serializer.m_npeyudcr(nbt.getString("CustomName"), lookupProvider);
+         this.customName = Text.SerializationUtil.fromJson(nbt.getString("CustomName"), lookupProvider);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java namedSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java	2024-03-27 00:01:40.056020202 +0000
+++ namedSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java	2024-03-27 00:00:30.951553047 +0000
@@ -56,7 +56,7 @@
       super.readNbt(nbt, lookupProvider);
       this.lock = ContainerLock.fromNbt(nbt);
       if (nbt.contains("CustomName", NbtElement.STRING_TYPE)) {
-         this.customName = Text.Serializer.m_npeyudcr(nbt.getString("CustomName"), lookupProvider);
+         this.customName = Text.SerializationUtil.fromJson(nbt.getString("CustomName"), lookupProvider);
       }
    }
 
@@ -68,7 +68,7 @@
       super.writeNbt(nbt, arg2);
       this.lock.writeNbt(nbt);
       if (this.customName != null) {
-         nbt.putString("CustomName", Text.Serializer.toJson(this.customName, arg2));
+         nbt.putString("CustomName", Text.SerializationUtil.toJson(this.customName, arg2));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/SkullBlockEntity.java namedSrc/net/minecraft/block/entity/SkullBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SkullBlockEntity.java	2024-03-27 00:01:40.128020688 +0000
+++ namedSrc/net/minecraft/block/entity/SkullBlockEntity.java	2024-03-27 00:00:31.035553637 +0000
@@ -178,7 +178,7 @@
       }
 
       if (this.f_vvhynfvk != null) {
-         nbt.putString("custom_name", Text.Serializer.toJson(this.f_vvhynfvk, arg2));
+         nbt.putString("custom_name", Text.SerializationUtil.toJson(this.f_vvhynfvk, arg2));
       }
    }
 
@@ -200,7 +200,7 @@
       }
 
       if (nbt.contains("custom_name", NbtElement.STRING_TYPE)) {
-         this.f_vvhynfvk = Text.Serializer.m_npeyudcr(nbt.getString("custom_name"), lookupProvider);
+         this.f_vvhynfvk = Text.SerializationUtil.fromJson(nbt.getString("custom_name"), lookupProvider);
       } else {
          this.f_vvhynfvk = null;
       }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/HorseScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/HorseScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/HorseScreen.java	2024-03-27 00:01:40.072020311 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/HorseScreen.java	2024-03-27 00:00:30.975553216 +0000
@@ -82,7 +82,7 @@
          graphics.drawGuiTexture(SADDLE_SLOT, k + 7, l + 35 - 18, 18, 18);
       }
 
-      if (this.entity.m_szhnkfyu()) {
+      if (this.entity.canWearBodyArmour()) {
          if (this.entity instanceof LlamaEntity) {
             graphics.drawGuiTexture(LLAMA_ARMOR_SLOT, k + 7, l + 35, 18, 18);
          } else {
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2024-03-27 00:01:40.012019906 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2024-03-27 00:00:30.919552823 +0000
@@ -230,15 +230,15 @@
    private void displayStack(ItemStack stack) {
       if (this.display != null) {
          for (EquipmentSlot lv : EquipmentSlot.values()) {
-            this.display.m_kzhoqled(lv, ItemStack.EMPTY);
+            this.display.equipStack(lv, ItemStack.EMPTY);
          }
 
          if (!stack.isEmpty()) {
             ItemStack lv2 = stack.copy();
             if (stack.getItem() instanceof ArmorItem lv3) {
-               this.display.m_kzhoqled(lv3.getPreferredSlot(), lv2);
+               this.display.equipStack(lv3.getPreferredSlot(), lv2);
             } else {
-               this.display.m_kzhoqled(EquipmentSlot.OFFHAND, lv2);
+               this.display.equipStack(EquipmentSlot.OFFHAND, lv2);
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-03-27 00:01:40.128020688 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-03-27 00:00:31.031553609 +0000
@@ -1568,7 +1568,7 @@
    public void onEntityEquipmentUpdate(EntityEquipmentUpdateS2CPacket packet) {
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
       if (this.world.getEntityById(packet.getId()) instanceof LivingEntity lv2) {
-         packet.getEquipmentList().forEach(slotAndStack -> lv2.m_kzhoqled((EquipmentSlot)slotAndStack.getFirst(), (ItemStack)slotAndStack.getSecond()));
+         packet.getEquipmentList().forEach(slotAndStack -> lv2.equipStack((EquipmentSlot)slotAndStack.getFirst(), (ItemStack)slotAndStack.getSecond()));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/network/OtherClientPlayerEntity.java namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-03-27 00:01:40.144020796 +0000
+++ namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-03-27 00:00:31.051553749 +0000
@@ -80,7 +80,7 @@
       }
 
       if (this.headTrackingIncrements > 0) {
-         this.m_zjpztqou(this.headTrackingIncrements, this.serverHeadYaw);
+         this.lerpHeadYaw(this.headTrackingIncrements, this.serverHeadYaw);
          this.headTrackingIncrements--;
       }
 
diff -bur namedTargetSrc/net/minecraft/client/render/debug/PathfindingDebugRenderer.java namedSrc/net/minecraft/client/render/debug/PathfindingDebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/PathfindingDebugRenderer.java	2024-03-27 00:01:40.088020418 +0000
+++ namedSrc/net/minecraft/client/render/debug/PathfindingDebugRenderer.java	2024-03-27 00:00:30.987553300 +0000
@@ -173,7 +173,7 @@
          }
       }
 
-      Path.C_ekwhyzmc lv3 = path.m_pcofzwtj();
+      Path.DebugData lv3 = path.getDebugData();
       if (drawDebugNodes && lv3 != null) {
          for (PathNode lv4 : lv3.closedSet()) {
             if (getManhattanDistance(lv4.getBlockPos(), cameraX, cameraY, cameraZ) <= 80.0F) {
@@ -227,7 +227,7 @@
                DebugRenderer.drawString(
                   matrices,
                   vertexConsumers,
-                  String.valueOf(lv6.f_lzpxpqin),
+                  String.valueOf(lv6.type),
                   (double)lv6.x + 0.5,
                   (double)lv6.y + 0.75,
                   (double)lv6.z + 0.5,
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java	2024-03-27 00:01:39.872018961 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java	2024-03-27 00:00:30.767551757 +0000
@@ -45,7 +45,7 @@
    public void render(
       MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, HorseEntity arg3, float f, float g, float h, float j, float k, float l
    ) {
-      ItemStack lv = arg3.m_faldjosq();
+      ItemStack lv = arg3.getBodyArmor();
       if (lv.getItem() instanceof AnimalArmorItem lv2 && lv2.type() == AnimalArmorItem.Type.EQUESTRIAN) {
          this.getContextModel().copyStateTo(this.model);
          this.model.animateModel(arg3, f, g, h);
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java	2024-03-27 00:01:39.876018988 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java	2024-03-27 00:00:30.771551785 +0000
@@ -61,7 +61,7 @@
       MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, WolfEntity arg3, float f, float g, float h, float j, float k, float l
    ) {
       if (arg3.hasArmor()) {
-         ItemStack lv = arg3.m_faldjosq();
+         ItemStack lv = arg3.getBodyArmor();
          if (lv.getItem() instanceof AnimalArmorItem lv2) {
             this.getContextModel().copyStateTo(this.model);
             this.model.animateModel(arg3, f, g, h);
diff -bur namedTargetSrc/net/minecraft/client/sound/SoundManager.java namedSrc/net/minecraft/client/sound/SoundManager.java
--- namedTargetSrc/net/minecraft/client/sound/SoundManager.java	2024-03-27 00:01:39.864018907 +0000
+++ namedSrc/net/minecraft/client/sound/SoundManager.java	2024-03-27 00:00:30.755551673 +0000
@@ -81,7 +81,7 @@
     * @mapping {@literal named GSON Lnet/minecraft/client/sound/SoundManager;GSON:Lcom/google/gson/Gson;}
     */
    private static final Gson GSON = new GsonBuilder()
-      .registerTypeHierarchyAdapter(Text.class, new Text.C_poyaemhx(DynamicRegistryManager.EMPTY))
+      .registerTypeHierarchyAdapter(Text.class, new Text.Serializer(DynamicRegistryManager.EMPTY))
       .registerTypeAdapter(SoundEntry.class, new SoundEntryDeserializer())
       .create();
    /**
diff -bur namedTargetSrc/net/minecraft/component/type/WrittenBookContentComponent.java namedSrc/net/minecraft/component/type/WrittenBookContentComponent.java
--- namedTargetSrc/net/minecraft/component/type/WrittenBookContentComponent.java	2024-03-27 00:01:39.860018880 +0000
+++ namedSrc/net/minecraft/component/type/WrittenBookContentComponent.java	2024-03-27 00:00:30.751551644 +0000
@@ -179,7 +179,7 @@
     * @mapping {@literal named isPageTooLarge Lnet/minecraft/component/type/WrittenBookContentComponent;isPageTooLarge(Lnet/minecraft/text/Text;Lnet/minecraft/registry/HolderLookup$Provider;)Z}
     */
    private static boolean isPageTooLarge(Text text, HolderLookup.Provider lookupProvider) {
-      return Text.Serializer.toJson(text, lookupProvider).length() > 32767;
+      return Text.SerializationUtil.toJson(text, lookupProvider).length() > 32767;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/enchantment/EnchantmentHelper.java namedSrc/net/minecraft/enchantment/EnchantmentHelper.java
--- namedTargetSrc/net/minecraft/enchantment/EnchantmentHelper.java	2024-03-27 00:01:39.996019797 +0000
+++ namedSrc/net/minecraft/enchantment/EnchantmentHelper.java	2024-03-27 00:00:30.903552711 +0000
@@ -186,7 +186,7 @@
    public static void onUserDamaged(LivingEntity user, Entity attacker) {
       EnchantmentHelper.Consumer lv = (arg3, i) -> arg3.onUserDamaged(user, attacker, i);
       if (user != null) {
-         forEachEnchantment(lv, user.m_xvjkmxro());
+         forEachEnchantment(lv, user.getEquippedItems());
       }
 
       if (attacker instanceof PlayerEntity) {
@@ -203,7 +203,7 @@
    public static void onTargetDamaged(LivingEntity user, Entity target) {
       EnchantmentHelper.Consumer lv = (arg3, i) -> arg3.onTargetDamaged(user, target, i);
       if (user != null) {
-         forEachEnchantment(lv, user.m_xvjkmxro());
+         forEachEnchantment(lv, user.getEquippedItems());
       }
 
       if (user instanceof PlayerEntity) {
Only in namedSrc/net/minecraft/entity/ai/brain: MemoryAccessor.java
Only in namedSrc/net/minecraft/entity/ai/brain: MemoryCondition.java
Only in namedTargetSrc/net/minecraft/entity/ai/brain/sensor: ArmadilloScareDetectedSensor.java
Only in namedSrc/net/minecraft/entity/ai/brain/sensor: MobSensor.java
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/sensor/NearestBedSensor.java namedSrc/net/minecraft/entity/ai/brain/sensor/NearestBedSensor.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/sensor/NearestBedSensor.java	2024-03-27 00:01:40.052020175 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/NearestBedSensor.java	2024-03-27 00:00:30.947553019 +0000
@@ -94,7 +94,7 @@
                arg -> arg.isRegistryKey(PointOfInterestTypes.HOME), predicate, arg2.getBlockPos(), 48, PointOfInterestStorage.OccupationStatus.ANY
             )
             .collect(Collectors.toSet());
-         Path lv2 = FindPointOfInterestTask.m_ptkjaiyi(arg2, set);
+         Path lv2 = FindPointOfInterestTask.findPathToPoi(arg2, set);
          if (lv2 != null && lv2.reachesTarget()) {
             BlockPos lv3 = lv2.getTarget();
             Optional<Holder<PointOfInterestType>> optional = lv.getType(lv3);
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/sensor/SensorType.java namedSrc/net/minecraft/entity/ai/brain/sensor/SensorType.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/sensor/SensorType.java	2024-03-27 00:01:39.832018691 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/SensorType.java	2024-03-27 00:00:30.715551392 +0000
@@ -75,9 +75,9 @@
     * @mapping {@literal hashed f_mjfmwrrh Lnet/minecraft/unmapped/C_usxopklv;f_mjfmwrrh:Lnet/minecraft/unmapped/C_usxopklv;}
     * @mapping {@literal named ARMADILLO_SCARE_DETECTED Lnet/minecraft/entity/ai/brain/sensor/SensorType;ARMADILLO_SCARE_DETECTED:Lnet/minecraft/entity/ai/brain/sensor/SensorType;}
     */
-   public static final SensorType<ArmadilloScareDetectedSensor<ArmadilloEntity>> ARMADILLO_SCARE_DETECTED = register(
+   public static final SensorType<MobSensor<ArmadilloEntity>> ARMADILLO_SCARE_DETECTED = register(
       "armadillo_scare_detected",
-      () -> new ArmadilloScareDetectedSensor(5, ArmadilloEntity::isScaredOf, ArmadilloEntity::m_gfpmjxza, MemoryModuleType.DANGER_DETECTED_RECENTLY, 80)
+      () -> new MobSensor(5, ArmadilloEntity::isScaredOf, ArmadilloEntity::m_gfpmjxza, MemoryModuleType.DANGER_DETECTED_RECENTLY, 80)
    );
    /**
     * @mapping {@literal hashed f_exgymxyt Lnet/minecraft/unmapped/C_usxopklv;f_exgymxyt:Lnet/minecraft/unmapped/C_usxopklv;}
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/AdmireItemTask.java namedSrc/net/minecraft/entity/ai/brain/task/AdmireItemTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/AdmireItemTask.java	2024-03-27 00:01:39.940019420 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/AdmireItemTask.java	2024-03-27 00:00:30.843552289 +0000
@@ -4,7 +4,6 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.mob.PiglinBrain;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_hgldlkgv}
@@ -15,20 +14,20 @@
     * @mapping {@literal hashed m_ggqndzeg Lnet/minecraft/unmapped/C_hgldlkgv;m_ggqndzeg(I)Lnet/minecraft/unmapped/C_mdnathub;}
     * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/AdmireItemTask;run(I)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<LivingEntity> run(int i) {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(
-                  arg.m_qgrmwbxe(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM),
-                  arg.m_owejzxbp(MemoryModuleType.ADMIRING_ITEM),
-                  arg.m_owejzxbp(MemoryModuleType.ADMIRING_DISABLED),
-                  arg.m_owejzxbp(MemoryModuleType.DISABLE_WALK_TO_ADMIRE_ITEM)
+   public static TaskControl<LivingEntity> run(int duration) {
+      return TaskBuilder.task(
+         builder -> builder.group(
+                  builder.presentMemory(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM),
+                  builder.absentMemory(MemoryModuleType.ADMIRING_ITEM),
+                  builder.absentMemory(MemoryModuleType.ADMIRING_DISABLED),
+                  builder.absentMemory(MemoryModuleType.DISABLE_WALK_TO_ADMIRE_ITEM)
                )
-               .apply(arg, (arg2, arg3, arg4, arg5) -> (world, arg5x, l) -> {
-                     ItemEntity lv = arg.m_gcuzwcid(arg2);
+               .apply(builder, (nearestVisibleWantedItem, admiringItem, admiringDisabled, walkToAdmireItemDisabled) -> (world, entity, time) -> {
+                     ItemEntity lv = builder.getValue(nearestVisibleWantedItem);
                      if (!PiglinBrain.isGoldenItem(lv.getStack())) {
                         return false;
                      } else {
-                        arg3.m_zjdztcmb(true, (long)i);
+                        admiringItem.remember(true, (long)duration);
                         return true;
                      }
                   })
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/AdmireItemTimeLimitTask.java namedSrc/net/minecraft/entity/ai/brain/task/AdmireItemTimeLimitTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/AdmireItemTimeLimitTask.java	2024-03-27 00:01:40.088020418 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/AdmireItemTimeLimitTask.java	2024-03-27 00:00:30.987553300 +0000
@@ -3,7 +3,6 @@
 import java.util.Optional;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_ewjlpjzq}
@@ -14,29 +13,29 @@
     * @mapping {@literal hashed m_kwfdtpqu Lnet/minecraft/unmapped/C_ewjlpjzq;m_kwfdtpqu(II)Lnet/minecraft/unmapped/C_mdnathub;}
     * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/AdmireItemTimeLimitTask;run(II)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<LivingEntity> run(int i, int j) {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(
-                  arg.m_qgrmwbxe(MemoryModuleType.ADMIRING_ITEM),
-                  arg.m_qgrmwbxe(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM),
-                  arg.m_mzwocaxv(MemoryModuleType.TIME_TRYING_TO_REACH_ADMIRE_ITEM),
-                  arg.m_mzwocaxv(MemoryModuleType.DISABLE_WALK_TO_ADMIRE_ITEM)
+   public static TaskControl<LivingEntity> run(int cooldown, int timeLimit) {
+      return TaskBuilder.task(
+         builder -> builder.group(
+                  builder.presentMemory(MemoryModuleType.ADMIRING_ITEM),
+                  builder.presentMemory(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM),
+                  builder.registeredMemory(MemoryModuleType.TIME_TRYING_TO_REACH_ADMIRE_ITEM),
+                  builder.registeredMemory(MemoryModuleType.DISABLE_WALK_TO_ADMIRE_ITEM)
                )
-               .apply(arg, (arg2, arg3, arg4, arg5) -> (world, arg6, l) -> {
-                     if (!arg6.getOffHandStack().isEmpty()) {
+               .apply(builder, (admiringItem, nearestVisibleWantedItem, timeTryingToReachAdmireItem, walkToAdmireItemDisabled) -> (world, entity, time) -> {
+                     if (!entity.getOffHandStack().isEmpty()) {
                         return false;
                      } else {
-                        Optional<Integer> optional = arg.m_oxjxfuhs(arg4);
+                        Optional<Integer> optional = builder.getValueOptional(timeTryingToReachAdmireItem);
                         if (optional.isEmpty()) {
-                           arg4.m_klbizcog(0);
+                           timeTryingToReachAdmireItem.remember(0);
                         } else {
                            int k = (Integer)optional.get();
-                           if (k > i) {
-                              arg2.m_gfsxfard();
-                              arg4.m_gfsxfard();
-                              arg5.m_zjdztcmb(true, (long)j);
+                           if (k > cooldown) {
+                              admiringItem.forget();
+                              timeTryingToReachAdmireItem.forget();
+                              walkToAdmireItemDisabled.remember(true, (long)timeLimit);
                            } else {
-                              arg4.m_klbizcog(k + 1);
+                              timeTryingToReachAdmireItem.remember(k + 1);
                            }
                         }
       
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/AttackTask.java namedSrc/net/minecraft/entity/ai/brain/task/AttackTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/AttackTask.java	2024-03-27 00:01:40.124020661 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/AttackTask.java	2024-03-27 00:00:31.027553581 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.VisibleLivingEntitiesCache;
 import net.minecraft.entity.mob.MobEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.math.MathHelper;
 
 /**
@@ -16,21 +15,21 @@
 public class AttackTask {
    /**
     * @mapping {@literal hashed m_rqysdgvh Lnet/minecraft/unmapped/C_bkmohoxx;m_rqysdgvh(IF)Lnet/minecraft/unmapped/C_yfpegcpm;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/AttackTask;run(IF)Lnet/minecraft/entity/ReportingTaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/AttackTask;create(IF)Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static ReportingTaskControl<MobEntity> run(int i, float f) {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(
-                  arg.m_owejzxbp(MemoryModuleType.WALK_TARGET),
-                  arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
-                  arg.m_qgrmwbxe(MemoryModuleType.ATTACK_TARGET),
-                  arg.m_qgrmwbxe(MemoryModuleType.VISIBLE_MOBS)
+   public static ReportingTaskControl<MobEntity> create(int distance, float forwardMovement) {
+      return TaskBuilder.task(
+         instance -> instance.group(
+                  instance.absentMemory(MemoryModuleType.WALK_TARGET),
+                  instance.registeredMemory(MemoryModuleType.LOOK_TARGET),
+                  instance.presentMemory(MemoryModuleType.ATTACK_TARGET),
+                  instance.presentMemory(MemoryModuleType.VISIBLE_MOBS)
                )
-               .apply(arg, (arg2, arg3, arg4, arg5) -> (world, arg6, l) -> {
-                     LivingEntity lv = arg.m_gcuzwcid(arg4);
-                     if (lv.isInRange(arg6, (double)i) && arg.<VisibleLivingEntitiesCache>m_gcuzwcid(arg5).contains(lv)) {
-                        arg3.m_klbizcog(new EntityLookTarget(lv, true));
-                        arg6.getMoveControl().strafeTo(-f, 0.0F);
+               .apply(instance, (arg2, arg3, arg4, arg5) -> (world, arg6, l) -> {
+                     LivingEntity lv = instance.getValue(arg4);
+                     if (lv.isInRange(arg6, (double)distance) && instance.<VisibleLivingEntitiesCache>getValue(arg5).contains(lv)) {
+                        arg3.remember(new EntityLookTarget(lv, true));
+                        arg6.getMoveControl().strafeTo(-forwardMovement, 0.0F);
                         arg6.setYaw(MathHelper.stepAngleTowards(arg6.getYaw(), arg6.headYaw, 0.0F));
                         return true;
                      } else {
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/BoneMealTask.java namedSrc/net/minecraft/entity/ai/brain/task/BoneMealTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/BoneMealTask.java	2024-03-27 00:01:39.876018988 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/BoneMealTask.java	2024-03-27 00:00:30.771551785 +0000
@@ -123,7 +123,7 @@
     */
    protected void run(ServerWorld world, VillagerEntity arg2, long l) {
       this.addLookWalkTargets(arg2);
-      arg2.m_kzhoqled(EquipmentSlot.MAINHAND, new ItemStack(Items.BONE_MEAL));
+      arg2.equipStack(EquipmentSlot.MAINHAND, new ItemStack(Items.BONE_MEAL));
       this.startTime = l;
       this.duration = 0;
    }
@@ -145,7 +145,7 @@
     * @mapping {@literal named finishRunning Lnet/minecraft/entity/ai/brain/task/BoneMealTask;finishRunning(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/VillagerEntity;J)V}
     */
    protected void finishRunning(ServerWorld world, VillagerEntity arg2, long l) {
-      arg2.m_kzhoqled(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
+      arg2.equipStack(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
       this.lastEndEntityAge = (long)arg2.age;
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/CatchAndEatEntityTask.java namedSrc/net/minecraft/entity/ai/brain/task/CatchAndEatEntityTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/CatchAndEatEntityTask.java	2024-03-27 00:01:40.100020499 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/CatchAndEatEntityTask.java	2024-03-27 00:00:31.003553412 +0000
@@ -49,13 +49,15 @@
     */
    private static final float EATING_MOVEMENT_FACTOR = 0.75F;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_vplbkpdh Lnet/minecraft/unmapped/C_vejudmli;f_vplbkpdh:I}
+    * @mapping {@literal named UNREACHABLE_TONGUE_TARGETS_COOLDOWN Lnet/minecraft/entity/ai/brain/task/CatchAndEatEntityTask;UNREACHABLE_TONGUE_TARGETS_COOLDOWN:I}
     */
-   public static final int f_vplbkpdh = 100;
+   public static final int UNREACHABLE_TONGUE_TARGETS_COOLDOWN = 100;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_vmcivdqo Lnet/minecraft/unmapped/C_vejudmli;f_vmcivdqo:I}
+    * @mapping {@literal named MAX_REMEMBERED_UNREACHABLE_TONGUE_TARGETS Lnet/minecraft/entity/ai/brain/task/CatchAndEatEntityTask;MAX_REMEMBERED_UNREACHABLE_TONGUE_TARGETS:I}
     */
-   public static final int f_vmcivdqo = 5;
+   public static final int MAX_REMEMBERED_UNREACHABLE_TONGUE_TARGETS = 5;
    /**
     * @mapping {@literal hashed f_miaxvnpq Lnet/minecraft/unmapped/C_vejudmli;f_miaxvnpq:I}
     * @mapping {@literal named eatAnimationTicks Lnet/minecraft/entity/ai/brain/task/CatchAndEatEntityTask;eatAnimationTicks:I}
@@ -115,10 +117,10 @@
     */
    protected boolean shouldRun(ServerWorld world, FrogEntity arg2) {
       LivingEntity lv = (LivingEntity)arg2.getBrain().getOptionalMemory(MemoryModuleType.ATTACK_TARGET).get();
-      boolean bl = this.m_gfvpgpex(arg2, lv);
+      boolean bl = this.canPathfindToTarget(arg2, lv);
       if (!bl) {
          arg2.getBrain().forget(MemoryModuleType.ATTACK_TARGET);
-         this.m_hcrwemzl(arg2, lv);
+         this.rememberUnreachableTarget(arg2, lv);
       }
 
       return bl && arg2.getPose() != EntityPose.CROAKING && FrogEntity.canEat(lv);
@@ -216,18 +218,18 @@
 
    /**
     * @mapping {@literal hashed m_gfvpgpex Lnet/minecraft/unmapped/C_vejudmli;m_gfvpgpex(Lnet/minecraft/unmapped/C_gcfircge;Lnet/minecraft/unmapped/C_usxaxydn;)Z}
-    * @mapping {@literal named m_gfvpgpex Lnet/minecraft/entity/ai/brain/task/CatchAndEatEntityTask;m_gfvpgpex(Lnet/minecraft/entity/passive/FrogEntity;Lnet/minecraft/entity/LivingEntity;)Z}
+    * @mapping {@literal named canPathfindToTarget Lnet/minecraft/entity/ai/brain/task/CatchAndEatEntityTask;canPathfindToTarget(Lnet/minecraft/entity/passive/FrogEntity;Lnet/minecraft/entity/LivingEntity;)Z}
     */
-   private boolean m_gfvpgpex(FrogEntity frog, LivingEntity target) {
+   private boolean canPathfindToTarget(FrogEntity frog, LivingEntity target) {
       Path lv = frog.getNavigation().findPathTo(target, 0);
       return lv != null && lv.getManhattanDistanceFromTarget() < 1.75F;
    }
 
    /**
     * @mapping {@literal hashed m_hcrwemzl Lnet/minecraft/unmapped/C_vejudmli;m_hcrwemzl(Lnet/minecraft/unmapped/C_gcfircge;Lnet/minecraft/unmapped/C_usxaxydn;)V}
-    * @mapping {@literal named m_hcrwemzl Lnet/minecraft/entity/ai/brain/task/CatchAndEatEntityTask;m_hcrwemzl(Lnet/minecraft/entity/passive/FrogEntity;Lnet/minecraft/entity/LivingEntity;)V}
+    * @mapping {@literal named rememberUnreachableTarget Lnet/minecraft/entity/ai/brain/task/CatchAndEatEntityTask;rememberUnreachableTarget(Lnet/minecraft/entity/passive/FrogEntity;Lnet/minecraft/entity/LivingEntity;)V}
     */
-   private void m_hcrwemzl(FrogEntity frog, LivingEntity target) {
+   private void rememberUnreachableTarget(FrogEntity frog, LivingEntity target) {
       List<UUID> list = (List<UUID>)frog.getBrain().getOptionalMemory(MemoryModuleType.UNREACHABLE_TONGUE_TARGETS).orElseGet(ArrayList::new);
       boolean bl = !list.contains(target.getUuid());
       if (list.size() == 5 && bl) {
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/DefeatTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/DefeatTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/DefeatTargetTask.java	2024-03-27 00:01:40.104020526 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/DefeatTargetTask.java	2024-03-27 00:00:31.007553441 +0000
@@ -4,7 +4,6 @@
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.world.GameRules;
 
 /**
@@ -14,29 +13,29 @@
 public class DefeatTargetTask {
    /**
     * @mapping {@literal hashed m_pwvgjftm Lnet/minecraft/unmapped/C_hmsywjnp;m_pwvgjftm(ILjava/util/function/BiPredicate;)Lnet/minecraft/unmapped/C_mdnathub;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/DefeatTargetTask;run(ILjava/util/function/BiPredicate;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/DefeatTargetTask;create(ILjava/util/function/BiPredicate;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<LivingEntity> run(int i, BiPredicate<LivingEntity, LivingEntity> biPredicate) {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(
-                  arg.m_qgrmwbxe(MemoryModuleType.ATTACK_TARGET),
-                  arg.m_mzwocaxv(MemoryModuleType.ANGRY_AT),
-                  arg.m_owejzxbp(MemoryModuleType.CELEBRATE_LOCATION),
-                  arg.m_mzwocaxv(MemoryModuleType.DANCING)
+   public static TaskControl<LivingEntity> create(int celebrationDuration, BiPredicate<LivingEntity, LivingEntity> predicate) {
+      return TaskBuilder.task(
+         instance -> instance.group(
+                  instance.presentMemory(MemoryModuleType.ATTACK_TARGET),
+                  instance.registeredMemory(MemoryModuleType.ANGRY_AT),
+                  instance.absentMemory(MemoryModuleType.CELEBRATE_LOCATION),
+                  instance.registeredMemory(MemoryModuleType.DANCING)
                )
-               .apply(arg, (arg2, arg3, arg4, arg5) -> (world, arg7, l) -> {
-                     LivingEntity lv = arg.m_gcuzwcid(arg2);
+               .apply(instance, (arg2, arg3, arg4, arg5) -> (world, arg7, l) -> {
+                     LivingEntity lv = instance.getValue(arg2);
                      if (!lv.isDead()) {
                         return false;
                      } else {
-                        if (biPredicate.test(arg7, lv)) {
-                           arg5.m_zjdztcmb(true, (long)i);
+                        if (predicate.test(arg7, lv)) {
+                           arg5.remember(true, (long)celebrationDuration);
                         }
       
-                        arg4.m_zjdztcmb(lv.getBlockPos(), (long)i);
+                        arg4.remember(lv.getBlockPos(), (long)celebrationDuration);
                         if (lv.getType() != EntityType.PLAYER || world.getGameRules().getBooleanValue(GameRules.FORGIVE_DEAD_PLAYERS)) {
-                           arg2.m_gfsxfard();
-                           arg3.m_gfsxfard();
+                           arg2.forget();
+                           arg3.forget();
                         }
       
                         return true;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/EndRaidTask.java namedSrc/net/minecraft/entity/ai/brain/task/EndRaidTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/EndRaidTask.java	2024-03-27 00:01:40.112020580 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/EndRaidTask.java	2024-03-27 00:00:31.015553497 +0000
@@ -3,7 +3,6 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.Activity;
 import net.minecraft.entity.ai.brain.Brain;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.village.raid.Raid;
 
 /**
@@ -13,15 +12,15 @@
 public class EndRaidTask {
    /**
     * @mapping {@literal hashed m_vzdpqinm Lnet/minecraft/unmapped/C_shyxioch;m_vzdpqinm()Lnet/minecraft/unmapped/C_mdnathub;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/EndRaidTask;run()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/EndRaidTask;create()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<LivingEntity> run() {
-      return C_rcqaryar.m_elxiakeb(arg -> arg.point((world, arg2, l) -> {
+   public static TaskControl<LivingEntity> create() {
+      return TaskBuilder.task(instance -> instance.point((world, entity, time) -> {
             if (world.random.nextInt(20) != 0) {
                return false;
             } else {
-               Brain<?> lv = arg2.getBrain();
-               Raid lv2 = world.getRaidAt(arg2.getBlockPos());
+               Brain<?> lv = entity.getBrain();
+               Raid lv2 = world.getRaidAt(entity.getBlockPos());
                if (lv2 == null || lv2.hasStopped() || lv2.hasLost()) {
                   lv.setDefaultActivity(Activity.IDLE);
                   lv.refreshActivities(world.getTimeOfDay(), world.getTime());
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/FindEntityTask.java namedSrc/net/minecraft/entity/ai/brain/task/FindEntityTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/FindEntityTask.java	2024-03-27 00:01:40.020019959 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FindEntityTask.java	2024-03-27 00:00:30.931552907 +0000
@@ -8,7 +8,6 @@
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.VisibleLivingEntitiesCache;
 import net.minecraft.entity.ai.brain.WalkTarget;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_vqdfssau}
@@ -19,33 +18,42 @@
     * @mapping {@literal hashed m_lbnphhlh Lnet/minecraft/unmapped/C_vqdfssau;m_lbnphhlh(Lnet/minecraft/unmapped/C_ogavsvbr;ILnet/minecraft/unmapped/C_vbbyoqyw;FI)Lnet/minecraft/unmapped/C_mdnathub;}
     * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/FindEntityTask;run(Lnet/minecraft/entity/EntityType;ILnet/minecraft/entity/ai/brain/MemoryModuleType;FI)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static <T extends LivingEntity> TaskControl<LivingEntity> run(EntityType<? extends T> arg, int i, MemoryModuleType<T> arg2, float f, int j) {
-      return m_dtlwshua(arg, i, entity -> true, entity -> true, arg2, f, j);
+   public static <T extends LivingEntity> TaskControl<LivingEntity> run(
+      EntityType<? extends T> create, int maxDistance, MemoryModuleType<T> target, float speed, int completionRange
+   ) {
+      return create(create, maxDistance, entity -> true, entity -> true, target, speed, completionRange);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dtlwshua Lnet/minecraft/unmapped/C_vqdfssau;m_dtlwshua(Lnet/minecraft/unmapped/C_ogavsvbr;ILjava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_vbbyoqyw;FI)Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/FindEntityTask;create(Lnet/minecraft/entity/EntityType;ILjava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/entity/ai/brain/MemoryModuleType;FI)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static <E extends LivingEntity, T extends LivingEntity> TaskControl<E> m_dtlwshua(
-      EntityType<? extends T> arg, int i, Predicate<E> predicate, Predicate<T> predicate2, MemoryModuleType<T> arg2, float f, int j
+   public static <E extends LivingEntity, T extends LivingEntity> TaskControl<E> create(
+      EntityType<? extends T> type,
+      int maxDistance,
+      Predicate<E> entityPredicate,
+      Predicate<T> targetPredicate,
+      MemoryModuleType<T> target,
+      float speed,
+      int completionRange
    ) {
-      int k = i * i;
-      Predicate<LivingEntity> predicate3 = entity -> arg.equals(entity.getType()) && predicate2.test(entity);
-      return C_rcqaryar.m_elxiakeb(
-         arg2x -> arg2x.group(
-                  arg2x.m_mzwocaxv(arg2),
-                  arg2x.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
-                  arg2x.m_owejzxbp(MemoryModuleType.WALK_TARGET),
-                  arg2x.m_qgrmwbxe(MemoryModuleType.VISIBLE_MOBS)
+      int k = maxDistance * maxDistance;
+      Predicate<LivingEntity> predicate3 = entity -> type.equals(entity.getType()) && targetPredicate.test(entity);
+      return TaskBuilder.task(
+         instance -> instance.group(
+                  instance.registeredMemory(target),
+                  instance.registeredMemory(MemoryModuleType.LOOK_TARGET),
+                  instance.absentMemory(MemoryModuleType.WALK_TARGET),
+                  instance.presentMemory(MemoryModuleType.VISIBLE_MOBS)
                )
-               .apply(arg2x, (arg2xx, arg3, arg4, arg5) -> (world, arg7, l) -> {
-                     VisibleLivingEntitiesCache lv = arg2x.m_gcuzwcid(arg5);
-                     if (predicate.test(arg7) && lv.anyMatch(predicate3)) {
-                        Optional<LivingEntity> optional = lv.getFirst(arg2xxxx -> arg2xxxx.squaredDistanceTo(arg7) <= (double)k && predicate3.test(arg2xxxx));
+               .apply(instance, (arg2, arg3, arg4, arg5) -> (world, arg7, l) -> {
+                     VisibleLivingEntitiesCache lv = instance.getValue(arg5);
+                     if (entityPredicate.test(arg7) && lv.anyMatch(predicate3)) {
+                        Optional<LivingEntity> optional = lv.getFirst(arg2xx -> arg2xx.squaredDistanceTo(arg7) <= (double)k && predicate3.test(arg2xx));
                         optional.ifPresent(arg4xx -> {
-                           arg2xx.m_klbizcog(arg4xx);
-                           arg3.m_klbizcog(new EntityLookTarget(arg4xx, true));
-                           arg4.m_klbizcog(new WalkTarget(new EntityLookTarget(arg4xx, false), f, j));
+                           arg2.remember(arg4xx);
+                           arg3.remember(new EntityLookTarget(arg4xx, true));
+                           arg4.remember(new WalkTarget(new EntityLookTarget(arg4xx, false), speed, completionRange));
                         });
                         return true;
                      } else {
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/FindInteractionTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/FindInteractionTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/FindInteractionTargetTask.java	2024-03-27 00:01:40.000019825 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FindInteractionTargetTask.java	2024-03-27 00:00:30.907552739 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.entity.ai.brain.EntityLookTarget;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.VisibleLivingEntitiesCache;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_doxrjtcf}
@@ -15,27 +14,27 @@
 public class FindInteractionTargetTask {
    /**
     * @mapping {@literal hashed m_gvbzrnbg Lnet/minecraft/unmapped/C_doxrjtcf;m_gvbzrnbg(Lnet/minecraft/unmapped/C_ogavsvbr;I)Lnet/minecraft/unmapped/C_mdnathub;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/FindInteractionTargetTask;run(Lnet/minecraft/entity/EntityType;I)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/FindInteractionTargetTask;create(Lnet/minecraft/entity/EntityType;I)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<LivingEntity> run(EntityType<?> arg, int i) {
-      int j = i * i;
-      return C_rcqaryar.m_elxiakeb(
-         arg2 -> arg2.group(
-                  arg2.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
-                  arg2.m_owejzxbp(MemoryModuleType.INTERACTION_TARGET),
-                  arg2.m_qgrmwbxe(MemoryModuleType.VISIBLE_MOBS)
+   public static TaskControl<LivingEntity> create(EntityType<?> type, int maxDistance) {
+      int j = maxDistance * maxDistance;
+      return TaskBuilder.task(
+         instance -> instance.group(
+                  instance.registeredMemory(MemoryModuleType.LOOK_TARGET),
+                  instance.absentMemory(MemoryModuleType.INTERACTION_TARGET),
+                  instance.presentMemory(MemoryModuleType.VISIBLE_MOBS)
                )
                .apply(
-                  arg2,
+                  instance,
                   (arg3, arg4, arg5) -> (world, arg7, l) -> {
-                        Optional<LivingEntity> optional = arg2.<VisibleLivingEntitiesCache>m_gcuzwcid(arg5)
-                           .getFirst(arg3xx -> arg3xx.squaredDistanceTo(arg7) <= (double)j && arg.equals(arg3xx.getType()));
+                        Optional<LivingEntity> optional = instance.<VisibleLivingEntitiesCache>getValue(arg5)
+                           .getFirst(arg3xx -> arg3xx.squaredDistanceTo(arg7) <= (double)j && type.equals(arg3xx.getType()));
                         if (optional.isEmpty()) {
                            return false;
                         } else {
                            LivingEntity lv = (LivingEntity)optional.get();
-                           arg4.m_klbizcog(lv);
-                           arg3.m_klbizcog(new EntityLookTarget(lv, true));
+                           arg4.remember(lv);
+                           arg3.remember(new EntityLookTarget(lv, true));
                            return true;
                         }
                      }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/FindLandNearWaterTask.java namedSrc/net/minecraft/entity/ai/brain/task/FindLandNearWaterTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/FindLandNearWaterTask.java	2024-03-27 00:01:39.880019015 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FindLandNearWaterTask.java	2024-03-27 00:00:30.775551812 +0000
@@ -7,7 +7,6 @@
 import net.minecraft.entity.ai.brain.WalkTarget;
 import net.minecraft.entity.mob.PathAwareEntity;
 import net.minecraft.registry.tag.FluidTags;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import org.apache.commons.lang3.mutable.MutableLong;
@@ -19,17 +18,19 @@
 public class FindLandNearWaterTask {
    /**
     * @mapping {@literal hashed m_oxwpyzpq Lnet/minecraft/unmapped/C_ixqqkgne;m_oxwpyzpq(IF)Lnet/minecraft/unmapped/C_mdnathub;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/FindLandNearWaterTask;run(IF)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/FindLandNearWaterTask;create(IF)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<PathAwareEntity> run(int i, float f) {
+   public static TaskControl<PathAwareEntity> create(int range, float speed) {
       MutableLong mutableLong = new MutableLong(0L);
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(
-                  arg.m_owejzxbp(MemoryModuleType.ATTACK_TARGET), arg.m_owejzxbp(MemoryModuleType.WALK_TARGET), arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET)
+      return TaskBuilder.task(
+         instance -> instance.group(
+                  instance.absentMemory(MemoryModuleType.ATTACK_TARGET),
+                  instance.absentMemory(MemoryModuleType.WALK_TARGET),
+                  instance.registeredMemory(MemoryModuleType.LOOK_TARGET)
                )
                .apply(
-                  arg,
-                  (argx, arg2, arg3) -> (world, arg4, l) -> {
+                  instance,
+                  (arg, arg2, arg3) -> (world, arg4, l) -> {
                         if (world.getFluidState(arg4.getBlockPos()).isIn(FluidTags.WATER)) {
                            return false;
                         } else if (l < mutableLong.getValue()) {
@@ -41,15 +42,15 @@
                            BlockPos.Mutable lv3 = new BlockPos.Mutable();
          
                            label45:
-                           for (BlockPos lv4 : BlockPos.iterateOutwards(lv2, i, i, i)) {
+                           for (BlockPos lv4 : BlockPos.iterateOutwards(lv2, range, range, range)) {
                               if ((lv4.getX() != lv2.getX() || lv4.getZ() != lv2.getZ())
                                  && world.getBlockState(lv4).getCollisionShape(world, lv4, lv).isEmpty()
                                  && !world.getBlockState(lv3.set(lv4, Direction.DOWN)).getCollisionShape(world, lv4, lv).isEmpty()) {
                                  for (Direction lv5 : Direction.Type.HORIZONTAL) {
                                     lv3.set(lv4, lv5);
                                     if (world.getBlockState(lv3).isAir() && world.getBlockState(lv3.move(Direction.DOWN)).isOf(Blocks.WATER)) {
-                                       arg3.m_klbizcog(new BlockPosLookTarget(lv4));
-                                       arg2.m_klbizcog(new WalkTarget(new BlockPosLookTarget(lv4), f, 0));
+                                       arg3.remember(new BlockPosLookTarget(lv4));
+                                       arg2.remember(new WalkTarget(new BlockPosLookTarget(lv4), speed, 0));
                                        break label45;
                                     }
                                  }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/FindLandTask.java namedSrc/net/minecraft/entity/ai/brain/task/FindLandTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/FindLandTask.java	2024-03-27 00:01:40.088020418 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FindLandTask.java	2024-03-27 00:00:30.991553328 +0000
@@ -8,7 +8,6 @@
 import net.minecraft.entity.ai.brain.WalkTarget;
 import net.minecraft.entity.mob.PathAwareEntity;
 import net.minecraft.registry.tag.FluidTags;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import org.apache.commons.lang3.mutable.MutableLong;
@@ -28,15 +27,17 @@
     * @mapping {@literal hashed m_qjvvcudh Lnet/minecraft/unmapped/C_kohupgpp;m_qjvvcudh(IF)Lnet/minecraft/unmapped/C_mdnathub;}
     * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/FindLandTask;run(IF)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<PathAwareEntity> run(int i, float f) {
+   public static TaskControl<PathAwareEntity> run(int range, float speed) {
       MutableLong mutableLong = new MutableLong(0L);
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(
-                  arg.m_owejzxbp(MemoryModuleType.ATTACK_TARGET), arg.m_owejzxbp(MemoryModuleType.WALK_TARGET), arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET)
+      return TaskBuilder.task(
+         instance -> instance.group(
+                  instance.absentMemory(MemoryModuleType.ATTACK_TARGET),
+                  instance.absentMemory(MemoryModuleType.WALK_TARGET),
+                  instance.registeredMemory(MemoryModuleType.LOOK_TARGET)
                )
                .apply(
-                  arg,
-                  (argx, arg2, arg3) -> (world, arg4, l) -> {
+                  instance,
+                  (arg, arg2, arg3) -> (world, arg4, l) -> {
                         if (!world.getFluidState(arg4.getBlockPos()).isIn(FluidTags.WATER)) {
                            return false;
                         } else if (l < mutableLong.getValue()) {
@@ -47,7 +48,7 @@
                            BlockPos.Mutable lv2 = new BlockPos.Mutable();
                            ShapeContext lv3 = ShapeContext.of(arg4);
          
-                           for (BlockPos lv4 : BlockPos.iterateOutwards(lv, i, i, i)) {
+                           for (BlockPos lv4 : BlockPos.iterateOutwards(lv, range, range, range)) {
                               if (lv4.getX() != lv.getX() || lv4.getZ() != lv.getZ()) {
                                  BlockState lv5 = world.getBlockState(lv4);
                                  BlockState lv6 = world.getBlockState(lv2.set(lv4, Direction.DOWN));
@@ -56,8 +57,8 @@
                                     && lv5.getCollisionShape(world, lv4, lv3).isEmpty()
                                     && lv6.isSideSolidFullSquare(world, lv2, Direction.UP)) {
                                     BlockPos lv7 = lv4.toImmutable();
-                                    arg3.m_klbizcog(new BlockPosLookTarget(lv7));
-                                    arg2.m_klbizcog(new WalkTarget(new BlockPosLookTarget(lv7), f, 1));
+                                    arg3.remember(new BlockPosLookTarget(lv7));
+                                    arg2.remember(new WalkTarget(new BlockPosLookTarget(lv7), speed, 1));
                                     break;
                                  }
                               }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.java namedSrc/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.java	2024-03-27 00:01:39.852018826 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.java	2024-03-27 00:00:30.747551616 +0000
@@ -16,7 +16,6 @@
 import net.minecraft.entity.mob.PathAwareEntity;
 import net.minecraft.registry.Holder;
 import net.minecraft.server.network.DebugInfoSender;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.dynamic.GlobalPos;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.random.RandomGenerator;
@@ -38,31 +37,35 @@
 
    /**
     * @mapping {@literal hashed m_ktqnxtbb Lnet/minecraft/unmapped/C_qbrxxpsd;m_ktqnxtbb(Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_vbbyoqyw;ZLjava/util/Optional;)Lnet/minecraft/unmapped/C_mdnathub;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/FindPointOfInterestTask;run(Ljava/util/function/Predicate;Lnet/minecraft/entity/ai/brain/MemoryModuleType;ZLjava/util/Optional;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/FindPointOfInterestTask;create(Ljava/util/function/Predicate;Lnet/minecraft/entity/ai/brain/MemoryModuleType;ZLjava/util/Optional;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<PathAwareEntity> run(
-      Predicate<Holder<PointOfInterestType>> predicate, MemoryModuleType<GlobalPos> arg, boolean bl, Optional<Byte> optional
+   public static TaskControl<PathAwareEntity> create(
+      Predicate<Holder<PointOfInterestType>> poiPredicate, MemoryModuleType<GlobalPos> poiPosition, boolean onlyRunIfChild, Optional<Byte> entityStatus
    ) {
-      return run(predicate, arg, arg, bl, optional);
+      return create(poiPredicate, poiPosition, poiPosition, onlyRunIfChild, entityStatus);
    }
 
    /**
     * @mapping {@literal hashed m_wosyhmxm Lnet/minecraft/unmapped/C_qbrxxpsd;m_wosyhmxm(Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_vbbyoqyw;Lnet/minecraft/unmapped/C_vbbyoqyw;ZLjava/util/Optional;)Lnet/minecraft/unmapped/C_mdnathub;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/FindPointOfInterestTask;run(Ljava/util/function/Predicate;Lnet/minecraft/entity/ai/brain/MemoryModuleType;Lnet/minecraft/entity/ai/brain/MemoryModuleType;ZLjava/util/Optional;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/FindPointOfInterestTask;create(Ljava/util/function/Predicate;Lnet/minecraft/entity/ai/brain/MemoryModuleType;Lnet/minecraft/entity/ai/brain/MemoryModuleType;ZLjava/util/Optional;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<PathAwareEntity> run(
-      Predicate<Holder<PointOfInterestType>> predicate, MemoryModuleType<GlobalPos> arg, MemoryModuleType<GlobalPos> arg2, boolean bl, Optional<Byte> optional
+   public static TaskControl<PathAwareEntity> create(
+      Predicate<Holder<PointOfInterestType>> poiPredicate,
+      MemoryModuleType<GlobalPos> poiPosition,
+      MemoryModuleType<GlobalPos> potentialPoiPosition,
+      boolean onlyRunIfChild,
+      Optional<Byte> entityStatus
    ) {
       int i = 5;
       int j = 20;
       MutableLong mutableLong = new MutableLong(0L);
       Long2ObjectMap<FindPointOfInterestTask.RetryMarker> long2ObjectMap = new Long2ObjectOpenHashMap<>();
-      ReportingTaskControl<PathAwareEntity> lv = C_rcqaryar.m_elxiakeb(
-         arg2x -> arg2x.group(arg2x.m_owejzxbp(arg2))
+      ReportingTaskControl<PathAwareEntity> lv = TaskBuilder.task(
+         instance -> instance.group(instance.absentMemory(potentialPoiPosition))
                .apply(
-                  arg2x,
-                  argxx -> (world, arg3, l) -> {
-                        if (bl && arg3.isBaby()) {
+                  instance,
+                  argx -> (world, arg3, l) -> {
+                        if (onlyRunIfChild && arg3.isBaby()) {
                            return false;
                         } else if (mutableLong.getValue() == 0L) {
                            mutableLong.setValue(world.getTime() + (long)world.random.nextInt(20));
@@ -85,17 +88,17 @@
                               }
                            };
                            Set<Pair<Holder<PointOfInterestType>, BlockPos>> set = (Set<Pair<Holder<PointOfInterestType>, BlockPos>>)lvx.m_fcmsgafb(
-                                 predicate, predicate2, arg3.getBlockPos(), 48, PointOfInterestStorage.OccupationStatus.HAS_SPACE
+                                 poiPredicate, predicate2, arg3.getBlockPos(), 48, PointOfInterestStorage.OccupationStatus.HAS_SPACE
                               )
                               .limit(5L)
                               .collect(Collectors.toSet());
-                           Path lv2 = m_ptkjaiyi(arg3, set);
+                           Path lv2 = findPathToPoi(arg3, set);
                            if (lv2 != null && lv2.reachesTarget()) {
                               BlockPos lv3 = lv2.getTarget();
                               lvx.getType(lv3).ifPresent(arg6 -> {
-                                 lvx.getPosition(predicate, (arg2xx, arg3xx) -> arg3xx.equals(lv3), lv3, 1);
-                                 argxx.m_klbizcog(GlobalPos.create(world.getRegistryKey(), lv3));
-                                 optional.ifPresent(arg3xx -> world.sendEntityStatus(arg3, arg3xx));
+                                 lvx.getPosition(poiPredicate, (arg2, arg3xx) -> arg3xx.equals(lv3), lv3, 1);
+                                 argx.remember(GlobalPos.create(world.getRegistryKey(), lv3));
+                                 entityStatus.ifPresent(arg3xx -> world.sendEntityStatus(arg3, arg3xx));
                                  long2ObjectMap.clear();
                                  DebugInfoSender.sendPointOfInterest(world, lv3);
                               });
@@ -115,26 +118,27 @@
                      }
                )
       );
-      return arg2 == arg ? lv : C_rcqaryar.m_elxiakeb(arg3 -> arg3.group(arg3.m_owejzxbp(arg)).apply(arg3, arg2xx -> lv));
+      return potentialPoiPosition == poiPosition ? lv : TaskBuilder.task(arg3 -> arg3.group(arg3.absentMemory(poiPosition)).apply(arg3, arg2x -> lv));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ptkjaiyi Lnet/minecraft/unmapped/C_qbrxxpsd;m_ptkjaiyi(Lnet/minecraft/unmapped/C_dxkfswlz;Ljava/util/Set;)Lnet/minecraft/unmapped/C_motipebf;}
+    * @mapping {@literal named findPathToPoi Lnet/minecraft/entity/ai/brain/task/FindPointOfInterestTask;findPathToPoi(Lnet/minecraft/entity/mob/MobEntity;Ljava/util/Set;)Lnet/minecraft/entity/ai/pathing/Path;}
     */
    @Nullable
-   public static Path m_ptkjaiyi(MobEntity arg, Set<Pair<Holder<PointOfInterestType>, BlockPos>> set) {
-      if (set.isEmpty()) {
+   public static Path findPathToPoi(MobEntity entity, Set<Pair<Holder<PointOfInterestType>, BlockPos>> pois) {
+      if (pois.isEmpty()) {
          return null;
       } else {
          Set<BlockPos> set2 = new HashSet();
          int i = 1;
 
-         for (Pair<Holder<PointOfInterestType>, BlockPos> pair : set) {
+         for (Pair<Holder<PointOfInterestType>, BlockPos> pair : pois) {
             i = Math.max(i, pair.getFirst().value().searchDistance());
             set2.add(pair.getSecond());
          }
 
-         return arg.getNavigation().findPathTo(set2, i);
+         return entity.getNavigation().findPathTo(set2, i);
       }
    }

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/FindWalkTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/FindWalkTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/FindWalkTargetTask.java	2024-03-27 00:01:39.888019068 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FindWalkTargetTask.java	2024-03-27 00:00:30.783551869 +0000
@@ -7,7 +7,6 @@
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.WalkTarget;
 import net.minecraft.entity.mob.PathAwareEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkSectionPos;
 import net.minecraft.util.math.Vec3d;
@@ -30,33 +29,33 @@
 
    /**
     * @mapping {@literal hashed m_jsdyxmyl Lnet/minecraft/unmapped/C_sidddyqp;m_jsdyxmyl(F)Lnet/minecraft/unmapped/C_yfpegcpm;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/FindWalkTargetTask;run(F)Lnet/minecraft/entity/ReportingTaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/FindWalkTargetTask;create(F)Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static ReportingTaskControl<PathAwareEntity> run(float f) {
-      return run(f, 10, 7);
+   public static ReportingTaskControl<PathAwareEntity> create(float walkSpeed) {
+      return create(walkSpeed, 10, 7);
    }
 
    /**
     * @mapping {@literal hashed m_xqtsekmk Lnet/minecraft/unmapped/C_sidddyqp;m_xqtsekmk(FII)Lnet/minecraft/unmapped/C_yfpegcpm;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/FindWalkTargetTask;run(FII)Lnet/minecraft/entity/ReportingTaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/FindWalkTargetTask;create(FII)Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static ReportingTaskControl<PathAwareEntity> run(float f, int i, int j) {
-      return C_rcqaryar.m_elxiakeb(arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.WALK_TARGET)).apply(arg, argx -> (world, arg3, l) -> {
+   public static ReportingTaskControl<PathAwareEntity> create(float walkSpeed, int horizontalRange, int verticalRange) {
+      return TaskBuilder.task(instance -> instance.group(instance.absentMemory(MemoryModuleType.WALK_TARGET)).apply(instance, arg -> (world, arg3, l) -> {
                BlockPos lv = arg3.getBlockPos();
                Vec3d lv2;
                if (world.isNearOccupiedPointOfInterest(lv)) {
-                  lv2 = FuzzyTargeting.find(arg3, i, j);
+                  lv2 = FuzzyTargeting.find(arg3, horizontalRange, verticalRange);
                } else {
                   ChunkSectionPos lv3 = ChunkSectionPos.from(lv);
                   ChunkSectionPos lv4 = LookTargetUtil.getPosClosestToOccupiedPointOfInterest(world, lv3, 2);
                   if (lv4 != lv3) {
-                     lv2 = NoPenaltyTargeting.find(arg3, i, j, Vec3d.ofBottomCenter(lv4.getCenterPos()), (float) (Math.PI / 2));
+                     lv2 = NoPenaltyTargeting.find(arg3, horizontalRange, verticalRange, Vec3d.ofBottomCenter(lv4.getCenterPos()), (float) (Math.PI / 2));
                   } else {
-                     lv2 = FuzzyTargeting.find(arg3, i, j);
+                     lv2 = FuzzyTargeting.find(arg3, horizontalRange, verticalRange);
                   }
                }
 
-               argx.m_bczdgokz(Optional.ofNullable(lv2).map(argxxx -> new WalkTarget(argxxx, f, 0)));
+               arg.remember(Optional.ofNullable(lv2).map(argxx -> new WalkTarget(argxx, walkSpeed, 0)));
                return true;
             }));
    }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/FollowMobTask.java namedSrc/net/minecraft/entity/ai/brain/task/FollowMobTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/FollowMobTask.java	2024-03-27 00:01:40.132020715 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FollowMobTask.java	2024-03-27 00:00:31.039553665 +0000
@@ -10,7 +10,6 @@
 import net.minecraft.entity.ai.brain.EntityLookTarget;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.VisibleLivingEntitiesCache;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_oqkjspff}
@@ -19,42 +18,45 @@
 public class FollowMobTask {
    /**
     * @mapping {@literal hashed m_hjvosmzc Lnet/minecraft/unmapped/C_oqkjspff;m_hjvosmzc(Lnet/minecraft/unmapped/C_ormqdxci;F)Lnet/minecraft/unmapped/C_mdnathub;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/FollowMobTask;run(Lnet/minecraft/entity/SpawnGroup;F)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
+    * @mapping {@literal named createMatchingSpawnGroup Lnet/minecraft/entity/ai/brain/task/FollowMobTask;createMatchingSpawnGroup(Lnet/minecraft/entity/SpawnGroup;F)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<LivingEntity> run(SpawnGroup arg, float f) {
-      return m_xtjussog(arg2 -> arg.equals(arg2.getType().getSpawnGroup()), f);
+   public static TaskControl<LivingEntity> createMatchingSpawnGroup(SpawnGroup group, float maxDistance) {
+      return create(entity -> group.equals(entity.getType().getSpawnGroup()), maxDistance);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mxhqnvzy Lnet/minecraft/unmapped/C_oqkjspff;m_mxhqnvzy(Lnet/minecraft/unmapped/C_ogavsvbr;F)Lnet/minecraft/unmapped/C_yfpegcpm;}
+    * @mapping {@literal named createMatchingType Lnet/minecraft/entity/ai/brain/task/FollowMobTask;createMatchingType(Lnet/minecraft/entity/EntityType;F)Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static ReportingTaskControl<LivingEntity> m_mxhqnvzy(EntityType<?> arg, float f) {
-      return m_xtjussog(arg2 -> arg.equals(arg2.getType()), f);
+   public static ReportingTaskControl<LivingEntity> createMatchingType(EntityType<?> type, float maxDistance) {
+      return create(entity -> type.equals(entity.getType()), maxDistance);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vwwtwkqe Lnet/minecraft/unmapped/C_oqkjspff;m_vwwtwkqe(F)Lnet/minecraft/unmapped/C_yfpegcpm;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/FollowMobTask;create(F)Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static ReportingTaskControl<LivingEntity> m_vwwtwkqe(float f) {
-      return m_xtjussog(arg -> true, f);
+   public static ReportingTaskControl<LivingEntity> create(float maxDistance) {
+      return create(entity -> true, maxDistance);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xtjussog Lnet/minecraft/unmapped/C_oqkjspff;m_xtjussog(Ljava/util/function/Predicate;F)Lnet/minecraft/unmapped/C_yfpegcpm;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/FollowMobTask;create(Ljava/util/function/Predicate;F)Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static ReportingTaskControl<LivingEntity> m_xtjussog(Predicate<LivingEntity> predicate, float f) {
-      float g = f * f;
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.LOOK_TARGET), arg.m_qgrmwbxe(MemoryModuleType.VISIBLE_MOBS))
+   public static ReportingTaskControl<LivingEntity> create(Predicate<LivingEntity> predicate, float maxDistance) {
+      float g = maxDistance * maxDistance;
+      return TaskBuilder.task(
+         instance -> instance.group(instance.absentMemory(MemoryModuleType.LOOK_TARGET), instance.presentMemory(MemoryModuleType.VISIBLE_MOBS))
                .apply(
-                  arg,
+                  instance,
                   (arg2, arg3) -> (world, arg5, l) -> {
-                        Optional<LivingEntity> optional = arg.<VisibleLivingEntitiesCache>m_gcuzwcid(arg3)
+                        Optional<LivingEntity> optional = instance.<VisibleLivingEntitiesCache>getValue(arg3)
                            .getFirst(predicate.and(arg2xx -> arg2xx.squaredDistanceTo(arg5) <= (double)g && !arg5.hasPassenger(arg2xx)));
                         if (optional.isEmpty()) {
                            return false;
                         } else {
-                           arg2.m_klbizcog(new EntityLookTarget((Entity)optional.get(), true));
+                           arg2.remember(new EntityLookTarget((Entity)optional.get(), true));
                            return true;
                         }
                      }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.java	2024-03-27 00:01:40.128020688 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.java	2024-03-27 00:00:31.035553637 +0000
@@ -4,7 +4,6 @@
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.world.GameRules;
 
 /**
@@ -17,16 +16,16 @@
     * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask;run()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
    public static TaskControl<LivingEntity> run() {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.ANGRY_AT))
+      return TaskBuilder.task(
+         arg -> arg.group(arg.presentMemory(MemoryModuleType.ANGRY_AT))
                .apply(
                   arg,
                   arg2 -> (world, arg4, l) -> {
-                        Optional.ofNullable(world.getEntity(arg.m_gcuzwcid(arg2)))
+                        Optional.ofNullable(world.getEntity(arg.getValue(arg2)))
                            .map(argxxx -> argxxx instanceof LivingEntity lv ? lv : null)
                            .filter(LivingEntity::isDead)
                            .filter(arg2xx -> arg2xx.getType() != EntityType.PLAYER || world.getGameRules().getBooleanValue(GameRules.FORGIVE_DEAD_PLAYERS))
-                           .ifPresent(arg2xx -> arg2.m_gfsxfard());
+                           .ifPresent(arg2xx -> arg2.forget());
                         return true;
                      }
                )
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.java	2024-03-27 00:01:39.968019609 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.java	2024-03-27 00:00:30.875552514 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.mob.MobEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_gaizicad}
@@ -21,50 +20,54 @@
 
    /**
     * @mapping {@literal hashed m_pqcarusr Lnet/minecraft/unmapped/C_gaizicad;m_pqcarusr(Ljava/util/function/BiConsumer;)Lnet/minecraft/unmapped/C_mdnathub;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask;run(Ljava/util/function/BiConsumer;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask;create(Ljava/util/function/BiConsumer;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static <E extends MobEntity> TaskControl<E> run(BiConsumer<E, LivingEntity> forgetCallback) {
-      return run(arg -> false, forgetCallback, true);
+   public static <E extends MobEntity> TaskControl<E> create(BiConsumer<E, LivingEntity> forgetCallback) {
+      return create(arg -> false, forgetCallback, true);
    }
 
    /**
     * @mapping {@literal hashed m_nwhekhlv Lnet/minecraft/unmapped/C_gaizicad;m_nwhekhlv(Ljava/util/function/Predicate;)Lnet/minecraft/unmapped/C_mdnathub;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask;run(Ljava/util/function/Predicate;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask;create(Ljava/util/function/Predicate;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static <E extends MobEntity> TaskControl<E> run(Predicate<LivingEntity> alternativeCondition) {
-      return run(alternativeCondition, (arg, arg2) -> {
+   public static <E extends MobEntity> TaskControl<E> create(Predicate<LivingEntity> alternativeCondition) {
+      return create(alternativeCondition, (arg, arg2) -> {
       }, true);
    }
 
    /**
     * @mapping {@literal hashed m_nyujuwga Lnet/minecraft/unmapped/C_gaizicad;m_nyujuwga()Lnet/minecraft/unmapped/C_mdnathub;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask;run()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask;create()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static <E extends MobEntity> TaskControl<E> run() {
-      return run(arg -> false, (arg, arg2) -> {
+   public static <E extends MobEntity> TaskControl<E> create() {
+      return create(arg -> false, (arg, arg2) -> {
       }, true);
    }
 
    /**
     * @mapping {@literal hashed m_pdsgbbnj Lnet/minecraft/unmapped/C_gaizicad;m_pdsgbbnj(Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;Z)Lnet/minecraft/unmapped/C_mdnathub;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask;run(Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;Z)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask;create(Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;Z)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static <E extends MobEntity> TaskControl<E> run(Predicate<LivingEntity> alternativeCondition, BiConsumer<E, LivingEntity> forgetCallback, boolean bl) {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.ATTACK_TARGET), arg.m_mzwocaxv(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE))
+   public static <E extends MobEntity> TaskControl<E> create(
+      Predicate<LivingEntity> alternativeCondition, BiConsumer<E, LivingEntity> forgetCallback, boolean shouldForgetIfTargetUnreachable
+   ) {
+      return TaskBuilder.task(
+         instance -> instance.group(
+                  instance.presentMemory(MemoryModuleType.ATTACK_TARGET), instance.registeredMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE)
+               )
                .apply(
-                  arg,
-                  (arg2, arg3) -> (world, arg5, l) -> {
-                        LivingEntity lv = arg.m_gcuzwcid(arg2);
-                        if (arg5.canTarget(lv)
-                           && (!bl || !cannotReachTarget(arg5, arg.m_oxjxfuhs(arg3)))
+                  instance,
+                  (attackTarget, cannotReachWalkTargetReason) -> (world, entity, time) -> {
+                        LivingEntity lv = instance.getValue(attackTarget);
+                        if (entity.canTarget(lv)
+                           && (!shouldForgetIfTargetUnreachable || !cannotReachTarget(entity, instance.getValueOptional(cannotReachWalkTargetReason)))
                            && lv.isAlive()
-                           && lv.getWorld() == arg5.getWorld()
+                           && lv.getWorld() == entity.getWorld()
                            && !alternativeCondition.test(lv)) {
                            return true;
                         } else {
-                           forgetCallback.accept(arg5, lv);
-                           arg2.m_gfsxfard();
+                           forgetCallback.accept(entity, lv);
+                           attackTarget.forget();
                            return true;
                         }
                      }
@@ -76,7 +79,7 @@
     * @mapping {@literal hashed m_agdthaky Lnet/minecraft/unmapped/C_gaizicad;m_agdthaky(Lnet/minecraft/unmapped/C_usxaxydn;Ljava/util/Optional;)Z}
     * @mapping {@literal named cannotReachTarget Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask;cannotReachTarget(Lnet/minecraft/entity/LivingEntity;Ljava/util/Optional;)Z}
     */
-   private static boolean cannotReachTarget(LivingEntity entity, Optional<Long> optional) {
-      return optional.isPresent() && entity.getWorld().getTime() - (Long)optional.get() > 200L;
+   private static boolean cannotReachTarget(LivingEntity entity, Optional<Long> reason) {
+      return reason.isPresent() && entity.getWorld().getTime() - (Long)reason.get() > 200L;
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/ForgetBellRingTask.java namedSrc/net/minecraft/entity/ai/brain/task/ForgetBellRingTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/ForgetBellRingTask.java	2024-03-27 00:01:40.112020580 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/ForgetBellRingTask.java	2024-03-27 00:00:31.015553497 +0000
@@ -2,7 +2,6 @@
 
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.dynamic.GlobalPos;
 import net.minecraft.util.math.BlockPos;
 import org.apache.commons.lang3.mutable.MutableInt;
@@ -22,24 +21,24 @@
     * @mapping {@literal hashed m_saavfyfp Lnet/minecraft/unmapped/C_rywbzjic;m_saavfyfp(II)Lnet/minecraft/unmapped/C_mdnathub;}
     * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/ForgetBellRingTask;run(II)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<LivingEntity> run(int i, int j) {
-      int k = i * 20;
+   public static TaskControl<LivingEntity> run(int maxHiddenSeconds, int distance) {
+      int k = maxHiddenSeconds * 20;
       MutableInt mutableInt = new MutableInt(0);
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.HIDING_PLACE), arg.m_qgrmwbxe(MemoryModuleType.HEARD_BELL_TIME))
-               .apply(arg, (arg2, arg3) -> (world, arg5, l) -> {
-                     long m = arg.<Long>m_gcuzwcid(arg3);
+      return TaskBuilder.task(
+         instance -> instance.group(instance.presentMemory(MemoryModuleType.HIDING_PLACE), instance.presentMemory(MemoryModuleType.HEARD_BELL_TIME))
+               .apply(instance, (arg2, arg3) -> (world, arg5, l) -> {
+                     long m = instance.<Long>getValue(arg3);
                      boolean bl = m + 300L <= l;
                      if (mutableInt.getValue() <= k && !bl) {
-                        BlockPos lv = arg.<GlobalPos>m_gcuzwcid(arg2).getPos();
-                        if (lv.isWithinDistance(arg5.getBlockPos(), (double)j)) {
+                        BlockPos lv = instance.<GlobalPos>getValue(arg2).getPos();
+                        if (lv.isWithinDistance(arg5.getBlockPos(), (double)distance)) {
                            mutableInt.increment();
                         }
       
                         return true;
                      } else {
-                        arg3.m_gfsxfard();
-                        arg2.m_gfsxfard();
+                        arg3.forget();
+                        arg2.forget();
                         arg5.getBrain().refreshActivities(world.getTimeOfDay(), world.getTime());
                         mutableInt.setValue(0);
                         return true;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.java namedSrc/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.java	2024-03-27 00:01:40.116020607 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.java	2024-03-27 00:00:31.023553552 +0000
@@ -9,7 +9,6 @@
 import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.server.network.DebugInfoSender;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.dynamic.GlobalPos;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.poi.PointOfInterestType;
@@ -30,15 +29,15 @@
     * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask;run(Ljava/util/function/Predicate;Lnet/minecraft/entity/ai/brain/MemoryModuleType;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
    public static TaskControl<LivingEntity> run(Predicate<Holder<PointOfInterestType>> predicate, MemoryModuleType<GlobalPos> pos) {
-      return C_rcqaryar.m_elxiakeb(arg2 -> arg2.group(arg2.m_qgrmwbxe(pos)).apply(arg2, arg2x -> (world, arg4, l) -> {
-               GlobalPos lv = arg2.m_gcuzwcid(arg2x);
+      return TaskBuilder.task(arg2 -> arg2.group(arg2.presentMemory(pos)).apply(arg2, arg2x -> (world, arg4, l) -> {
+               GlobalPos lv = arg2.getValue(arg2x);
                BlockPos lv2 = lv.getPos();
                if (world.getRegistryKey() == lv.getDimension() && lv2.isCenterWithinDistance(arg4.getPos(), 16.0)) {
                   ServerWorld lv3 = world.getServer().getWorld(lv.getDimension());
                   if (lv3 == null || !lv3.getPointOfInterestStorage().test(lv2, predicate)) {
-                     arg2x.m_gfsxfard();
+                     arg2x.forget();
                   } else if (isBedOccupiedByOthers(lv3, lv2, arg4)) {
-                     arg2x.m_gfsxfard();
+                     arg2x.forget();
                      world.getPointOfInterestStorage().releaseTicket(lv2);
                      DebugInfoSender.sendPointOfInterest(world, lv2);
                   }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/ForgetTask.java namedSrc/net/minecraft/entity/ai/brain/task/ForgetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/ForgetTask.java	2024-03-27 00:01:40.060020230 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/ForgetTask.java	2024-03-27 00:00:30.959553104 +0000
@@ -3,7 +3,6 @@
 import java.util.function.Predicate;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_xfnsqgyk}
@@ -15,9 +14,9 @@
     * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/ForgetTask;run(Ljava/util/function/Predicate;Lnet/minecraft/entity/ai/brain/MemoryModuleType;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
    public static <E extends LivingEntity> TaskControl<E> run(Predicate<E> predicate, MemoryModuleType<?> run) {
-      return C_rcqaryar.m_elxiakeb(arg2 -> arg2.group(arg2.m_qgrmwbxe(run)).apply(arg2, argx -> (world, arg3, l) -> {
+      return TaskBuilder.task(arg2 -> arg2.group(arg2.presentMemory(run)).apply(arg2, argx -> (world, arg3, l) -> {
                if (predicate.test(arg3)) {
-                  argx.m_gfsxfard();
+                  argx.forget();
                   return true;
                } else {
                   return false;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/GiveItemsToTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/GiveItemsToTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/GiveItemsToTargetTask.java	2024-03-27 00:01:39.960019554 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GiveItemsToTargetTask.java	2024-03-27 00:00:30.863552430 +0000
@@ -105,7 +105,7 @@
             if (!lv2.isEmpty()) {
                throwItemStackToEntity(entity, lv2, getThrowPosition(lv));
                if (entity instanceof AllayEntity lv3) {
-                  AllayBrain.m_rydiwjxl(lv3).ifPresent(player -> this.m_ofxcaqzz(lv, lv2, player));
+                  AllayBrain.m_rydiwjxl(lv3).ifPresent(player -> this.triggerDropItemOnBlock(lv, lv2, player));
                }
 
                entity.getBrain().remember(MemoryModuleType.ITEM_PICKUP_COOLDOWN_TICKS, 60);
@@ -116,9 +116,9 @@
 
    /**
     * @mapping {@literal hashed m_ofxcaqzz Lnet/minecraft/unmapped/C_swaljdod;m_ofxcaqzz(Lnet/minecraft/unmapped/C_upikatuq;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_mxrobsgg;)V}
-    * @mapping {@literal named m_ofxcaqzz Lnet/minecraft/entity/ai/brain/task/GiveItemsToTargetTask;m_ofxcaqzz(Lnet/minecraft/entity/ai/brain/LookTarget;Lnet/minecraft/item/ItemStack;Lnet/minecraft/server/network/ServerPlayerEntity;)V}
+    * @mapping {@literal named triggerDropItemOnBlock Lnet/minecraft/entity/ai/brain/task/GiveItemsToTargetTask;triggerDropItemOnBlock(Lnet/minecraft/entity/ai/brain/LookTarget;Lnet/minecraft/item/ItemStack;Lnet/minecraft/server/network/ServerPlayerEntity;)V}
     */
-   private void m_ofxcaqzz(LookTarget target, ItemStack stack, ServerPlayerEntity player) {
+   private void triggerDropItemOnBlock(LookTarget target, ItemStack stack, ServerPlayerEntity player) {
       BlockPos lv = target.getBlockPos().down();
       Criteria.ALLAY_DROP_ITEM_ON_BLOCK.trigger(player, lv, stack);
    }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.java namedSrc/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.java	2024-03-27 00:01:40.108020553 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.java	2024-03-27 00:00:31.011553469 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.WalkTarget;
 import net.minecraft.entity.mob.PathAwareEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.dynamic.GlobalPos;
 import net.minecraft.util.math.Vec3d;
 import org.apache.commons.lang3.mutable.MutableLong;
@@ -34,20 +33,21 @@
 
    /**
     * @mapping {@literal hashed m_alpmpfvp Lnet/minecraft/unmapped/C_brehefpy;m_alpmpfvp(Lnet/minecraft/unmapped/C_vbbyoqyw;FI)Lnet/minecraft/unmapped/C_yfpegcpm;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/GoToIfNearbyTask;run(Lnet/minecraft/entity/ai/brain/MemoryModuleType;FI)Lnet/minecraft/entity/ReportingTaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/GoToIfNearbyTask;create(Lnet/minecraft/entity/ai/brain/MemoryModuleType;FI)Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static ReportingTaskControl<PathAwareEntity> run(MemoryModuleType<GlobalPos> pos, float f, int i) {
+   public static ReportingTaskControl<PathAwareEntity> create(MemoryModuleType<GlobalPos> pos, float walkSpeed, int maxDistance) {
       MutableLong mutableLong = new MutableLong(0L);
-      return C_rcqaryar.m_elxiakeb(
-         arg2 -> arg2.group(arg2.m_mzwocaxv(MemoryModuleType.WALK_TARGET), arg2.m_qgrmwbxe(pos)).apply(arg2, (arg2x, arg3) -> (world, arg5, l) -> {
-                  GlobalPos lv = arg2.m_gcuzwcid(arg3);
-                  if (world.getRegistryKey() != lv.getDimension() || !lv.getPos().isCenterWithinDistance(arg5.getPos(), (double)i)) {
+      return TaskBuilder.task(
+         instance -> instance.group(instance.registeredMemory(MemoryModuleType.WALK_TARGET), instance.presentMemory(pos))
+               .apply(instance, (arg2, arg3) -> (world, arg5, l) -> {
+                     GlobalPos lv = instance.getValue(arg3);
+                     if (world.getRegistryKey() != lv.getDimension() || !lv.getPos().isCenterWithinDistance(arg5.getPos(), (double)maxDistance)) {
                      return false;
                   } else if (l <= mutableLong.getValue()) {
                      return true;
                   } else {
                      Optional<Vec3d> optional = Optional.ofNullable(FuzzyTargeting.find(arg5, 8, 6));
-                     arg2x.m_bczdgokz(optional.map(argxxx -> new WalkTarget(argxxx, f, 1)));
+                        arg2.remember(optional.map(argxxx -> new WalkTarget(argxxx, walkSpeed, 1)));
                      mutableLong.setValue(l + 180L);
                      return true;
                   }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.java namedSrc/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.java	2024-03-27 00:01:39.832018691 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.java	2024-03-27 00:00:30.719551420 +0000
@@ -3,7 +3,6 @@
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.WalkTarget;
 import net.minecraft.entity.mob.PathAwareEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.dynamic.GlobalPos;
 import org.apache.commons.lang3.mutable.MutableLong;
 
@@ -16,17 +15,18 @@
     * @mapping {@literal hashed m_ivikwldh Lnet/minecraft/unmapped/C_ozzddznn;m_ivikwldh(Lnet/minecraft/unmapped/C_vbbyoqyw;FII)Lnet/minecraft/unmapped/C_mdnathub;}
     * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/GoToNearbyPositionTask;run(Lnet/minecraft/entity/ai/brain/MemoryModuleType;FII)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<PathAwareEntity> run(MemoryModuleType<GlobalPos> pos, float f, int i, int j) {
+   public static TaskControl<PathAwareEntity> run(MemoryModuleType<GlobalPos> pos, float speed, int completionRange, int maxDistance) {
       MutableLong mutableLong = new MutableLong(0L);
-      return C_rcqaryar.m_elxiakeb(
-         arg2 -> arg2.group(arg2.m_mzwocaxv(MemoryModuleType.WALK_TARGET), arg2.m_qgrmwbxe(pos)).apply(arg2, (arg2x, arg3) -> (world, arg5, l) -> {
-                  GlobalPos lv = arg2.m_gcuzwcid(arg3);
-                  if (world.getRegistryKey() != lv.getDimension() || !lv.getPos().isCenterWithinDistance(arg5.getPos(), (double)j)) {
+      return TaskBuilder.task(
+         instance -> instance.group(instance.registeredMemory(MemoryModuleType.WALK_TARGET), instance.presentMemory(pos))
+               .apply(instance, (arg2, arg3) -> (world, arg5, l) -> {
+                     GlobalPos lv = instance.getValue(arg3);
+                     if (world.getRegistryKey() != lv.getDimension() || !lv.getPos().isCenterWithinDistance(arg5.getPos(), (double)maxDistance)) {
                      return false;
                   } else if (l <= mutableLong.getValue()) {
                      return true;
                   } else {
-                     arg2x.m_klbizcog(new WalkTarget(lv.getPos(), f, i));
+                        arg2.remember(new WalkTarget(lv.getPos(), speed, completionRange));
                      mutableLong.setValue(l + 80L);
                      return true;
                   }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.java namedSrc/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.java	2024-03-27 00:01:40.016019933 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.java	2024-03-27 00:00:30.927552879 +0000
@@ -4,7 +4,6 @@
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.WalkTarget;
 import net.minecraft.entity.passive.VillagerEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkSectionPos;
 import net.minecraft.util.math.Vec3d;
@@ -17,10 +16,10 @@
 public class GoToPointOfInterestTask {
    /**
     * @mapping {@literal hashed m_uxiprkky Lnet/minecraft/unmapped/C_aofhkhvj;m_uxiprkky(FI)Lnet/minecraft/unmapped/C_mdnathub;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/GoToPointOfInterestTask;run(FI)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/GoToPointOfInterestTask;create(FI)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<VillagerEntity> run(float f, int i) {
-      return C_rcqaryar.m_elxiakeb(arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.WALK_TARGET)).apply(arg, argx -> (world, arg3, l) -> {
+   public static TaskControl<VillagerEntity> create(float speed, int completionRange) {
+      return TaskBuilder.task(arg -> arg.group(arg.absentMemory(MemoryModuleType.WALK_TARGET)).apply(arg, argx -> (world, arg3, l) -> {
                if (world.isNearOccupiedPointOfInterest(arg3.getBlockPos())) {
                   return false;
                } else {
@@ -44,7 +43,7 @@
                   }
 
                   if (lv2 != null) {
-                     argx.m_klbizcog(new WalkTarget(lv2, f, i));
+                     argx.remember(new WalkTarget(lv2, speed, completionRange));
                   }
 
                   return true;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/GoToRememberedPositionTask.java namedSrc/net/minecraft/entity/ai/brain/task/GoToRememberedPositionTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/GoToRememberedPositionTask.java	2024-03-27 00:01:40.052020175 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GoToRememberedPositionTask.java	2024-03-27 00:00:30.947553019 +0000
@@ -8,7 +8,6 @@
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.WalkTarget;
 import net.minecraft.entity.mob.PathAwareEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 
@@ -22,7 +21,7 @@
     * @mapping {@literal named toBlock Lnet/minecraft/entity/ai/brain/task/GoToRememberedPositionTask;toBlock(Lnet/minecraft/entity/ai/brain/MemoryModuleType;FIZ)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
    public static TaskControl<PathAwareEntity> toBlock(MemoryModuleType<BlockPos> memoryType, float speed, int range, boolean requiresWalkTarget) {
-      return run(memoryType, speed, range, requiresWalkTarget, Vec3d::ofBottomCenter);
+      return create(memoryType, speed, range, requiresWalkTarget, Vec3d::ofBottomCenter);
    }
 
    /**
@@ -32,26 +31,29 @@
    public static ReportingTaskControl<PathAwareEntity> toEntity(
       MemoryModuleType<? extends Entity> memoryType, float speed, int range, boolean requiresWalkTarget
    ) {
-      return run(memoryType, speed, range, requiresWalkTarget, Entity::getPos);
+      return create(memoryType, speed, range, requiresWalkTarget, Entity::getPos);
    }
 
    /**
     * @mapping {@literal hashed m_jyuzurxd Lnet/minecraft/unmapped/C_htymbopt;m_jyuzurxd(Lnet/minecraft/unmapped/C_vbbyoqyw;FIZLjava/util/function/Function;)Lnet/minecraft/unmapped/C_yfpegcpm;}
-    * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/GoToRememberedPositionTask;run(Lnet/minecraft/entity/ai/brain/MemoryModuleType;FIZLjava/util/function/Function;)Lnet/minecraft/entity/ReportingTaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/GoToRememberedPositionTask;create(Lnet/minecraft/entity/ai/brain/MemoryModuleType;FIZLjava/util/function/Function;)Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   private static <T> ReportingTaskControl<PathAwareEntity> run(MemoryModuleType<T> arg, float f, int i, boolean bl, Function<T, Vec3d> function) {
-      return C_rcqaryar.m_elxiakeb(
-         arg2 -> arg2.group(arg2.m_mzwocaxv(MemoryModuleType.WALK_TARGET), arg2.m_qgrmwbxe(arg)).apply(arg2, (arg2x, arg3) -> (world, arg5, l) -> {
-                  Optional<WalkTarget> optional = arg2.m_oxjxfuhs(arg2x);
-                  if (optional.isPresent() && !bl) {
+   private static <T> ReportingTaskControl<PathAwareEntity> create(
+      MemoryModuleType<T> memoryType, float speed, int range, boolean requiresWalkTarget, Function<T, Vec3d> targetPositionGetter
+   ) {
+      return TaskBuilder.task(
+         instance -> instance.group(instance.registeredMemory(MemoryModuleType.WALK_TARGET), instance.presentMemory(memoryType))
+               .apply(instance, (arg2, arg3) -> (world, arg5, l) -> {
+                     Optional<WalkTarget> optional = instance.getValueOptional(arg2);
+                     if (optional.isPresent() && !requiresWalkTarget) {
                      return false;
                   } else {
                      Vec3d lv = arg5.getPos();
-                     Vec3d lv2 = (Vec3d)function.apply(arg2.m_gcuzwcid(arg3));
-                     if (!lv.withinRange(lv2, (double)i)) {
+                        Vec3d lv2 = (Vec3d)targetPositionGetter.apply(instance.getValue(arg3));
+                        if (!lv.withinRange(lv2, (double)range)) {
                         return false;
                      } else {
-                        if (optional.isPresent() && ((WalkTarget)optional.get()).getSpeed() == f) {
+                           if (optional.isPresent() && ((WalkTarget)optional.get()).getSpeed() == speed) {
                            Vec3d lv3 = ((WalkTarget)optional.get()).getLookTarget().getPos().subtract(lv);
                            Vec3d lv4 = lv2.subtract(lv);
                            if (lv3.dotProduct(lv4) < 0.0) {
@@ -62,7 +64,7 @@
                         for (int j = 0; j < 10; j++) {
                            Vec3d lv5 = FuzzyTargeting.findFrom(arg5, 16, 7, lv2);
                            if (lv5 != null) {
-                              arg2x.m_klbizcog(new WalkTarget(lv5, f, 0));
+                                 arg2.remember(new WalkTarget(lv5, speed, 0));
                               break;
                            }
                         }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/GoToSecondaryPositionTask.java namedSrc/net/minecraft/entity/ai/brain/task/GoToSecondaryPositionTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/GoToSecondaryPositionTask.java	2024-03-27 00:01:40.104020526 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GoToSecondaryPositionTask.java	2024-03-27 00:00:31.011553469 +0000
@@ -4,7 +4,6 @@
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.WalkTarget;
 import net.minecraft.entity.passive.VillagerEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.dynamic.GlobalPos;
 import org.apache.commons.lang3.mutable.MutableLong;
 
@@ -14,22 +13,33 @@
  */
 public class GoToSecondaryPositionTask {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jdsyhtbe Lnet/minecraft/unmapped/C_klqpupjq;m_jdsyhtbe(Lnet/minecraft/unmapped/C_vbbyoqyw;FIILnet/minecraft/unmapped/C_vbbyoqyw;)Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/GoToSecondaryPositionTask;create(Lnet/minecraft/entity/ai/brain/MemoryModuleType;FIILnet/minecraft/entity/ai/brain/MemoryModuleType;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<VillagerEntity> m_jdsyhtbe(MemoryModuleType<List<GlobalPos>> arg, float f, int i, int j, MemoryModuleType<GlobalPos> arg2) {
+   public static TaskControl<VillagerEntity> create(
+      MemoryModuleType<List<GlobalPos>> secondaryPositions,
+      float speed,
+      int completionRange,
+      int primaryPositionActivationDistance,
+      MemoryModuleType<GlobalPos> primaryPosition
+   ) {
       MutableLong mutableLong = new MutableLong(0L);
-      return C_rcqaryar.m_elxiakeb(
-         arg3 -> arg3.group(arg3.m_mzwocaxv(MemoryModuleType.WALK_TARGET), arg3.m_qgrmwbxe(arg), arg3.m_qgrmwbxe(arg2))
-               .apply(arg3, (arg2xx, arg3x, arg4) -> (world, arg6, l) -> {
-                     List<GlobalPos> list = arg3.m_gcuzwcid(arg3x);
-                     GlobalPos lv = arg3.m_gcuzwcid(arg4);
+      return TaskBuilder.task(
+         arg3 -> arg3.group(arg3.registeredMemory(MemoryModuleType.WALK_TARGET), arg3.presentMemory(secondaryPositions), arg3.presentMemory(primaryPosition))
+               .apply(
+                  arg3,
+                  (arg2x, arg3x, arg4) -> (world, arg6, l) -> {
+                        List<GlobalPos> list = arg3.getValue(arg3x);
+                        GlobalPos lv = arg3.getValue(arg4);
                      if (list.isEmpty()) {
                         return false;
                      } else {
                         GlobalPos lv2 = (GlobalPos)list.get(world.getRandom().nextInt(list.size()));
-                        if (lv2 != null && world.getRegistryKey() == lv2.getDimension() && lv.getPos().isCenterWithinDistance(arg6.getPos(), (double)j)) {
+                           if (lv2 != null
+                              && world.getRegistryKey() == lv2.getDimension()
+                              && lv.getPos().isCenterWithinDistance(arg6.getPos(), (double)primaryPositionActivationDistance)) {
                            if (l > mutableLong.getValue()) {
-                              arg2xx.m_klbizcog(new WalkTarget(lv2.getPos(), f, i));
+                                 arg2x.remember(new WalkTarget(lv2.getPos(), speed, completionRange));
                               mutableLong.setValue(l + 100L);
                            }
       
@@ -38,7 +48,8 @@
                            return false;
                         }
                      }
-                  })
+                     }
+               )
       );
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/GoTowardsLookTarget.java namedSrc/net/minecraft/entity/ai/brain/task/GoTowardsLookTarget.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/GoTowardsLookTarget.java	2024-03-27 00:01:39.960019554 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GoTowardsLookTarget.java	2024-03-27 00:00:30.863552430 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.entity.ReportingTaskControl;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.WalkTarget;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_iyiccpwt}
@@ -14,23 +13,27 @@
  */
 public class GoTowardsLookTarget {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ftybsvym Lnet/minecraft/unmapped/C_iyiccpwt;m_ftybsvym(FI)Lnet/minecraft/unmapped/C_yfpegcpm;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/GoTowardsLookTarget;create(FI)Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static ReportingTaskControl<LivingEntity> m_ftybsvym(float f, int i) {
-      return m_dgrcrase(arg -> true, arg -> f, i);
+   public static ReportingTaskControl<LivingEntity> create(float speed, int completionRange) {
+      return create(arg -> true, arg -> speed, completionRange);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dgrcrase Lnet/minecraft/unmapped/C_iyiccpwt;m_dgrcrase(Ljava/util/function/Predicate;Ljava/util/function/Function;I)Lnet/minecraft/unmapped/C_yfpegcpm;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/GoTowardsLookTarget;create(Ljava/util/function/Predicate;Ljava/util/function/Function;I)Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static ReportingTaskControl<LivingEntity> m_dgrcrase(Predicate<LivingEntity> predicate, Function<LivingEntity, Float> function, int i) {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.WALK_TARGET), arg.m_qgrmwbxe(MemoryModuleType.LOOK_TARGET))
+   public static ReportingTaskControl<LivingEntity> create(
+      Predicate<LivingEntity> predicate, Function<LivingEntity, Float> entitySpeedGetter, int completionRange
+   ) {
+      return TaskBuilder.task(
+         arg -> arg.group(arg.absentMemory(MemoryModuleType.WALK_TARGET), arg.presentMemory(MemoryModuleType.LOOK_TARGET))
                .apply(arg, (arg2, arg3) -> (world, arg5, l) -> {
                      if (!predicate.test(arg5)) {
                         return false;
                      } else {
-                        arg2.m_klbizcog(new WalkTarget(arg.m_gcuzwcid(arg3), (Float)function.apply(arg5), i));
+                        arg2.remember(new WalkTarget(arg.getValue(arg3), (Float)entitySpeedGetter.apply(arg5), completionRange));
                         return true;
                      }
                   })
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/GoToWorkTask.java namedSrc/net/minecraft/entity/ai/brain/task/GoToWorkTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/GoToWorkTask.java	2024-03-27 00:01:39.988019744 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GoToWorkTask.java	2024-03-27 00:00:30.891552627 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.entity.passive.VillagerEntity;
 import net.minecraft.registry.Registries;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.dynamic.GlobalPos;
 import net.minecraft.village.VillagerProfession;
 
@@ -16,20 +15,21 @@
  */
 public class GoToWorkTask {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_tnlvczom Lnet/minecraft/unmapped/C_gklwpqcg;m_tnlvczom()Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/GoToWorkTask;create()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<VillagerEntity> m_tnlvczom() {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.POTENTIAL_JOB_SITE), arg.m_mzwocaxv(MemoryModuleType.JOB_SITE))
+   public static TaskControl<VillagerEntity> create() {
+      return TaskBuilder.task(
+         instance -> instance.group(instance.presentMemory(MemoryModuleType.POTENTIAL_JOB_SITE), instance.registeredMemory(MemoryModuleType.JOB_SITE))
                .apply(
-                  arg,
+                  instance,
                   (arg2, arg3) -> (world, arg5, l) -> {
-                        GlobalPos lv = arg.m_gcuzwcid(arg2);
+                        GlobalPos lv = instance.getValue(arg2);
                         if (!lv.getPos().isCenterWithinDistance(arg5.getPos(), 2.0) && !arg5.isNatural()) {
                            return false;
                         } else {
-                           arg2.m_gfsxfard();
-                           arg3.m_klbizcog(lv);
+                           arg2.forget();
+                           arg3.remember(lv);
                            world.sendEntityStatus(arg5, EntityStatuses.ADD_VILLAGER_HAPPY_PARTICLES);
                            if (arg5.getVillagerData().getProfession() != VillagerProfession.NONE) {
                               return true;
@@ -37,7 +37,7 @@
                               MinecraftServer minecraftServer = world.getServer();
                               Optional.ofNullable(minecraftServer.getWorld(lv.getDimension()))
                                  .flatMap(worldx -> worldx.getPointOfInterestStorage().getType(lv.getPos()))
-                                 .flatMap(argxxx -> Registries.VILLAGER_PROFESSION.stream().filter(arg2xx -> arg2xx.heldJobSite().test(argxxx)).findFirst())
+                                 .flatMap(argxx -> Registries.VILLAGER_PROFESSION.stream().filter(arg2xx -> arg2xx.heldJobSite().test(argxx)).findFirst())
                                  .ifPresent(arg3xx -> {
                                     arg5.setVillagerData(arg5.getVillagerData().withProfession(arg3xx));
                                     arg5.reinitializeBrain(world);
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/HideInHomeTask.java namedSrc/net/minecraft/entity/ai/brain/task/HideInHomeTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/HideInHomeTask.java	2024-03-27 00:01:40.124020661 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/HideInHomeTask.java	2024-03-27 00:00:31.031553609 +0000
@@ -4,7 +4,6 @@
 import net.minecraft.entity.ReportingTaskControl;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.WalkTarget;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.dynamic.GlobalPos;
 import net.minecraft.world.poi.PointOfInterestStorage;
 import net.minecraft.world.poi.PointOfInterestTypes;
@@ -15,18 +14,19 @@
  */
 public class HideInHomeTask {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_frsalpsy Lnet/minecraft/unmapped/C_xggcofzf;m_frsalpsy(IFI)Lnet/minecraft/unmapped/C_yfpegcpm;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/HideInHomeTask;create(IFI)Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static ReportingTaskControl<LivingEntity> m_frsalpsy(int i, float f, int j) {
-      return C_rcqaryar.m_elxiakeb(
+   public static ReportingTaskControl<LivingEntity> create(int maxDistance, float speed, int preferredDistance) {
+      return TaskBuilder.task(
          arg -> arg.group(
-                  arg.m_owejzxbp(MemoryModuleType.WALK_TARGET),
-                  arg.m_mzwocaxv(MemoryModuleType.HOME),
-                  arg.m_mzwocaxv(MemoryModuleType.HIDING_PLACE),
-                  arg.m_mzwocaxv(MemoryModuleType.PATH),
-                  arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
-                  arg.m_mzwocaxv(MemoryModuleType.BREED_TARGET),
-                  arg.m_mzwocaxv(MemoryModuleType.INTERACTION_TARGET)
+                  arg.absentMemory(MemoryModuleType.WALK_TARGET),
+                  arg.registeredMemory(MemoryModuleType.HOME),
+                  arg.registeredMemory(MemoryModuleType.HIDING_PLACE),
+                  arg.registeredMemory(MemoryModuleType.PATH),
+                  arg.registeredMemory(MemoryModuleType.LOOK_TARGET),
+                  arg.registeredMemory(MemoryModuleType.BREED_TARGET),
+                  arg.registeredMemory(MemoryModuleType.INTERACTION_TARGET)
                )
                .apply(
                   arg,
@@ -36,10 +36,10 @@
                               argxxx -> argxxx.isRegistryKey(PointOfInterestTypes.HOME),
                               pos -> true,
                               arg10.getBlockPos(),
-                              j + 1,
+                              preferredDistance + 1,
                               PointOfInterestStorage.OccupationStatus.ANY
                            )
-                           .filter(pos -> pos.isCenterWithinDistance(arg10.getPos(), (double)j))
+                           .filter(pos -> pos.isCenterWithinDistance(arg10.getPos(), (double)preferredDistance))
                            .or(
                               () -> world.getPointOfInterestStorage()
                                     .getPosition(
@@ -47,19 +47,19 @@
                                        pos -> true,
                                        PointOfInterestStorage.OccupationStatus.ANY,
                                        arg10.getBlockPos(),
-                                       i,
+                                       maxDistance,
                                        arg10.getRandom()
                                     )
                            )
-                           .or(() -> arg.m_oxjxfuhs(arg3).map(GlobalPos::getPos))
+                           .or(() -> arg.getValueOptional(arg3).map(GlobalPos::getPos))
                            .ifPresent(pos -> {
-                              arg5.m_gfsxfard();
-                              arg6.m_gfsxfard();
-                              arg7.m_gfsxfard();
-                              arg8.m_gfsxfard();
-                              arg4.m_klbizcog(GlobalPos.create(world.getRegistryKey(), pos));
-                              if (!pos.isCenterWithinDistance(arg10.getPos(), (double)j)) {
-                                 arg2.m_klbizcog(new WalkTarget(pos, f, j));
+                              arg5.forget();
+                              arg6.forget();
+                              arg7.forget();
+                              arg8.forget();
+                              arg4.remember(GlobalPos.create(world.getRegistryKey(), pos));
+                              if (!pos.isCenterWithinDistance(arg10.getPos(), (double)preferredDistance)) {
+                                 arg2.remember(new WalkTarget(pos, speed, preferredDistance));
                               }
                            });
                         return true;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/HideWhenBellRingsTask.java namedSrc/net/minecraft/entity/ai/brain/task/HideWhenBellRingsTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/HideWhenBellRingsTask.java	2024-03-27 00:01:40.004019852 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/HideWhenBellRingsTask.java	2024-03-27 00:00:30.911552766 +0000
@@ -3,7 +3,6 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.Activity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.village.raid.Raid;
 
 /**
@@ -12,10 +11,11 @@
  */
 public class HideWhenBellRingsTask {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wtgzjqff Lnet/minecraft/unmapped/C_mqkwrleq;m_wtgzjqff()Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/HideWhenBellRingsTask;create()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<LivingEntity> m_wtgzjqff() {
-      return C_rcqaryar.m_elxiakeb(arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.HEARD_BELL_TIME)).apply(arg, argx -> (world, arg2, l) -> {
+   public static TaskControl<LivingEntity> create() {
+      return TaskBuilder.task(instance -> instance.group(instance.presentMemory(MemoryModuleType.HEARD_BELL_TIME)).apply(instance, arg -> (world, arg2, l) -> {
                Raid lv = world.getRaidAt(arg2.getBlockPos());
                if (lv == null) {
                   arg2.getBrain().doExclusively(Activity.HIDE);
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.java namedSrc/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.java	2024-03-27 00:01:39.880019015 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.java	2024-03-27 00:00:30.775551812 +0000
@@ -184,7 +184,7 @@
     * @mapping {@literal named holdNothing Lnet/minecraft/entity/ai/brain/task/HoldTradeOffersTask;holdNothing(Lnet/minecraft/entity/passive/VillagerEntity;)V}
     */
    private static void holdNothing(VillagerEntity villager) {
-      villager.m_kzhoqled(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
+      villager.equipStack(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
       villager.setEquipmentDropChance(EquipmentSlot.MAINHAND, 0.085F);
    }
 
@@ -193,7 +193,7 @@
     * @mapping {@literal named holdOffer Lnet/minecraft/entity/ai/brain/task/HoldTradeOffersTask;holdOffer(Lnet/minecraft/entity/passive/VillagerEntity;Lnet/minecraft/item/ItemStack;)V}
     */
    private static void holdOffer(VillagerEntity villager, ItemStack stack) {
-      villager.m_kzhoqled(EquipmentSlot.MAINHAND, stack);
+      villager.equipStack(EquipmentSlot.MAINHAND, stack);
       villager.setEquipmentDropChance(EquipmentSlot.MAINHAND, 0.0F);
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/HuntFinishTask.java namedSrc/net/minecraft/entity/ai/brain/task/HuntFinishTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/HuntFinishTask.java	2024-03-27 00:01:40.088020418 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/HuntFinishTask.java	2024-03-27 00:00:30.991553328 +0000
@@ -4,7 +4,6 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.mob.PiglinBrain;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_eijgiivc}
@@ -12,15 +11,16 @@
  */
 public class HuntFinishTask {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_miccftlt Lnet/minecraft/unmapped/C_eijgiivc;m_miccftlt()Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/HuntFinishTask;create()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<LivingEntity> m_miccftlt() {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.ATTACK_TARGET), arg.m_mzwocaxv(MemoryModuleType.HUNTED_RECENTLY))
-               .apply(arg, (arg2, arg3) -> (world, arg5, l) -> {
-                     LivingEntity lv = arg.m_gcuzwcid(arg2);
+   public static TaskControl<LivingEntity> create() {
+      return TaskBuilder.task(
+         instance -> instance.group(instance.presentMemory(MemoryModuleType.ATTACK_TARGET), instance.registeredMemory(MemoryModuleType.HUNTED_RECENTLY))
+               .apply(instance, (arg2, arg3) -> (world, arg5, l) -> {
+                     LivingEntity lv = instance.getValue(arg2);
                      if (lv.getType() == EntityType.HOGLIN && lv.isDead()) {
-                        arg3.m_zjdztcmb(true, (long)PiglinBrain.HUNT_MEMORY_DURATION.get(arg5.getWorld().random));
+                        arg3.remember(true, (long)PiglinBrain.HUNT_MEMORY_DURATION.get(arg5.getWorld().random));
                      }
       
                      return true;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/HuntHoglinTask.java namedSrc/net/minecraft/entity/ai/brain/task/HuntHoglinTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/HuntHoglinTask.java	2024-03-27 00:01:39.888019068 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/HuntHoglinTask.java	2024-03-27 00:00:30.787551897 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.entity.mob.HoglinEntity;
 import net.minecraft.entity.mob.PiglinBrain;
 import net.minecraft.entity.mob.PiglinEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_lsxdngih}
@@ -14,23 +13,26 @@
  */
 public class HuntHoglinTask {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lfndeqov Lnet/minecraft/unmapped/C_lsxdngih;m_lfndeqov()Lnet/minecraft/unmapped/C_yfpegcpm;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/HuntHoglinTask;create()Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static ReportingTaskControl<PiglinEntity> m_lfndeqov() {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(
-                  arg.m_qgrmwbxe(MemoryModuleType.NEAREST_VISIBLE_HUNTABLE_HOGLIN),
-                  arg.m_owejzxbp(MemoryModuleType.ANGRY_AT),
-                  arg.m_owejzxbp(MemoryModuleType.HUNTED_RECENTLY),
-                  arg.m_mzwocaxv(MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLINS)
+   public static ReportingTaskControl<PiglinEntity> create() {
+      return TaskBuilder.task(
+         instance -> instance.group(
+                  instance.presentMemory(MemoryModuleType.NEAREST_VISIBLE_HUNTABLE_HOGLIN),
+                  instance.absentMemory(MemoryModuleType.ANGRY_AT),
+                  instance.absentMemory(MemoryModuleType.HUNTED_RECENTLY),
+                  instance.registeredMemory(MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLINS)
                )
-               .apply(arg, (arg2, arg3, arg4, arg5) -> (world, arg5x, l) -> {
-                     if (!arg5x.isBaby() && !arg.m_oxjxfuhs(arg5).map(list -> list.stream().anyMatch(HuntHoglinTask::m_mtjtzise)).isPresent()) {
-                        HoglinEntity lv = arg.m_gcuzwcid(arg2);
+               .apply(instance, (arg2, arg3, arg4, arg5) -> (world, arg5x, l) -> {
+                     if (!arg5x.isBaby() && !instance.getValueOptional(arg5).map(list -> list.stream().anyMatch(HuntHoglinTask::hasHuntedRecently)).isPresent()
+                        )
+                      {
+                        HoglinEntity lv = instance.getValue(arg2);
                         PiglinBrain.becomeAngryWith(arg5x, lv);
                         PiglinBrain.rememberHunting(arg5x);
                         PiglinBrain.angerAtCloserTargets(arg5x, lv);
-                        arg.m_oxjxfuhs(arg5).ifPresent(list -> list.forEach(PiglinBrain::rememberHunting));
+                        instance.getValueOptional(arg5).ifPresent(list -> list.forEach(PiglinBrain::rememberHunting));
                         return true;
                      } else {
                         return false;
@@ -40,9 +42,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mtjtzise Lnet/minecraft/unmapped/C_lsxdngih;m_mtjtzise(Lnet/minecraft/unmapped/C_imddhoxf;)Z}
+    * @mapping {@literal named hasHuntedRecently Lnet/minecraft/entity/ai/brain/task/HuntHoglinTask;hasHuntedRecently(Lnet/minecraft/entity/mob/AbstractPiglinEntity;)Z}
     */
-   private static boolean m_mtjtzise(AbstractPiglinEntity arg) {
-      return arg.getBrain().hasMemoryModule(MemoryModuleType.HUNTED_RECENTLY);
+   private static boolean hasHuntedRecently(AbstractPiglinEntity piglin) {
+      return piglin.getBrain().hasMemoryModule(MemoryModuleType.HUNTED_RECENTLY);
    }
 }

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/InvestigateDisturbanceTask.java namedSrc/net/minecraft/entity/ai/brain/task/InvestigateDisturbanceTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/InvestigateDisturbanceTask.java	2024-03-27 00:01:39.888019068 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/InvestigateDisturbanceTask.java	2024-03-27 00:00:30.787551897 +0000
@@ -3,7 +3,6 @@
 import net.minecraft.entity.ReportingTaskControl;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.mob.MobEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.random.RandomGenerator;
 
@@ -30,21 +29,22 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_avcbdjof Lnet/minecraft/unmapped/C_uzxeblbb;m_avcbdjof(Lnet/minecraft/unmapped/C_vbbyoqyw;IF)Lnet/minecraft/unmapped/C_yfpegcpm;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/InvestigateDisturbanceTask;create(Lnet/minecraft/entity/ai/brain/MemoryModuleType;IF)Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static <E extends MobEntity> ReportingTaskControl<E> m_avcbdjof(MemoryModuleType<BlockPos> arg, int i, float f) {
-      return C_rcqaryar.m_elxiakeb(
-         arg2 -> arg2.group(
-                  arg2.m_qgrmwbxe(arg),
-                  arg2.m_owejzxbp(MemoryModuleType.ATTACK_TARGET),
-                  arg2.m_owejzxbp(MemoryModuleType.WALK_TARGET),
-                  arg2.m_mzwocaxv(MemoryModuleType.LOOK_TARGET)
+   public static <E extends MobEntity> ReportingTaskControl<E> create(MemoryModuleType<BlockPos> pos, int completionRange, float speed) {
+      return TaskBuilder.task(
+         instance -> instance.group(
+                  instance.presentMemory(pos),
+                  instance.absentMemory(MemoryModuleType.ATTACK_TARGET),
+                  instance.absentMemory(MemoryModuleType.WALK_TARGET),
+                  instance.registeredMemory(MemoryModuleType.LOOK_TARGET)
                )
-               .apply(arg2, (arg2x, arg3, arg4, arg5) -> (world, arg4x, l) -> {
-                     BlockPos lv = arg2.m_gcuzwcid(arg2x);
-                     boolean bl = lv.isWithinDistance(arg4x.getBlockPos(), (double)i);
+               .apply(instance, (arg2, arg3, arg4, arg5) -> (world, arg4x, l) -> {
+                     BlockPos lv = instance.getValue(arg2);
+                     boolean bl = lv.isWithinDistance(arg4x.getBlockPos(), (double)completionRange);
                      if (!bl) {
-                        LookTargetUtil.walkTowards(arg4x, getVibrationDisturbancePosition(arg4x, lv), f, i);
+                        LookTargetUtil.walkTowards(arg4x, getVibrationDisturbancePosition(arg4x, lv), speed, completionRange);
                      }
       
                      return true;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/LayFrogSpawnTask.java namedSrc/net/minecraft/entity/ai/brain/task/LayFrogSpawnTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/LayFrogSpawnTask.java	2024-03-27 00:01:40.120020634 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/LayFrogSpawnTask.java	2024-03-27 00:00:31.023553552 +0000
@@ -7,7 +7,6 @@
 import net.minecraft.fluid.Fluids;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.event.GameEvent;
@@ -19,12 +18,14 @@
 public class LayFrogSpawnTask {
    /**
     * @mapping {@literal hashed m_rlgbgizw Lnet/minecraft/unmapped/C_eeocmegr;m_rlgbgizw(Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mdnathub;}
-    * @mapping {@literal named m_rlgbgizw Lnet/minecraft/entity/ai/brain/task/LayFrogSpawnTask;m_rlgbgizw(Lnet/minecraft/block/Block;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/LayFrogSpawnTask;create(Lnet/minecraft/block/Block;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<LivingEntity> m_rlgbgizw(Block block) {
-      return C_rcqaryar.m_elxiakeb(
+   public static TaskControl<LivingEntity> create(Block target) {
+      return TaskBuilder.task(
          arg2 -> arg2.group(
-                  arg2.m_owejzxbp(MemoryModuleType.ATTACK_TARGET), arg2.m_qgrmwbxe(MemoryModuleType.WALK_TARGET), arg2.m_qgrmwbxe(MemoryModuleType.IS_PREGNANT)
+                  arg2.absentMemory(MemoryModuleType.ATTACK_TARGET),
+                  arg2.presentMemory(MemoryModuleType.WALK_TARGET),
+                  arg2.presentMemory(MemoryModuleType.IS_PREGNANT)
                )
                .apply(
                   arg2,
@@ -38,11 +39,11 @@
                                  && world.getFluidState(lv3).isOf(Fluids.WATER)) {
                                  BlockPos lv4 = lv3.up();
                                  if (world.getBlockState(lv4).isAir()) {
-                                    BlockState lv5 = block.getDefaultState();
+                                    BlockState lv5 = target.getDefaultState();
                                     world.setBlockState(lv4, lv5, Block.NOTIFY_ALL);
                                     world.emitGameEvent(GameEvent.BLOCK_PLACE, lv4, GameEvent.Context.create(arg4x, lv5));
                                     world.playSoundFromEntity(null, arg4x, SoundEvents.ENTITY_FROG_LAY_SPAWN, SoundCategory.BLOCKS, 1.0F, 1.0F);
-                                    arg4.m_gfsxfard();
+                                    arg4.forget();
                                     return true;
                                  }
                               }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/LongJumpTask.java namedSrc/net/minecraft/entity/ai/brain/task/LongJumpTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/LongJumpTask.java	2024-03-27 00:01:39.968019609 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/LongJumpTask.java	2024-03-27 00:00:30.871552486 +0000
@@ -76,9 +76,10 @@
     */
    protected final int horizontalRange;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_casalqpe Lnet/minecraft/unmapped/C_lorklvui;f_casalqpe:F}
+    * @mapping {@literal named maxVelocityMultiplier Lnet/minecraft/entity/ai/brain/task/LongJumpTask;maxVelocityMultiplier:F}
     */
-   protected final float f_casalqpe;
+   protected final float maxVelocityMultiplier;
    /**
     * @mapping {@literal hashed f_cnpnjwkj Lnet/minecraft/unmapped/C_lorklvui;f_cnpnjwkj:Ljava/util/List;}
     * @mapping {@literal named targets Lnet/minecraft/entity/ai/brain/task/LongJumpTask;targets:Ljava/util/List;}
@@ -121,17 +122,17 @@
     * @mapping {@literal named <init> Lnet/minecraft/entity/ai/brain/task/LongJumpTask;<init>(Lnet/minecraft/util/math/int_provider/UniformIntProvider;IIFLjava/util/function/Function;)V}
     */
    public LongJumpTask(UniformIntProvider cooldownRange, int verticalRange, int horizontalRange, float maxRange, Function<E, SoundEvent> jumpSound) {
-      this(cooldownRange, verticalRange, horizontalRange, maxRange, jumpSound, LongJumpTask::m_jnajycle);
+      this(cooldownRange, verticalRange, horizontalRange, maxRange, jumpSound, LongJumpTask::canJumpTo);
    }
 
    /**
     * @mapping {@literal hashed m_jnajycle Lnet/minecraft/unmapped/C_lorklvui;m_jnajycle(Lnet/minecraft/unmapped/C_dxkfswlz;Lnet/minecraft/unmapped/C_hynzadkk;)Z}
-    * @mapping {@literal named m_jnajycle Lnet/minecraft/entity/ai/brain/task/LongJumpTask;m_jnajycle(Lnet/minecraft/entity/mob/MobEntity;Lnet/minecraft/util/math/BlockPos;)Z}
+    * @mapping {@literal named canJumpTo Lnet/minecraft/entity/ai/brain/task/LongJumpTask;canJumpTo(Lnet/minecraft/entity/mob/MobEntity;Lnet/minecraft/util/math/BlockPos;)Z}
     */
-   public static <E extends MobEntity> boolean m_jnajycle(E arg, BlockPos pos) {
-      World lv = arg.getWorld();
+   public static <E extends MobEntity> boolean canJumpTo(E entity, BlockPos pos) {
+      World lv = entity.getWorld();
       BlockPos lv2 = pos.down();
-      return lv.getBlockState(lv2).isOpaqueFullCube(lv, lv2) && arg.getPenalty(LandPathNodeMaker.m_femsgzut(arg, pos)) == 0.0F;
+      return lv.getBlockState(lv2).isOpaqueFullCube(lv, lv2) && entity.getPenalty(LandPathNodeMaker.getLandNodeType(entity, pos)) == 0.0F;
    }
 
    /**
@@ -139,7 +140,12 @@
     * @mapping {@literal named <init> Lnet/minecraft/entity/ai/brain/task/LongJumpTask;<init>(Lnet/minecraft/util/math/int_provider/UniformIntProvider;IIFLjava/util/function/Function;Ljava/util/function/BiPredicate;)V}
     */
    public LongJumpTask(
-      UniformIntProvider cooldownRange, int verticalRange, int horizontalRange, float f, Function<E, SoundEvent> jumpSound, BiPredicate<E, BlockPos> validBlock
+      UniformIntProvider cooldownRange,
+      int verticalRange,
+      int horizontalRange,
+      float maxVelocityMultiplier,
+      Function<E, SoundEvent> jumpSound,
+      BiPredicate<E, BlockPos> validBlock
    ) {
       super(
          ImmutableMap.of(
@@ -155,7 +161,7 @@
       this.cooldownRange = cooldownRange;
       this.verticalRange = verticalRange;
       this.horizontalRange = horizontalRange;
-      this.f_casalqpe = f;
+      this.maxVelocityMultiplier = maxVelocityMultiplier;
       this.jumpSound = jumpSound;
       this.validBlock = validBlock;
    }
@@ -294,7 +300,7 @@
    protected Vec3d getRammingVelocity(MobEntity entity, Vec3d pos) {
       List<Integer> list = Lists.<Integer>newArrayList(RAMMING_VELOCITIES);
       Collections.shuffle(list);
-      float f = (float)(entity.getAttributeValue(EntityAttributes.GENERIC_JUMP_STRENGTH) * (double)this.f_casalqpe);
+      float f = (float)(entity.getAttributeValue(EntityAttributes.GENERIC_JUMP_STRENGTH) * (double)this.maxVelocityMultiplier);
 
       for (int i : list) {
          Optional<Vec3d> optional = C_mqhihnup.m_ouoqbvoy(entity, pos, f, i, true);
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/LongJumpToPreferredBlockTask.java namedSrc/net/minecraft/entity/ai/brain/task/LongJumpToPreferredBlockTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/LongJumpToPreferredBlockTask.java	2024-03-27 00:01:39.956019528 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/LongJumpToPreferredBlockTask.java	2024-03-27 00:00:30.859552402 +0000
@@ -48,13 +48,13 @@
       UniformIntProvider cooldownRange,
       int verticalRange,
       int horizontalRange,
-      float f,
+      float maxVelocityMultiplier,
       Function<E, SoundEvent> jumpSound,
       TagKey<Block> preferredBlocks,
       float jumpChance,
       BiPredicate<E, BlockPos> validBlock
    ) {
-      super(cooldownRange, verticalRange, horizontalRange, f, jumpSound, validBlock);
+      super(cooldownRange, verticalRange, horizontalRange, maxVelocityMultiplier, jumpSound, validBlock);
       this.preferredBlocks = preferredBlocks;
       this.jumpChance = jumpChance;
    }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/LookTargetUtil.java namedSrc/net/minecraft/entity/ai/brain/task/LookTargetUtil.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/LookTargetUtil.java	2024-03-27 00:01:39.864018907 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/LookTargetUtil.java	2024-03-27 00:00:30.755551673 +0000
@@ -137,8 +137,8 @@
     * @mapping {@literal hashed m_twcvmjrq Lnet/minecraft/unmapped/C_glrklsny;m_twcvmjrq(Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;F)V}
     * @mapping {@literal named throwStack Lnet/minecraft/entity/ai/brain/task/LookTargetUtil;throwStack(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/Vec3d;F)V}
     */
-   public static void throwStack(LivingEntity thrower, ItemStack stack, Vec3d throwVec, Vec3d throwStrength, float f) {
-      double d = thrower.getEyeY() - (double)f;
+   public static void throwStack(LivingEntity thrower, ItemStack stack, Vec3d throwVec, Vec3d throwStrength, float yOffset) {
+      double d = thrower.getEyeY() - (double)yOffset;
       ItemEntity lv = new ItemEntity(thrower.getWorld(), thrower.getX(), d, thrower.getZ(), stack);
       lv.setThrower(thrower);
       Vec3d lv2 = throwVec.subtract(thrower.getPos());
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask.java namedSrc/net/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask.java	2024-03-27 00:01:39.988019744 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask.java	2024-03-27 00:00:30.895552655 +0000
@@ -2,7 +2,6 @@
 
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.passive.VillagerEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.village.VillagerData;
 import net.minecraft.village.VillagerProfession;
 
@@ -12,14 +11,15 @@
  */
 public class LoseJobOnSiteLossTask {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_okyonjrx Lnet/minecraft/unmapped/C_logdfkup;m_okyonjrx()Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask;create()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<VillagerEntity> m_okyonjrx() {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.JOB_SITE))
+   public static TaskControl<VillagerEntity> create() {
+      return TaskBuilder.task(
+         instance -> instance.group(instance.absentMemory(MemoryModuleType.JOB_SITE))
                .apply(
-                  arg,
-                  argx -> (world, arg2, l) -> {
+                  instance,
+                  arg -> (world, arg2, l) -> {
                         VillagerData lv = arg2.getVillagerData();
                         if (lv.getProfession() != VillagerProfession.NONE
                            && lv.getProfession() != VillagerProfession.NITWIT
Only in namedSrc/net/minecraft/entity/ai/brain/task: MeanderTask.java
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/MeetVillagerTask.java namedSrc/net/minecraft/entity/ai/brain/task/MeetVillagerTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/MeetVillagerTask.java	2024-03-27 00:01:40.068020283 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/MeetVillagerTask.java	2024-03-27 00:00:30.963553132 +0000
@@ -7,7 +7,6 @@
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.VisibleLivingEntitiesCache;
 import net.minecraft.entity.ai.brain.WalkTarget;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.dynamic.GlobalPos;
 
 /**
@@ -22,30 +21,31 @@
    private static final float WALK_SPEED = 0.3F;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bsalxkul Lnet/minecraft/unmapped/C_nzixmipe;m_bsalxkul()Lnet/minecraft/unmapped/C_yfpegcpm;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/MeetVillagerTask;create()Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static ReportingTaskControl<LivingEntity> m_bsalxkul() {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(
-                  arg.m_mzwocaxv(MemoryModuleType.WALK_TARGET),
-                  arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
-                  arg.m_qgrmwbxe(MemoryModuleType.MEETING_POINT),
-                  arg.m_qgrmwbxe(MemoryModuleType.VISIBLE_MOBS),
-                  arg.m_owejzxbp(MemoryModuleType.INTERACTION_TARGET)
+   public static ReportingTaskControl<LivingEntity> create() {
+      return TaskBuilder.task(
+         instance -> instance.group(
+                  instance.registeredMemory(MemoryModuleType.WALK_TARGET),
+                  instance.registeredMemory(MemoryModuleType.LOOK_TARGET),
+                  instance.presentMemory(MemoryModuleType.MEETING_POINT),
+                  instance.presentMemory(MemoryModuleType.VISIBLE_MOBS),
+                  instance.absentMemory(MemoryModuleType.INTERACTION_TARGET)
                )
                .apply(
-                  arg,
+                  instance,
                   (arg2, arg3, arg4, arg5, arg6) -> (world, arg8, l) -> {
-                        GlobalPos lv = arg.m_gcuzwcid(arg4);
-                        VisibleLivingEntitiesCache lv2 = arg.m_gcuzwcid(arg5);
+                        GlobalPos lv = instance.getValue(arg4);
+                        VisibleLivingEntitiesCache lv2 = instance.getValue(arg5);
                         if (world.getRandom().nextInt(100) == 0
                            && world.getRegistryKey() == lv.getDimension()
                            && lv.getPos().isCenterWithinDistance(arg8.getPos(), 4.0)
-                           && lv2.anyMatch(argxxx -> EntityType.VILLAGER.equals(argxxx.getType()))) {
+                           && lv2.anyMatch(argxx -> EntityType.VILLAGER.equals(argxx.getType()))) {
                            lv2.getFirst(arg2xx -> EntityType.VILLAGER.equals(arg2xx.getType()) && arg2xx.squaredDistanceTo(arg8) <= 32.0).ifPresent(arg4xx -> {
-                              arg6.m_klbizcog(arg4xx);
-                              arg3.m_klbizcog(new EntityLookTarget(arg4xx, true));
-                              arg2.m_klbizcog(new WalkTarget(new EntityLookTarget(arg4xx, false), 0.3F, 1));
+                              arg6.remember(arg4xx);
+                              arg3.remember(new EntityLookTarget(arg4xx, true));
+                              arg2.remember(new WalkTarget(new EntityLookTarget(arg4xx, false), 0.3F, 1));
                            });
                            return true;
                         } else {
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/MeleeAttackTask.java namedSrc/net/minecraft/entity/ai/brain/task/MeleeAttackTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/MeleeAttackTask.java	2024-03-27 00:01:39.852018826 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/MeleeAttackTask.java	2024-03-27 00:00:30.743551588 +0000
@@ -8,7 +8,6 @@
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.RangedWeaponItem;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.Hand;
 
 /**
@@ -17,23 +16,24 @@
  */
 public class MeleeAttackTask {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bsseqsar Lnet/minecraft/unmapped/C_gpxkysqi;m_bsseqsar(I)Lnet/minecraft/unmapped/C_yfpegcpm;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/MeleeAttackTask;create(I)Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static ReportingTaskControl<MobEntity> m_bsseqsar(int i) {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(
-                  arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
-                  arg.m_qgrmwbxe(MemoryModuleType.ATTACK_TARGET),
-                  arg.m_owejzxbp(MemoryModuleType.ATTACK_COOLING_DOWN),
-                  arg.m_qgrmwbxe(MemoryModuleType.VISIBLE_MOBS)
+   public static ReportingTaskControl<MobEntity> create(int cooldown) {
+      return TaskBuilder.task(
+         instance -> instance.group(
+                  instance.registeredMemory(MemoryModuleType.LOOK_TARGET),
+                  instance.presentMemory(MemoryModuleType.ATTACK_TARGET),
+                  instance.absentMemory(MemoryModuleType.ATTACK_COOLING_DOWN),
+                  instance.presentMemory(MemoryModuleType.VISIBLE_MOBS)
                )
-               .apply(arg, (arg2, arg3, arg4, arg5) -> (world, arg7, l) -> {
-                     LivingEntity lv = arg.m_gcuzwcid(arg3);
-                     if (!isHoldingUsableRangedWeapon(arg7) && arg7.isIntersecting(lv) && arg.<VisibleLivingEntitiesCache>m_gcuzwcid(arg5).contains(lv)) {
-                        arg2.m_klbizcog(new EntityLookTarget(lv, true));
+               .apply(instance, (arg2, arg3, arg4, arg5) -> (world, arg7, l) -> {
+                     LivingEntity lv = instance.getValue(arg3);
+                     if (!isHoldingUsableRangedWeapon(arg7) && arg7.isIntersecting(lv) && instance.<VisibleLivingEntitiesCache>getValue(arg5).contains(lv)) {
+                        arg2.remember(new EntityLookTarget(lv, true));
                         arg7.swingHand(Hand.MAIN_HAND);
                         arg7.tryAttack(lv);
-                        arg4.m_zjdztcmb(true, (long)i);
+                        arg4.remember(true, (long)cooldown);
                         return true;
                      } else {
                         return false;
@@ -46,10 +46,10 @@
     * @mapping {@literal hashed m_njoxpzqb Lnet/minecraft/unmapped/C_gpxkysqi;m_njoxpzqb(Lnet/minecraft/unmapped/C_dxkfswlz;)Z}
     * @mapping {@literal named isHoldingUsableRangedWeapon Lnet/minecraft/entity/ai/brain/task/MeleeAttackTask;isHoldingUsableRangedWeapon(Lnet/minecraft/entity/mob/MobEntity;)Z}
     */
-   private static boolean isHoldingUsableRangedWeapon(MobEntity arg) {
-      return arg.isHolding(stack -> {
+   private static boolean isHoldingUsableRangedWeapon(MobEntity entity) {
+      return entity.isHolding(stack -> {
          Item lv = stack.getItem();
-         return lv instanceof RangedWeaponItem && arg.canUseRangedWeapon((RangedWeaponItem)lv);
+         return lv instanceof RangedWeaponItem && entity.canUseRangedWeapon((RangedWeaponItem)lv);
       });
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/MemoryTransferTask.java namedSrc/net/minecraft/entity/ai/brain/task/MemoryTransferTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/MemoryTransferTask.java	2024-03-27 00:01:39.992019771 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/MemoryTransferTask.java	2024-03-27 00:00:30.899552683 +0000
@@ -3,7 +3,6 @@
 import java.util.function.Predicate;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.math.int_provider.UniformIntProvider;
 
 /**
@@ -12,18 +11,21 @@
  */
 public class MemoryTransferTask {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_algmjnve Lnet/minecraft/unmapped/C_ylgoridw;m_algmjnve(Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_vbbyoqyw;Lnet/minecraft/unmapped/C_vbbyoqyw;Lnet/minecraft/unmapped/C_hvilmtvi;)Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/MemoryTransferTask;create(Ljava/util/function/Predicate;Lnet/minecraft/entity/ai/brain/MemoryModuleType;Lnet/minecraft/entity/ai/brain/MemoryModuleType;Lnet/minecraft/util/math/int_provider/UniformIntProvider;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static <E extends LivingEntity, T> TaskControl<E> m_algmjnve(
-      Predicate<E> predicate, MemoryModuleType<? extends T> arg, MemoryModuleType<T> arg2, UniformIntProvider arg3
+   public static <E extends LivingEntity, T> TaskControl<E> create(
+      Predicate<E> predicate, MemoryModuleType<? extends T> sourceType, MemoryModuleType<T> targetType, UniformIntProvider expiry
    ) {
-      return C_rcqaryar.m_elxiakeb(arg4 -> arg4.group(arg4.m_qgrmwbxe(arg), arg4.m_owejzxbp(arg2)).apply(arg4, (arg3xx, arg4x) -> (world, arg6, l) -> {
+      return TaskBuilder.task(
+         arg4 -> arg4.group(arg4.presentMemory(sourceType), arg4.absentMemory(targetType)).apply(arg4, (arg3x, arg4x) -> (world, arg6, l) -> {
                if (!predicate.test(arg6)) {
                   return false;
                } else {
-                  arg4x.m_zjdztcmb(arg4.m_gcuzwcid(arg3xx), (long)arg3.get(world.random));
+                     arg4x.remember(arg4.getValue(arg3x), (long)expiry.get(world.random));
                   return true;
                }
-            }));
+               })
+      );
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/OpenDoorsTask.java namedSrc/net/minecraft/entity/ai/brain/task/OpenDoorsTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/OpenDoorsTask.java	2024-03-27 00:01:40.008019878 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/OpenDoorsTask.java	2024-03-27 00:00:30.915552795 +0000
@@ -11,13 +11,12 @@
 import net.minecraft.block.DoorBlock;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.Brain;
+import net.minecraft.entity.ai.brain.MemoryAccessor;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.pathing.Path;
 import net.minecraft.entity.ai.pathing.PathNode;
 import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_rcqaryar;
-import net.minecraft.unmapped.C_ujlmiamh;
 import net.minecraft.util.dynamic.GlobalPos;
 import net.minecraft.util.math.BlockPos;
 import org.apache.commons.lang3.mutable.MutableInt;
@@ -46,16 +45,21 @@
    private static final double REACH_DISTANCE = 2.0;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ggugtmce Lnet/minecraft/unmapped/C_mdkbucgk;m_ggugtmce()Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/OpenDoorsTask;create()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<LivingEntity> m_ggugtmce() {
+   public static TaskControl<LivingEntity> create() {
       MutableObject<PathNode> mutableObject = new MutableObject<>(null);
       MutableInt mutableInt = new MutableInt(0);
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.PATH), arg.m_mzwocaxv(MemoryModuleType.DOORS_TO_CLOSE), arg.m_mzwocaxv(MemoryModuleType.MOBS))
-               .apply(arg, (arg2, arg3, arg4) -> (world, arg6, l) -> {
-                     Path lv = arg.m_gcuzwcid(arg2);
-                     Optional<Set<GlobalPos>> optional = arg.m_oxjxfuhs(arg3);
+      return TaskBuilder.task(
+         instance -> instance.group(
+                  instance.presentMemory(MemoryModuleType.PATH),
+                  instance.registeredMemory(MemoryModuleType.DOORS_TO_CLOSE),
+                  instance.registeredMemory(MemoryModuleType.MOBS)
+               )
+               .apply(instance, (path, doorsToClose, mobs) -> (world, entity, time) -> {
+                     Path lv = instance.getValue(path);
+                     Optional<Set<GlobalPos>> optional = instance.getValueOptional(doorsToClose);
                      if (!lv.isStart() && !lv.isFinished()) {
                         if (Objects.equals(mutableObject.getValue(), lv.getCurrentNode())) {
                            mutableInt.setValue(20);
@@ -68,26 +72,26 @@
                         PathNode lv3 = lv.getCurrentNode();
                         BlockPos lv4 = lv2.getBlockPos();
                         BlockState lv5 = world.getBlockState(lv4);
-                        if (lv5.isInAndMatches(BlockTags.WOODEN_DOORS, argxxx -> argxxx.getBlock() instanceof DoorBlock)) {
+                        if (lv5.isInAndMatches(BlockTags.WOODEN_DOORS, state -> state.getBlock() instanceof DoorBlock)) {
                            DoorBlock lv6 = (DoorBlock)lv5.getBlock();
                            if (!lv6.isOpen(lv5)) {
-                              lv6.setOpen(arg6, world, lv5, lv4, true);
+                              lv6.setOpen(entity, world, lv5, lv4, true);
                            }
       
-                           optional = rememberToCloseDoor(arg3, optional, world, lv4);
+                           optional = rememberToCloseDoor(doorsToClose, optional, world, lv4);
                         }
       
                         BlockPos lv7 = lv3.getBlockPos();
                         BlockState lv8 = world.getBlockState(lv7);
-                        if (lv8.isInAndMatches(BlockTags.WOODEN_DOORS, argxxx -> argxxx.getBlock() instanceof DoorBlock)) {
+                        if (lv8.isInAndMatches(BlockTags.WOODEN_DOORS, state -> state.getBlock() instanceof DoorBlock)) {
                            DoorBlock lv9 = (DoorBlock)lv8.getBlock();
                            if (!lv9.isOpen(lv8)) {
-                              lv9.setOpen(arg6, world, lv8, lv7, true);
-                              optional = rememberToCloseDoor(arg3, optional, world, lv7);
+                              lv9.setOpen(entity, world, lv8, lv7, true);
+                              optional = rememberToCloseDoor(doorsToClose, optional, world, lv7);
                            }
                         }
       
-                        optional.ifPresent(set -> pathToDoor(world, arg6, lv2, lv3, set, arg.m_oxjxfuhs(arg4)));
+                        optional.ifPresent(set -> pathToDoor(world, entity, lv2, lv3, set, instance.getValueOptional(mobs)));
                         return true;
                      } else {
                         return false;
@@ -105,10 +109,10 @@
       LivingEntity entity,
       @Nullable PathNode lastNode,
       @Nullable PathNode currentNode,
-      Set<GlobalPos> set,
-      Optional<List<LivingEntity>> optional
+      Set<GlobalPos> doors,
+      Optional<List<LivingEntity>> otherMobs
    ) {
-      Iterator<GlobalPos> iterator = set.iterator();
+      Iterator<GlobalPos> iterator = doors.iterator();
 
       while (iterator.hasNext()) {
          GlobalPos lv = (GlobalPos)iterator.next();
@@ -124,7 +128,7 @@
                   DoorBlock lv4 = (DoorBlock)lv3.getBlock();
                   if (!lv4.isOpen(lv3)) {
                      iterator.remove();
-                  } else if (hasOtherMobReachedDoor(entity, lv2, optional)) {
+                  } else if (hasOtherMobReachedDoor(entity, lv2, otherMobs)) {
                      iterator.remove();
                   } else {
                      lv4.setOpen(entity, world, lv3, lv2, false);
@@ -140,10 +144,10 @@
     * @mapping {@literal hashed m_ptbjvbpp Lnet/minecraft/unmapped/C_mdkbucgk;m_ptbjvbpp(Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_hynzadkk;Ljava/util/Optional;)Z}
     * @mapping {@literal named hasOtherMobReachedDoor Lnet/minecraft/entity/ai/brain/task/OpenDoorsTask;hasOtherMobReachedDoor(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/util/math/BlockPos;Ljava/util/Optional;)Z}
     */
-   private static boolean hasOtherMobReachedDoor(LivingEntity entity, BlockPos pos, Optional<List<LivingEntity>> optional) {
-      return optional.isEmpty()
+   private static boolean hasOtherMobReachedDoor(LivingEntity entity, BlockPos pos, Optional<List<LivingEntity>> otherMobs) {
+      return otherMobs.isEmpty()
          ? false
-         : ((List)optional.get())
+         : ((List)otherMobs.get())
             .stream()
             .filter(arg2 -> arg2.getType() == entity.getType())
             .filter(arg2 -> pos.isCenterWithinDistance(arg2.getPos(), 2.0))
@@ -183,18 +187,18 @@
 
    /**
     * @mapping {@literal hashed m_xutscifj Lnet/minecraft/unmapped/C_mdkbucgk;m_xutscifj(Lnet/minecraft/unmapped/C_ujlmiamh;Ljava/util/Optional;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)Ljava/util/Optional;}
-    * @mapping {@literal named rememberToCloseDoor Lnet/minecraft/entity/ai/brain/task/OpenDoorsTask;rememberToCloseDoor(Lnet/minecraft/unmapped/C_ujlmiamh;Ljava/util/Optional;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;)Ljava/util/Optional;}
+    * @mapping {@literal named rememberToCloseDoor Lnet/minecraft/entity/ai/brain/task/OpenDoorsTask;rememberToCloseDoor(Lnet/minecraft/entity/ai/brain/MemoryAccessor;Ljava/util/Optional;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;)Ljava/util/Optional;}
     */
    private static Optional<Set<GlobalPos>> rememberToCloseDoor(
-      C_ujlmiamh<Mu, Set<GlobalPos>> arg, Optional<Set<GlobalPos>> optional, ServerWorld world, BlockPos pos
+      MemoryAccessor<Mu, Set<GlobalPos>> memoryAccessor, Optional<Set<GlobalPos>> doors, ServerWorld world, BlockPos pos
    ) {
       GlobalPos lv = GlobalPos.create(world.getRegistryKey(), pos);
-      return Optional.of((Set)optional.map(set -> {
+      return Optional.of((Set)doors.map(set -> {
          set.add(lv);
          return set;
       }).orElseGet(() -> {
          Set<GlobalPos> set = Sets.<GlobalPos>newHashSet(lv);
-         arg.m_klbizcog(set);
+         memoryAccessor.remember(set);
          return set;
       }));
    }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/PacifyTask.java namedSrc/net/minecraft/entity/ai/brain/task/PacifyTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/PacifyTask.java	2024-03-27 00:01:39.856018853 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/PacifyTask.java	2024-03-27 00:00:30.747551616 +0000
@@ -2,7 +2,6 @@
 
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_wykskpka}
@@ -10,14 +9,17 @@
  */
 public class PacifyTask {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dlfrarsr Lnet/minecraft/unmapped/C_wykskpka;m_dlfrarsr(Lnet/minecraft/unmapped/C_vbbyoqyw;I)Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/PacifyTask;create(Lnet/minecraft/entity/ai/brain/MemoryModuleType;I)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<LivingEntity> m_dlfrarsr(MemoryModuleType<?> arg, int i) {
-      return C_rcqaryar.m_elxiakeb(
-         arg2 -> arg2.group(arg2.m_mzwocaxv(MemoryModuleType.ATTACK_TARGET), arg2.m_owejzxbp(MemoryModuleType.PACIFIED), arg2.m_qgrmwbxe(arg))
-               .apply(arg2, arg2.m_doolglka(() -> "[BecomePassive if " + arg + " present]", (argxx, arg2x, arg3) -> (world, arg4, l) -> {
-                     arg2x.m_zjdztcmb(true, (long)i);
-                     argxx.m_gfsxfard();
+   public static TaskControl<LivingEntity> create(MemoryModuleType<?> requiredMemory, int duration) {
+      return TaskBuilder.task(
+         arg2 -> arg2.group(
+                  arg2.registeredMemory(MemoryModuleType.ATTACK_TARGET), arg2.absentMemory(MemoryModuleType.PACIFIED), arg2.presentMemory(requiredMemory)
+               )
+               .apply(arg2, arg2.constant(() -> "[BecomePassive if " + requiredMemory + " present]", (argx, arg2x, arg3) -> (world, arg4, l) -> {
+                     arg2x.remember(true, (long)duration);
+                     argx.forget();
                      return true;
                   }))
       );
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/PlayDeadTimerTask.java namedSrc/net/minecraft/entity/ai/brain/task/PlayDeadTimerTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/PlayDeadTimerTask.java	2024-03-27 00:01:40.128020688 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/PlayDeadTimerTask.java	2024-03-27 00:00:31.031553609 +0000
@@ -2,7 +2,6 @@
 
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_nocxsmxi}
@@ -10,19 +9,20 @@
  */
 public class PlayDeadTimerTask {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pgllasaj Lnet/minecraft/unmapped/C_nocxsmxi;m_pgllasaj()Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/PlayDeadTimerTask;create()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<LivingEntity> m_pgllasaj() {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.PLAY_DEAD_TICKS), arg.m_mzwocaxv(MemoryModuleType.HURT_BY_ENTITY))
-               .apply(arg, (arg2, arg3) -> (world, arg5, l) -> {
-                     int i = arg.<Integer>m_gcuzwcid(arg2);
+   public static TaskControl<LivingEntity> create() {
+      return TaskBuilder.task(
+         instance -> instance.group(instance.presentMemory(MemoryModuleType.PLAY_DEAD_TICKS), instance.registeredMemory(MemoryModuleType.HURT_BY_ENTITY))
+               .apply(instance, (arg2, arg3) -> (world, arg5, l) -> {
+                     int i = instance.<Integer>getValue(arg2);
                      if (i <= 0) {
-                        arg2.m_gfsxfard();
-                        arg3.m_gfsxfard();
+                        arg2.forget();
+                        arg3.forget();
                         arg5.getBrain().resetPossibleActivities();
                      } else {
-                        arg2.m_klbizcog(i - 1);
+                        arg2.remember(i - 1);
                      }
       
                      return true;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.java namedSrc/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.java	2024-03-27 00:01:39.976019663 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.java	2024-03-27 00:00:30.883552570 +0000
@@ -10,11 +10,10 @@
 import net.minecraft.entity.ai.FuzzyTargeting;
 import net.minecraft.entity.ai.brain.EntityLookTarget;
 import net.minecraft.entity.ai.brain.LookTarget;
+import net.minecraft.entity.ai.brain.MemoryAccessor;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.WalkTarget;
 import net.minecraft.entity.mob.PathAwareEntity;
-import net.minecraft.unmapped.C_rcqaryar;
-import net.minecraft.unmapped.C_ujlmiamh;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 
@@ -55,21 +54,22 @@
    private static final int RUN_CHANCE = 10;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ebfbnoua Lnet/minecraft/unmapped/C_pknbcifi;m_ebfbnoua()Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask;create()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<PathAwareEntity> m_ebfbnoua() {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(
-                  arg.m_qgrmwbxe(MemoryModuleType.VISIBLE_VILLAGER_BABIES),
-                  arg.m_owejzxbp(MemoryModuleType.WALK_TARGET),
-                  arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
-                  arg.m_mzwocaxv(MemoryModuleType.INTERACTION_TARGET)
+   public static TaskControl<PathAwareEntity> create() {
+      return TaskBuilder.task(
+         instance -> instance.group(
+                  instance.presentMemory(MemoryModuleType.VISIBLE_VILLAGER_BABIES),
+                  instance.absentMemory(MemoryModuleType.WALK_TARGET),
+                  instance.registeredMemory(MemoryModuleType.LOOK_TARGET),
+                  instance.registeredMemory(MemoryModuleType.INTERACTION_TARGET)
                )
-               .apply(arg, (arg2, arg3, arg4, arg5) -> (world, arg7, l) -> {
+               .apply(instance, (arg2, arg3, arg4, arg5) -> (world, arg7, l) -> {
                      if (world.getRandom().nextInt(10) != 0) {
                         return false;
                      } else {
-                        List<LivingEntity> list = arg.m_gcuzwcid(arg2);
+                        List<LivingEntity> list = instance.getValue(arg2);
                         Optional<LivingEntity> optional = list.stream().filter(arg2xx -> isInteractionTargetOf(arg7, arg2xx)).findAny();
                         if (!optional.isPresent()) {
                            Optional<LivingEntity> optional2 = getLeastPopularBabyInteractionTarget(list);
@@ -84,7 +84,7 @@
                            for (int i = 0; i < 10; i++) {
                               Vec3d lv = FuzzyTargeting.find(arg7, 20, 8);
                               if (lv != null && world.isNearOccupiedPointOfInterest(BlockPos.fromPosition(lv))) {
-                                 arg3.m_klbizcog(new WalkTarget(lv, 0.6F, 0));
+                                 arg3.remember(new WalkTarget(lv, 0.6F, 0));
                                  break;
                               }
                            }
@@ -98,20 +98,25 @@
 
    /**
     * @mapping {@literal hashed m_ihsasqya Lnet/minecraft/unmapped/C_pknbcifi;m_ihsasqya(Lnet/minecraft/unmapped/C_ujlmiamh;Lnet/minecraft/unmapped/C_ujlmiamh;Lnet/minecraft/unmapped/C_ujlmiamh;Lnet/minecraft/unmapped/C_usxaxydn;)V}
-    * @mapping {@literal named setPlayTarget Lnet/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask;setPlayTarget(Lnet/minecraft/unmapped/C_ujlmiamh;Lnet/minecraft/unmapped/C_ujlmiamh;Lnet/minecraft/unmapped/C_ujlmiamh;Lnet/minecraft/entity/LivingEntity;)V}
+    * @mapping {@literal named setPlayTarget Lnet/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask;setPlayTarget(Lnet/minecraft/entity/ai/brain/MemoryAccessor;Lnet/minecraft/entity/ai/brain/MemoryAccessor;Lnet/minecraft/entity/ai/brain/MemoryAccessor;Lnet/minecraft/entity/LivingEntity;)V}
     */
-   private static void setPlayTarget(C_ujlmiamh<?, LivingEntity> arg, C_ujlmiamh<?, LookTarget> arg2, C_ujlmiamh<?, WalkTarget> arg3, LivingEntity target) {
-      arg.m_klbizcog(target);
-      arg2.m_klbizcog(new EntityLookTarget(target, true));
-      arg3.m_klbizcog(new WalkTarget(new EntityLookTarget(target, false), 0.6F, 1));
+   private static void setPlayTarget(
+      MemoryAccessor<?, LivingEntity> interactionTarget,
+      MemoryAccessor<?, LookTarget> lookTarget,
+      MemoryAccessor<?, WalkTarget> walkTarget,
+      LivingEntity target
+   ) {
+      interactionTarget.remember(target);
+      lookTarget.remember(new EntityLookTarget(target, true));
+      walkTarget.remember(new WalkTarget(new EntityLookTarget(target, false), 0.6F, 1));
    }
 
    /**
     * @mapping {@literal hashed m_qlzbkmup Lnet/minecraft/unmapped/C_pknbcifi;m_qlzbkmup(Ljava/util/List;)Ljava/util/Optional;}
     * @mapping {@literal named getLeastPopularBabyInteractionTarget Lnet/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask;getLeastPopularBabyInteractionTarget(Ljava/util/List;)Ljava/util/Optional;}
     */
-   private static Optional<LivingEntity> getLeastPopularBabyInteractionTarget(List<LivingEntity> list) {
-      Map<LivingEntity, Integer> map = getBabyInteractionTargetCounts(list);
+   private static Optional<LivingEntity> getLeastPopularBabyInteractionTarget(List<LivingEntity> entities) {
+      Map<LivingEntity, Integer> map = getBabyInteractionTargetCounts(entities);
       return map.entrySet()
          .stream()
          .sorted(Comparator.comparingInt(Entry::getValue))
@@ -124,9 +129,9 @@
     * @mapping {@literal hashed m_ffmzprdu Lnet/minecraft/unmapped/C_pknbcifi;m_ffmzprdu(Ljava/util/List;)Ljava/util/Map;}
     * @mapping {@literal named getBabyInteractionTargetCounts Lnet/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask;getBabyInteractionTargetCounts(Ljava/util/List;)Ljava/util/Map;}
     */
-   private static Map<LivingEntity, Integer> getBabyInteractionTargetCounts(List<LivingEntity> list) {
+   private static Map<LivingEntity, Integer> getBabyInteractionTargetCounts(List<LivingEntity> entities) {
       Map<LivingEntity, Integer> map = Maps.<LivingEntity, Integer>newHashMap();
-      list.stream()
+      entities.stream()
          .filter(PlayWithVillagerBabiesTask::hasInteractionTarget)
          .forEach(arg -> map.compute(getInteractionTarget(arg), (argx, integer) -> integer == null ? 1 : integer + 1));
       return map;
@@ -136,23 +141,23 @@
     * @mapping {@literal hashed m_oeslmduv Lnet/minecraft/unmapped/C_pknbcifi;m_oeslmduv(Lnet/minecraft/unmapped/C_usxaxydn;)Lnet/minecraft/unmapped/C_usxaxydn;}
     * @mapping {@literal named getInteractionTarget Lnet/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask;getInteractionTarget(Lnet/minecraft/entity/LivingEntity;)Lnet/minecraft/entity/LivingEntity;}
     */
-   private static LivingEntity getInteractionTarget(LivingEntity arg) {
-      return (LivingEntity)arg.getBrain().getOptionalMemory(MemoryModuleType.INTERACTION_TARGET).get();
+   private static LivingEntity getInteractionTarget(LivingEntity entity) {
+      return (LivingEntity)entity.getBrain().getOptionalMemory(MemoryModuleType.INTERACTION_TARGET).get();
    }
 
    /**
     * @mapping {@literal hashed m_ssifeeyh Lnet/minecraft/unmapped/C_pknbcifi;m_ssifeeyh(Lnet/minecraft/unmapped/C_usxaxydn;)Z}
     * @mapping {@literal named hasInteractionTarget Lnet/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask;hasInteractionTarget(Lnet/minecraft/entity/LivingEntity;)Z}
     */
-   private static boolean hasInteractionTarget(LivingEntity arg) {
-      return arg.getBrain().getOptionalMemory(MemoryModuleType.INTERACTION_TARGET).isPresent();
+   private static boolean hasInteractionTarget(LivingEntity entity) {
+      return entity.getBrain().getOptionalMemory(MemoryModuleType.INTERACTION_TARGET).isPresent();
    }
 
    /**
     * @mapping {@literal hashed m_nkurvpyl Lnet/minecraft/unmapped/C_pknbcifi;m_nkurvpyl(Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z}
     * @mapping {@literal named isInteractionTargetOf Lnet/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask;isInteractionTargetOf(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/LivingEntity;)Z}
     */
-   private static boolean isInteractionTargetOf(LivingEntity arg, LivingEntity entity) {
-      return entity.getBrain().getOptionalMemory(MemoryModuleType.INTERACTION_TARGET).filter(arg2 -> arg2 == arg).isPresent();
+   private static boolean isInteractionTargetOf(LivingEntity target, LivingEntity entity) {
+      return entity.getBrain().getOptionalMemory(MemoryModuleType.INTERACTION_TARGET).filter(checkedEntity -> checkedEntity == target).isPresent();
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/PrepareRamTask.java namedSrc/net/minecraft/entity/ai/brain/task/PrepareRamTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/PrepareRamTask.java	2024-03-27 00:01:40.132020715 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/PrepareRamTask.java	2024-03-27 00:00:31.039553665 +0000
@@ -247,7 +247,7 @@
     * @mapping {@literal named canReach Lnet/minecraft/entity/ai/brain/task/PrepareRamTask;canReach(Lnet/minecraft/entity/mob/PathAwareEntity;Lnet/minecraft/util/math/BlockPos;)Z}
     */
    private boolean canReach(PathAwareEntity entity, BlockPos target) {
-      return entity.getNavigation().isValidPosition(target) && entity.getPenalty(LandPathNodeMaker.m_femsgzut(entity, target)) == 0.0F;
+      return entity.getNavigation().isValidPosition(target) && entity.getPenalty(LandPathNodeMaker.getLandNodeType(entity, target)) == 0.0F;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java namedSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java	2024-03-27 00:01:40.076020337 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java	2024-03-27 00:00:30.979553243 +0000
@@ -71,9 +71,10 @@
     */
    private final Function<GoatEntity, SoundEvent> soundFactory;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_osbzikop Lnet/minecraft/unmapped/C_mqbxlhpd;f_osbzikop:Ljava/util/function/Function;}
+    * @mapping {@literal named hornBreakSoundFactory Lnet/minecraft/entity/ai/brain/task/RamImpactTask;hornBreakSoundFactory:Ljava/util/function/Function;}
     */
-   private final Function<GoatEntity, SoundEvent> f_osbzikop;
+   private final Function<GoatEntity, SoundEvent> hornBreakSoundFactory;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mqbxlhpd;<init>(Ljava/util/function/Function;Lnet/minecraft/unmapped/C_cjtyhinh;FLjava/util/function/ToDoubleFunction;Ljava/util/function/Function;Ljava/util/function/Function;)V}
@@ -85,7 +86,7 @@
       float speed,
       ToDoubleFunction<GoatEntity> strengthMultiplierFactory,
       Function<GoatEntity, SoundEvent> soundFactory,
-      Function<GoatEntity, SoundEvent> function3
+      Function<GoatEntity, SoundEvent> hornBreakSoundFactory
    ) {
       super(
          ImmutableMap.of(MemoryModuleType.RAM_COOLDOWN_TICKS, MemoryModuleState.VALUE_ABSENT, MemoryModuleType.RAM_TARGET, MemoryModuleState.VALUE_PRESENT),
@@ -96,7 +97,7 @@
       this.speed = speed;
       this.strengthMultiplierFactory = strengthMultiplierFactory;
       this.soundFactory = soundFactory;
-      this.f_osbzikop = function3;
+      this.hornBreakSoundFactory = hornBreakSoundFactory;
       this.direction = Vec3d.ZERO;
    }
 
@@ -146,11 +147,11 @@
          lv2.takeKnockback((double)(h * g) * this.strengthMultiplierFactory.applyAsDouble(arg2), this.direction.getX(), this.direction.getZ());
          this.finishRam(world, arg2);
          world.playSoundFromEntity(null, arg2, (SoundEvent)this.soundFactory.apply(arg2), SoundCategory.NEUTRAL, 1.0F, 1.0F);
-      } else if (this.m_ezqrkbgm(world, arg2)) {
+      } else if (this.shouldBreakHorn(world, arg2)) {
          world.playSoundFromEntity(null, arg2, (SoundEvent)this.soundFactory.apply(arg2), SoundCategory.NEUTRAL, 1.0F, 1.0F);
-         boolean bl = arg2.m_nrwiiidk();
+         boolean bl = arg2.dropHorn();
          if (bl) {
-            world.playSoundFromEntity(null, arg2, (SoundEvent)this.f_osbzikop.apply(arg2), SoundCategory.NEUTRAL, 1.0F, 1.0F);
+            world.playSoundFromEntity(null, arg2, (SoundEvent)this.hornBreakSoundFactory.apply(arg2), SoundCategory.NEUTRAL, 1.0F, 1.0F);
          }
 
          this.finishRam(world, arg2);
@@ -168,11 +169,11 @@
 
    /**
     * @mapping {@literal hashed m_ezqrkbgm Lnet/minecraft/unmapped/C_mqbxlhpd;m_ezqrkbgm(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_rrwjjvrc;)Z}
-    * @mapping {@literal named m_ezqrkbgm Lnet/minecraft/entity/ai/brain/task/RamImpactTask;m_ezqrkbgm(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/GoatEntity;)Z}
+    * @mapping {@literal named shouldBreakHorn Lnet/minecraft/entity/ai/brain/task/RamImpactTask;shouldBreakHorn(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/GoatEntity;)Z}
     */
-   private boolean m_ezqrkbgm(ServerWorld world, GoatEntity arg2) {
-      Vec3d lv = arg2.getVelocity().multiply(1.0, 0.0, 1.0).normalize();
-      BlockPos lv2 = BlockPos.fromPosition(arg2.getPos().add(lv));
+   private boolean shouldBreakHorn(ServerWorld world, GoatEntity goat) {
+      Vec3d lv = goat.getVelocity().multiply(1.0, 0.0, 1.0).normalize();
+      BlockPos lv2 = BlockPos.fromPosition(goat.getPos().add(lv));
       return world.getBlockState(lv2).isIn(BlockTags.SNAPS_GOAT_HORN) || world.getBlockState(lv2.up()).isIn(BlockTags.SNAPS_GOAT_HORN);
    }
 
@@ -180,9 +181,9 @@
     * @mapping {@literal hashed m_knioirfk Lnet/minecraft/unmapped/C_mqbxlhpd;m_knioirfk(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_rrwjjvrc;)V}
     * @mapping {@literal named finishRam Lnet/minecraft/entity/ai/brain/task/RamImpactTask;finishRam(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/GoatEntity;)V}
     */
-   protected void finishRam(ServerWorld world, GoatEntity arg2) {
-      world.sendEntityStatus(arg2, EntityStatuses.FINISH_RAM);
-      arg2.getBrain().remember(MemoryModuleType.RAM_COOLDOWN_TICKS, ((UniformIntProvider)this.cooldownRangeFactory.apply(arg2)).get(world.random));
-      arg2.getBrain().forget(MemoryModuleType.RAM_TARGET);
+   protected void finishRam(ServerWorld world, GoatEntity goat) {
+      world.sendEntityStatus(goat, EntityStatuses.FINISH_RAM);
+      goat.getBrain().remember(MemoryModuleType.RAM_COOLDOWN_TICKS, ((UniformIntProvider)this.cooldownRangeFactory.apply(goat)).get(world.random));
+      goat.getBrain().forget(MemoryModuleType.RAM_TARGET);
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/RangedApproachTask.java namedSrc/net/minecraft/entity/ai/brain/task/RangedApproachTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/RangedApproachTask.java	2024-03-27 00:01:39.980019690 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RangedApproachTask.java	2024-03-27 00:00:30.887552598 +0000
@@ -8,7 +8,6 @@
 import net.minecraft.entity.ai.brain.VisibleLivingEntitiesCache;
 import net.minecraft.entity.ai.brain.WalkTarget;
 import net.minecraft.entity.mob.MobEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_goundjki}
@@ -22,35 +21,37 @@
    private static final int WEAPON_REACH_REDUCTION = 1;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lybdhlji Lnet/minecraft/unmapped/C_goundjki;m_lybdhlji(F)Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/RangedApproachTask;create(F)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<MobEntity> m_lybdhlji(float f) {
-      return m_utrmigiy(arg -> f);
+   public static TaskControl<MobEntity> create(float speed) {
+      return create(entity -> speed);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_utrmigiy Lnet/minecraft/unmapped/C_goundjki;m_utrmigiy(Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/RangedApproachTask;create(Ljava/util/function/Function;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<MobEntity> m_utrmigiy(Function<LivingEntity, Float> function) {
-      return C_rcqaryar.m_elxiakeb(
-         arg -> arg.group(
-                  arg.m_mzwocaxv(MemoryModuleType.WALK_TARGET),
-                  arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
-                  arg.m_qgrmwbxe(MemoryModuleType.ATTACK_TARGET),
-                  arg.m_mzwocaxv(MemoryModuleType.VISIBLE_MOBS)
+   public static TaskControl<MobEntity> create(Function<LivingEntity, Float> speedGetter) {
+      return TaskBuilder.task(
+         instance -> instance.group(
+                  instance.registeredMemory(MemoryModuleType.WALK_TARGET),
+                  instance.registeredMemory(MemoryModuleType.LOOK_TARGET),
+                  instance.presentMemory(MemoryModuleType.ATTACK_TARGET),
+                  instance.registeredMemory(MemoryModuleType.VISIBLE_MOBS)
                )
                .apply(
-                  arg,
-                  (arg2, arg3, arg4, arg5) -> (world, arg7, l) -> {
-                        LivingEntity lv = arg.m_gcuzwcid(arg4);
-                        Optional<VisibleLivingEntitiesCache> optional = arg.m_oxjxfuhs(arg5);
+                  instance,
+                  (arg2, arg3, arg4, arg5) -> (world, entity, time) -> {
+                        LivingEntity lv = instance.getValue(arg4);
+                        Optional<VisibleLivingEntitiesCache> optional = instance.getValueOptional(arg5);
                         if (optional.isPresent()
                            && ((VisibleLivingEntitiesCache)optional.get()).contains(lv)
-                           && LookTargetUtil.isTargetWithinAttackRange(arg7, lv, 1)) {
-                           arg2.m_gfsxfard();
+                           && LookTargetUtil.isTargetWithinAttackRange(entity, lv, 1)) {
+                           arg2.forget();
                         } else {
-                           arg3.m_klbizcog(new EntityLookTarget(lv, true));
-                           arg2.m_klbizcog(new WalkTarget(new EntityLookTarget(lv, false), (Float)function.apply(arg7), 0));
+                           arg3.remember(new EntityLookTarget(lv, true));
+                           arg2.remember(new WalkTarget(new EntityLookTarget(lv, false), (Float)speedGetter.apply(entity), 0));
                         }
          
                         return true;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/RemoveOffHandItemTask.java namedSrc/net/minecraft/entity/ai/brain/task/RemoveOffHandItemTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/RemoveOffHandItemTask.java	2024-03-27 00:01:39.904019177 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RemoveOffHandItemTask.java	2024-03-27 00:00:30.803552009 +0000
@@ -4,7 +4,6 @@
 import net.minecraft.entity.mob.PiglinBrain;
 import net.minecraft.entity.mob.PiglinEntity;
 import net.minecraft.item.Items;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_vyvntkxx}
@@ -12,10 +11,11 @@
  */
 public class RemoveOffHandItemTask {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_tddxntol Lnet/minecraft/unmapped/C_vyvntkxx;m_tddxntol()Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/RemoveOffHandItemTask;create()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<PiglinEntity> m_tddxntol() {
-      return C_rcqaryar.m_elxiakeb(arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.ADMIRING_ITEM)).apply(arg, argx -> (world, arg2, l) -> {
+   public static TaskControl<PiglinEntity> create() {
+      return TaskBuilder.task(instance -> instance.group(instance.absentMemory(MemoryModuleType.ADMIRING_ITEM)).apply(instance, arg -> (world, arg2, l) -> {
                if (!arg2.getOffHandStack().isEmpty() && !arg2.getOffHandStack().isOf(Items.SHIELD)) {
                   PiglinBrain.consumeOffHandItem(arg2, true);
                   return true;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/RidingTask.java namedSrc/net/minecraft/entity/ai/brain/task/RidingTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/RidingTask.java	2024-03-27 00:01:40.024019987 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RidingTask.java	2024-03-27 00:00:30.935552935 +0000
@@ -4,7 +4,6 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_gvwpvxxk}
@@ -12,21 +11,22 @@
  */
 public class RidingTask {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_emalcrce Lnet/minecraft/unmapped/C_gvwpvxxk;m_emalcrce(ILjava/util/function/BiPredicate;)Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/RidingTask;create(ILjava/util/function/BiPredicate;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static <E extends LivingEntity> TaskControl<E> m_emalcrce(int i, BiPredicate<E, Entity> biPredicate) {
-      return C_rcqaryar.m_elxiakeb(arg -> arg.group(arg.m_mzwocaxv(MemoryModuleType.RIDE_TARGET)).apply(arg, arg2 -> (world, arg4, l) -> {
+   public static <E extends LivingEntity> TaskControl<E> create(int range, BiPredicate<E, Entity> alternativeRidePredicate) {
+      return TaskBuilder.task(arg -> arg.group(arg.registeredMemory(MemoryModuleType.RIDE_TARGET)).apply(arg, arg2 -> (world, arg4, l) -> {
                Entity lv = arg4.getVehicle();
-               Entity lv2 = (Entity)arg.m_oxjxfuhs(arg2).orElse(null);
+               Entity lv2 = (Entity)arg.getValueOptional(arg2).orElse(null);
                if (lv == null && lv2 == null) {
                   return false;
                } else {
                   Entity lv3 = lv == null ? lv2 : lv;
-                  if (canRideTarget(arg4, lv3, i) && !biPredicate.test(arg4, lv3)) {
+                  if (canRideTarget(arg4, lv3, range) && !alternativeRidePredicate.test(arg4, lv3)) {
                      return false;
                   } else {
                      arg4.stopRiding();
-                     arg2.m_gfsxfard();
+                     arg2.forget();
                      return true;
                   }
                }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/RingBellTask.java namedSrc/net/minecraft/entity/ai/brain/task/RingBellTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/RingBellTask.java	2024-03-27 00:01:39.940019420 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RingBellTask.java	2024-03-27 00:00:30.843552289 +0000
@@ -5,7 +5,6 @@
 import net.minecraft.block.Blocks;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.dynamic.GlobalPos;
 import net.minecraft.util.math.BlockPos;
 
@@ -26,14 +25,15 @@
    public static final int MAX_DISTANCE = 3;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_agirozlb Lnet/minecraft/unmapped/C_nivxeygp;m_agirozlb()Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/RingBellTask;create()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static TaskControl<LivingEntity> m_agirozlb() {
-      return C_rcqaryar.m_elxiakeb(arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.MEETING_POINT)).apply(arg, arg2 -> (world, arg4, l) -> {
+   public static TaskControl<LivingEntity> create() {
+      return TaskBuilder.task(instance -> instance.group(instance.presentMemory(MemoryModuleType.MEETING_POINT)).apply(instance, arg2 -> (world, arg4, l) -> {
                if (world.random.nextFloat() <= 0.95F) {
                   return false;
                } else {
-                  BlockPos lv = arg.<GlobalPos>m_gcuzwcid(arg2).getPos();
+                  BlockPos lv = instance.<GlobalPos>getValue(arg2).getPos();
                   if (lv.isWithinDistance(arg4.getBlockPos(), 3.0)) {
                      BlockState lv2 = world.getBlockState(lv);
                      if (lv2.isOf(Blocks.BELL)) {


The remaining diff is too long!

Please sign in to comment.