Skip to content

Commit

Permalink
a little bit of brain stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Mar 21, 2024
1 parent b84f0a8 commit 8de1466
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
8 changes: 8 additions & 0 deletions mappings/net/minecraft/entity/ai/brain/MemoryAccessor.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CLASS net/minecraft/unmapped/C_ujlmiamh net/minecraft/entity/ai/brain/MemoryAccessor
FIELD f_nnqvfqwh type Lnet/minecraft/unmapped/C_vbbyoqyw;
FIELD f_powfpjln value Lcom/mojang/datafixers/kinds/App;
METHOD m_bczdgokz remember (Ljava/util/Optional;)V
METHOD m_gfsxfard forget ()V
METHOD m_klbizcog remember (Ljava/lang/Object;)V
METHOD m_nrhekywp getValue ()Lcom/mojang/datafixers/kinds/App;
METHOD m_zjdztcmb remember (Ljava/lang/Object;J)V
7 changes: 7 additions & 0 deletions mappings/net/minecraft/entity/ai/brain/MemoryCondition.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
CLASS net/minecraft/unmapped/C_brqsauyi net/minecraft/entity/ai/brain/MemoryCondition
METHOD m_cyqhacmu memory ()Lnet/minecraft/unmapped/C_vbbyoqyw;
METHOD m_hpvhaael getState ()Lnet/minecraft/unmapped/C_nbxzedfr;
METHOD m_jpmatyzp createAccessor (Lnet/minecraft/unmapped/C_rjqjaxef;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_ujlmiamh;
ARG 2 value
CLASS C_hgylnsbj Registered
CLASS C_kkgwskag Absent
CLASS C_svzyywmd Present
1 change: 1 addition & 0 deletions mappings/net/minecraft/entity/ai/brain/task/TaskBuilder.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/unmapped/C_rcqaryar net/minecraft/entity/ai/brain/task/TaskBuilder

3 comments on commit 8de1466

@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 8de1466, 107 file(s) were updated with 658 line(s) added and 688 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
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-21 03:32:24.883862175 +0000
+++ namedSrc/net/minecraft/client/render/debug/PathfindingDebugRenderer.java	2024-03-21 03:31:15.511948406 +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,
Only in namedSrc/net/minecraft/entity/ai/brain: MemoryAccessor.java
Only in namedSrc/net/minecraft/entity/ai/brain: MemoryCondition.java
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-21 03:32:24.763862275 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/AdmireItemTask.java	2024-03-21 03:31:15.315948655 +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}
@@ -16,7 +15,7 @@
     * @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(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_qgrmwbxe(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM),
                   arg.m_owejzxbp(MemoryModuleType.ADMIRING_ITEM),
@@ -28,7 +27,7 @@
                      if (!PiglinBrain.isGoldenItem(lv.getStack())) {
                         return false;
                      } else {
-                        arg3.m_zjdztcmb(true, (long)i);
+                        arg3.remember(true, (long)i);
                         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-21 03:32:24.883862175 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/AdmireItemTimeLimitTask.java	2024-03-21 03:31:15.511948406 +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}
@@ -15,7 +14,7 @@
     * @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(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_qgrmwbxe(MemoryModuleType.ADMIRING_ITEM),
                   arg.m_qgrmwbxe(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM),
@@ -28,15 +27,15 @@
                      } else {
                         Optional<Integer> optional = arg.m_oxjxfuhs(arg4);
                         if (optional.isEmpty()) {
-                           arg4.m_klbizcog(0);
+                           arg4.remember(0);
                         } else {
                            int k = (Integer)optional.get();
                            if (k > i) {
-                              arg2.m_gfsxfard();
-                              arg4.m_gfsxfard();
-                              arg5.m_zjdztcmb(true, (long)j);
+                              arg2.forget();
+                              arg4.forget();
+                              arg5.remember(true, (long)j);
                            } else {
-                              arg4.m_klbizcog(k + 1);
+                              arg4.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-21 03:32:24.919862144 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/AttackTask.java	2024-03-21 03:31:15.551948356 +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;
 
 /**
@@ -19,7 +18,7 @@
     * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/AttackTask;run(IF)Lnet/minecraft/entity/ReportingTaskControl;}
     */
    public static ReportingTaskControl<MobEntity> run(int i, float f) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_owejzxbp(MemoryModuleType.WALK_TARGET),
                   arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
@@ -29,7 +28,7 @@
                .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));
+                        arg3.remember(new EntityLookTarget(lv, true));
                         arg6.getMoveControl().strafeTo(-f, 0.0F);
                         arg6.setYaw(MathHelper.stepAngleTowards(arg6.getYaw(), arg6.headYaw, 0.0F));
                         return true;
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-21 03:32:24.899862161 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/DefeatTargetTask.java	2024-03-21 03:31:15.527948386 +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,7 +16,7 @@
     * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/DefeatTargetTask;run(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(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_qgrmwbxe(MemoryModuleType.ATTACK_TARGET),
                   arg.m_mzwocaxv(MemoryModuleType.ANGRY_AT),
@@ -30,13 +29,13 @@
                         return false;
                      } else {
                         if (biPredicate.test(arg7, lv)) {
-                           arg5.m_zjdztcmb(true, (long)i);
+                           arg5.remember(true, (long)i);
                         }
       
-                        arg4.m_zjdztcmb(lv.getBlockPos(), (long)i);
+                        arg4.remember(lv.getBlockPos(), (long)i);
                         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-21 03:32:24.907862155 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/EndRaidTask.java	2024-03-21 03:31:15.539948371 +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;
 
 /**
@@ -16,7 +15,7 @@
     * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/EndRaidTask;run()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
    public static TaskControl<LivingEntity> run() {
-      return C_rcqaryar.m_elxiakeb(arg -> arg.point((world, arg2, l) -> {
+      return TaskBuilder.m_elxiakeb(arg -> arg.point((world, arg2, l) -> {
             if (world.random.nextInt(20) != 0) {
                return false;
             } else {
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-21 03:32:24.835862215 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FindEntityTask.java	2024-03-21 03:31:15.435948503 +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}
@@ -31,7 +30,7 @@
    ) {
       int k = i * i;
       Predicate<LivingEntity> predicate3 = entity -> arg.equals(entity.getType()) && predicate2.test(entity);
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg2x -> arg2x.group(
                   arg2x.m_mzwocaxv(arg2),
                   arg2x.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
@@ -43,9 +42,9 @@
                      if (predicate.test(arg7) && lv.anyMatch(predicate3)) {
                         Optional<LivingEntity> optional = lv.getFirst(arg2xxxx -> arg2xxxx.squaredDistanceTo(arg7) <= (double)k && predicate3.test(arg2xxxx));
                         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));
+                           arg2xx.remember(arg4xx);
+                           arg3.remember(new EntityLookTarget(arg4xx, true));
+                           arg4.remember(new WalkTarget(new EntityLookTarget(arg4xx, false), f, j));
                         });
                         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-21 03:32:24.811862235 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FindInteractionTargetTask.java	2024-03-21 03:31:15.411948533 +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}
@@ -19,7 +18,7 @@
     */
    public static TaskControl<LivingEntity> run(EntityType<?> arg, int i) {
       int j = i * i;
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg2 -> arg2.group(
                   arg2.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
                   arg2.m_owejzxbp(MemoryModuleType.INTERACTION_TARGET),
@@ -34,8 +33,8 @@
                            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-21 03:32:24.711862319 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FindLandNearWaterTask.java	2024-03-21 03:31:15.247948741 +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;
@@ -23,7 +22,7 @@
     */
    public static TaskControl<PathAwareEntity> run(int i, float f) {
       MutableLong mutableLong = new MutableLong(0L);
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_owejzxbp(MemoryModuleType.ATTACK_TARGET), arg.m_owejzxbp(MemoryModuleType.WALK_TARGET), arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET)
                )
@@ -48,8 +47,8 @@
                                  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), f, 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-21 03:32:24.887862171 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FindLandTask.java	2024-03-21 03:31:15.511948406 +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;
@@ -30,7 +29,7 @@
     */
    public static TaskControl<PathAwareEntity> run(int i, float f) {
       MutableLong mutableLong = new MutableLong(0L);
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_owejzxbp(MemoryModuleType.ATTACK_TARGET), arg.m_owejzxbp(MemoryModuleType.WALK_TARGET), arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET)
                )
@@ -56,8 +55,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), f, 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-21 03:32:24.679862346 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.java	2024-03-21 03:31:15.219948777 +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;
@@ -57,7 +56,7 @@
       int j = 20;
       MutableLong mutableLong = new MutableLong(0L);
       Long2ObjectMap<FindPointOfInterestTask.RetryMarker> long2ObjectMap = new Long2ObjectOpenHashMap<>();
-      ReportingTaskControl<PathAwareEntity> lv = C_rcqaryar.m_elxiakeb(
+      ReportingTaskControl<PathAwareEntity> lv = TaskBuilder.m_elxiakeb(
          arg2x -> arg2x.group(arg2x.m_owejzxbp(arg2))
                .apply(
                   arg2x,
@@ -94,7 +93,7 @@
                               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));
+                                 argxx.remember(GlobalPos.create(world.getRegistryKey(), lv3));
                                  optional.ifPresent(arg3xx -> world.sendEntityStatus(arg3, arg3xx));
                                  long2ObjectMap.clear();
                                  DebugInfoSender.sendPointOfInterest(world, lv3);
@@ -115,7 +114,7 @@
                      }
                )
       );
-      return arg2 == arg ? lv : C_rcqaryar.m_elxiakeb(arg3 -> arg3.group(arg3.m_owejzxbp(arg)).apply(arg3, arg2xx -> lv));
+      return arg2 == arg ? lv : TaskBuilder.m_elxiakeb(arg3 -> arg3.group(arg3.m_owejzxbp(arg)).apply(arg3, arg2xx -> lv));
    }
 
    /**
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-21 03:32:24.715862316 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FindWalkTargetTask.java	2024-03-21 03:31:15.255948731 +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;
@@ -41,7 +40,7 @@
     * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/FindWalkTargetTask;run(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) -> {
+      return TaskBuilder.m_elxiakeb(arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.WALK_TARGET)).apply(arg, argx -> (world, arg3, l) -> {
                BlockPos lv = arg3.getBlockPos();
                Vec3d lv2;
                if (world.isNearOccupiedPointOfInterest(lv)) {
@@ -56,7 +55,7 @@
                   }
                }
 
-               argx.m_bczdgokz(Optional.ofNullable(lv2).map(argxxx -> new WalkTarget(argxxx, f, 0)));
+               argx.remember(Optional.ofNullable(lv2).map(argxxx -> new WalkTarget(argxxx, f, 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-21 03:32:24.927862138 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FollowMobTask.java	2024-03-21 03:31:15.563948341 +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}
@@ -44,7 +43,7 @@
     */
    public static ReportingTaskControl<LivingEntity> m_xtjussog(Predicate<LivingEntity> predicate, float f) {
       float g = f * f;
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.LOOK_TARGET), arg.m_qgrmwbxe(MemoryModuleType.VISIBLE_MOBS))
                .apply(
                   arg,
@@ -54,7 +53,7 @@
                         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-21 03:32:24.923862141 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.java	2024-03-21 03:31:15.555948350 +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,7 +16,7 @@
     * @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(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.ANGRY_AT))
                .apply(
                   arg,
@@ -26,7 +25,7 @@
                            .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-21 03:32:24.787862255 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.java	2024-03-21 03:31:15.367948589 +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}
@@ -50,7 +49,7 @@
     * @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;}
     */
    public static <E extends MobEntity> TaskControl<E> run(Predicate<LivingEntity> alternativeCondition, BiConsumer<E, LivingEntity> forgetCallback, boolean bl) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.ATTACK_TARGET), arg.m_mzwocaxv(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE))
                .apply(
                   arg,
@@ -64,7 +63,7 @@
                            return true;
                         } else {
                            forgetCallback.accept(arg5, lv);
-                           arg2.m_gfsxfard();
+                           arg2.forget();
                            return true;
                         }
                      }
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-21 03:32:24.907862155 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/ForgetBellRingTask.java	2024-03-21 03:31:15.539948371 +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;
@@ -25,7 +24,7 @@
    public static TaskControl<LivingEntity> run(int i, int j) {
       int k = i * 20;
       MutableInt mutableInt = new MutableInt(0);
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.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);
@@ -38,8 +37,8 @@
       
                         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-21 03:32:24.911862151 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.java	2024-03-21 03:31:15.543948366 +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) -> {
+      return TaskBuilder.m_elxiakeb(arg2 -> arg2.group(arg2.m_qgrmwbxe(pos)).apply(arg2, arg2x -> (world, arg4, l) -> {
                GlobalPos lv = arg2.m_gcuzwcid(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-21 03:32:24.863862192 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/ForgetTask.java	2024-03-21 03:31:15.463948467 +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.m_elxiakeb(arg2 -> arg2.group(arg2.m_qgrmwbxe(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/GoToIfNearbyTask.java namedSrc/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.java	2024-03-21 03:32:24.903862158 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.java	2024-03-21 03:31:15.535948376 +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;
@@ -38,7 +37,7 @@
     */
    public static ReportingTaskControl<PathAwareEntity> run(MemoryModuleType<GlobalPos> pos, float f, int i) {
       MutableLong mutableLong = new MutableLong(0L);
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.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)) {
@@ -47,7 +46,7 @@
                      return true;
                   } else {
                      Optional<Vec3d> optional = Optional.ofNullable(FuzzyTargeting.find(arg5, 8, 6));
-                     arg2x.m_bczdgokz(optional.map(argxxx -> new WalkTarget(argxxx, f, 1)));
+                     arg2x.remember(optional.map(argxxx -> new WalkTarget(argxxx, f, 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-21 03:32:24.663862360 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.java	2024-03-21 03:31:15.195948807 +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;
 
@@ -18,7 +17,7 @@
     */
    public static TaskControl<PathAwareEntity> run(MemoryModuleType<GlobalPos> pos, float f, int i, int j) {
       MutableLong mutableLong = new MutableLong(0L);
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.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)) {
@@ -26,7 +25,7 @@
                   } else if (l <= mutableLong.getValue()) {
                      return true;
                   } else {
-                     arg2x.m_klbizcog(new WalkTarget(lv.getPos(), f, i));
+                     arg2x.remember(new WalkTarget(lv.getPos(), f, i));
                      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-21 03:32:24.831862219 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.java	2024-03-21 03:31:15.431948508 +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;
@@ -20,7 +19,7 @@
     * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/GoToPointOfInterestTask;run(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) -> {
+      return TaskBuilder.m_elxiakeb(arg -> arg.group(arg.m_owejzxbp(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, f, i));
                   }
 
                   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-21 03:32:24.851862202 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GoToRememberedPositionTask.java	2024-03-21 03:31:15.455948477 +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;
 
@@ -40,7 +39,7 @@
     * @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;}
     */
    private static <T> ReportingTaskControl<PathAwareEntity> run(MemoryModuleType<T> arg, float f, int i, boolean bl, Function<T, Vec3d> function) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.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) {
@@ -62,7 +61,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));
+                              arg2x.remember(new WalkTarget(lv5, f, 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-21 03:32:24.903862158 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GoToSecondaryPositionTask.java	2024-03-21 03:31:15.531948381 +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;
 
@@ -18,7 +17,7 @@
     */
    public static TaskControl<VillagerEntity> m_jdsyhtbe(MemoryModuleType<List<GlobalPos>> arg, float f, int i, int j, MemoryModuleType<GlobalPos> arg2) {
       MutableLong mutableLong = new MutableLong(0L);
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.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);
@@ -29,7 +28,7 @@
                         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 (l > mutableLong.getValue()) {
-                              arg2xx.m_klbizcog(new WalkTarget(lv2.getPos(), f, i));
+                              arg2xx.remember(new WalkTarget(lv2.getPos(), f, i));
                               mutableLong.setValue(l + 100L);
                            }
       
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-21 03:32:24.783862259 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GoTowardsLookTarget.java	2024-03-21 03:31:15.347948614 +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}
@@ -24,13 +23,13 @@
     * Mapping not found
     */
    public static ReportingTaskControl<LivingEntity> m_dgrcrase(Predicate<LivingEntity> predicate, Function<LivingEntity, Float> function, int i) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.WALK_TARGET), arg.m_qgrmwbxe(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.m_gcuzwcid(arg3), (Float)function.apply(arg5), i));
                         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-21 03:32:24.799862245 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GoToWorkTask.java	2024-03-21 03:31:15.399948548 +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;
 
@@ -19,7 +18,7 @@
     * Mapping not found
     */
    public static TaskControl<VillagerEntity> m_tnlvczom() {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.POTENTIAL_JOB_SITE), arg.m_mzwocaxv(MemoryModuleType.JOB_SITE))
                .apply(
                   arg,
@@ -28,8 +27,8 @@
                         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;
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-21 03:32:24.919862144 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/HideInHomeTask.java	2024-03-21 03:31:15.555948350 +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;
@@ -18,7 +17,7 @@
     * Mapping not found
     */
    public static ReportingTaskControl<LivingEntity> m_frsalpsy(int i, float f, int j) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_owejzxbp(MemoryModuleType.WALK_TARGET),
                   arg.m_mzwocaxv(MemoryModuleType.HOME),
@@ -53,13 +52,13 @@
                            )
                            .or(() -> arg.m_oxjxfuhs(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));
+                              arg5.forget();
+                              arg6.forget();
+                              arg7.forget();
+                              arg8.forget();
+                              arg4.remember(GlobalPos.create(world.getRegistryKey(), pos));
                               if (!pos.isCenterWithinDistance(arg10.getPos(), (double)j)) {
-                                 arg2.m_klbizcog(new WalkTarget(pos, f, j));
+                                 arg2.remember(new WalkTarget(pos, f, j));
                               }
                            });
                         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-21 03:32:24.815862232 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/HideWhenBellRingsTask.java	2024-03-21 03:31:15.415948528 +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;
 
 /**
@@ -15,7 +14,7 @@
     * Mapping not found
     */
    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) -> {
+      return TaskBuilder.m_elxiakeb(arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.HEARD_BELL_TIME)).apply(arg, argx -> (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/HuntFinishTask.java namedSrc/net/minecraft/entity/ai/brain/task/HuntFinishTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/HuntFinishTask.java	2024-03-21 03:32:24.883862175 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/HuntFinishTask.java	2024-03-21 03:31:15.511948406 +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}
@@ -15,12 +14,12 @@
     * Mapping not found
     */
    public static TaskControl<LivingEntity> m_miccftlt() {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.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);
                      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-21 03:32:24.719862313 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/HuntHoglinTask.java	2024-03-21 03:31:15.259948726 +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}
@@ -17,7 +16,7 @@
     * Mapping not found
     */
    public static ReportingTaskControl<PiglinEntity> m_lfndeqov() {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_qgrmwbxe(MemoryModuleType.NEAREST_VISIBLE_HUNTABLE_HOGLIN),
                   arg.m_owejzxbp(MemoryModuleType.ANGRY_AT),
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-21 03:32:24.715862316 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/InvestigateDisturbanceTask.java	2024-03-21 03:31:15.259948726 +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;
 
@@ -33,7 +32,7 @@
     * Mapping not found
     */
    public static <E extends MobEntity> ReportingTaskControl<E> m_avcbdjof(MemoryModuleType<BlockPos> arg, int i, float f) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg2 -> arg2.group(
                   arg2.m_qgrmwbxe(arg),
                   arg2.m_owejzxbp(MemoryModuleType.ATTACK_TARGET),
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-21 03:32:24.911862151 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/LayFrogSpawnTask.java	2024-03-21 03:31:15.547948361 +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;
@@ -22,7 +21,7 @@
     * @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;}
     */
    public static TaskControl<LivingEntity> m_rlgbgizw(Block block) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg2 -> arg2.group(
                   arg2.m_owejzxbp(MemoryModuleType.ATTACK_TARGET), arg2.m_qgrmwbxe(MemoryModuleType.WALK_TARGET), arg2.m_qgrmwbxe(MemoryModuleType.IS_PREGNANT)
                )
@@ -42,7 +41,7 @@
                                     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-21 03:32:24.787862255 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/LongJumpTask.java	2024-03-21 03:31:15.355948604 +0000
@@ -128,10 +128,10 @@
     * @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}
     */
-   public static <E extends MobEntity> boolean m_jnajycle(E arg, BlockPos pos) {
-      World lv = arg.getWorld();
+   public static <E extends MobEntity> boolean m_jnajycle(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;
    }
 
    /**
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-21 03:32:24.803862242 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask.java	2024-03-21 03:31:15.399948548 +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;
 
@@ -15,7 +14,7 @@
     * Mapping not found
     */
    public static TaskControl<VillagerEntity> m_okyonjrx() {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.JOB_SITE))
                .apply(
                   arg,
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-21 03:32:24.867862188 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/MeetVillagerTask.java	2024-03-21 03:31:15.467948461 +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;
 
 /**
@@ -25,7 +24,7 @@
     * Mapping not found
     */
    public static ReportingTaskControl<LivingEntity> m_bsalxkul() {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_mzwocaxv(MemoryModuleType.WALK_TARGET),
                   arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
@@ -43,9 +42,9 @@
                            && lv.getPos().isCenterWithinDistance(arg8.getPos(), 4.0)
                            && lv2.anyMatch(argxxx -> EntityType.VILLAGER.equals(argxxx.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-21 03:32:24.679862346 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/MeleeAttackTask.java	2024-03-21 03:31:15.219948777 +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;
 
 /**
@@ -20,7 +19,7 @@
     * Mapping not found
     */
    public static ReportingTaskControl<MobEntity> m_bsseqsar(int i) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
                   arg.m_qgrmwbxe(MemoryModuleType.ATTACK_TARGET),
@@ -30,10 +29,10 @@
                .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));
+                        arg2.remember(new EntityLookTarget(lv, true));
                         arg7.swingHand(Hand.MAIN_HAND);
                         arg7.tryAttack(lv);
-                        arg4.m_zjdztcmb(true, (long)i);
+                        arg4.remember(true, (long)i);
                         return true;
                      } else {
                         return false;
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-21 03:32:24.803862242 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/MemoryTransferTask.java	2024-03-21 03:31:15.403948543 +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;
 
 /**
@@ -17,11 +16,11 @@
    public static <E extends LivingEntity, T> TaskControl<E> m_algmjnve(
       Predicate<E> predicate, MemoryModuleType<? extends T> arg, MemoryModuleType<T> arg2, UniformIntProvider arg3
    ) {
-      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.m_elxiakeb(arg4 -> arg4.group(arg4.m_qgrmwbxe(arg), arg4.m_owejzxbp(arg2)).apply(arg4, (arg3xx, 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.m_gcuzwcid(arg3xx), (long)arg3.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-21 03:32:24.819862228 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/OpenDoorsTask.java	2024-03-21 03:31:15.419948523 +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;
@@ -51,7 +50,7 @@
    public static TaskControl<LivingEntity> m_ggugtmce() {
       MutableObject<PathNode> mutableObject = new MutableObject<>(null);
       MutableInt mutableInt = new MutableInt(0);
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.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);
@@ -183,10 +182,10 @@
 
    /**
     * @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>> arg, Optional<Set<GlobalPos>> optional, ServerWorld world, BlockPos pos
    ) {
       GlobalPos lv = GlobalPos.create(world.getRegistryKey(), pos);
       return Optional.of((Set)optional.map(set -> {
@@ -194,7 +193,7 @@
          return set;
       }).orElseGet(() -> {
          Set<GlobalPos> set = Sets.<GlobalPos>newHashSet(lv);
-         arg.m_klbizcog(set);
+         arg.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-21 03:32:24.687862340 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/PacifyTask.java	2024-03-21 03:31:15.223948772 +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}
@@ -13,11 +12,11 @@
     * Mapping not found
     */
    public static TaskControl<LivingEntity> m_dlfrarsr(MemoryModuleType<?> arg, int i) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.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();
+                     arg2x.remember(true, (long)i);
+                     argxx.forget();
                      return true;
                   }))
       );

@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/PlayDeadTimerTask.java namedSrc/net/minecraft/entity/ai/brain/task/PlayDeadTimerTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/PlayDeadTimerTask.java	2024-03-21 03:32:24.923862141 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/PlayDeadTimerTask.java	2024-03-21 03:31:15.555948350 +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}
@@ -13,16 +12,16 @@
     * Mapping not found
     */
    public static TaskControl<LivingEntity> m_pgllasaj() {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.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);
                      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-21 03:32:24.795862248 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.java	2024-03-21 03:31:15.375948579 +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;
 
@@ -58,7 +57,7 @@
     * Mapping not found
     */
    public static TaskControl<PathAwareEntity> m_ebfbnoua() {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_qgrmwbxe(MemoryModuleType.VISIBLE_VILLAGER_BABIES),
                   arg.m_owejzxbp(MemoryModuleType.WALK_TARGET),
@@ -84,7 +83,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,12 +97,14 @@
 
    /**
     * @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> arg, MemoryAccessor<?, LookTarget> arg2, MemoryAccessor<?, WalkTarget> arg3, LivingEntity target
+   ) {
+      arg.remember(target);
+      arg2.remember(new EntityLookTarget(target, true));
+      arg3.remember(new WalkTarget(new EntityLookTarget(target, false), 0.6F, 1));
    }
 
    /**
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-21 03:32:24.923862141 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/PrepareRamTask.java	2024-03-21 03:31:15.559948346 +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/RangedApproachTask.java namedSrc/net/minecraft/entity/ai/brain/task/RangedApproachTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/RangedApproachTask.java	2024-03-21 03:32:24.795862248 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RangedApproachTask.java	2024-03-21 03:31:15.391948559 +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}
@@ -32,7 +31,7 @@
     * Mapping not found
     */
    public static TaskControl<MobEntity> m_utrmigiy(Function<LivingEntity, Float> function) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_mzwocaxv(MemoryModuleType.WALK_TARGET),
                   arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
@@ -47,10 +46,10 @@
                         if (optional.isPresent()
                            && ((VisibleLivingEntitiesCache)optional.get()).contains(lv)
                            && LookTargetUtil.isTargetWithinAttackRange(arg7, lv, 1)) {
-                           arg2.m_gfsxfard();
+                           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)function.apply(arg7), 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-21 03:32:24.735862299 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RemoveOffHandItemTask.java	2024-03-21 03:31:15.279948700 +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}
@@ -15,7 +14,7 @@
     * Mapping not found
     */
    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) -> {
+      return TaskBuilder.m_elxiakeb(arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.ADMIRING_ITEM)).apply(arg, argx -> (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-21 03:32:24.843862209 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RidingTask.java	2024-03-21 03:31:15.439948498 +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}
@@ -15,7 +14,7 @@
     * Mapping not found
     */
    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) -> {
+      return TaskBuilder.m_elxiakeb(arg -> arg.group(arg.m_mzwocaxv(MemoryModuleType.RIDE_TARGET)).apply(arg, arg2 -> (world, arg4, l) -> {
                Entity lv = arg4.getVehicle();
                Entity lv2 = (Entity)arg.m_oxjxfuhs(arg2).orElse(null);
                if (lv == null && lv2 == null) {
@@ -26,7 +25,7 @@
                      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-21 03:32:24.763862275 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RingBellTask.java	2024-03-21 03:31:15.315948655 +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;
 
@@ -29,7 +28,7 @@
     * Mapping not found
     */
    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) -> {
+      return TaskBuilder.m_elxiakeb(arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.MEETING_POINT)).apply(arg, arg2 -> (world, arg4, l) -> {
                if (world.random.nextFloat() <= 0.95F) {
                   return false;
                } else {
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/RoarTargetSelectorTask.java namedSrc/net/minecraft/entity/ai/brain/task/RoarTargetSelectorTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/RoarTargetSelectorTask.java	2024-03-21 03:32:24.931862134 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RoarTargetSelectorTask.java	2024-03-21 03:31:15.571948330 +0000
@@ -5,7 +5,6 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.mob.warden.WardenEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_oququeao}
@@ -16,7 +15,7 @@
     * Mapping not found
     */
    public static <E extends WardenEntity> TaskControl<E> m_sdkgypjp(Function<E, Optional<? extends LivingEntity>> function) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_owejzxbp(MemoryModuleType.ROAR_TARGET),
                   arg.m_owejzxbp(MemoryModuleType.ATTACK_TARGET),
@@ -27,8 +26,8 @@
                      if (optional.filter(arg4::isEnemy).isEmpty()) {
                         return false;
                      } else {
-                        argx.m_klbizcog((LivingEntity)optional.get());
-                        arg3.m_gfsxfard();
+                        argx.remember((LivingEntity)optional.get());
+                        arg3.forget();
                         return true;
                      }
                   })
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/ScheduleActivityTask.java namedSrc/net/minecraft/entity/ai/brain/task/ScheduleActivityTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/ScheduleActivityTask.java	2024-03-21 03:32:24.851862202 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/ScheduleActivityTask.java	2024-03-21 03:31:15.455948477 +0000
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai.brain.task;
 
 import net.minecraft.entity.LivingEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_owbqddjg}
@@ -12,7 +11,7 @@
     * Mapping not found
     */
    public static TaskControl<LivingEntity> m_ajwcvkyk() {
-      return C_rcqaryar.m_elxiakeb(arg -> arg.point((world, arg2, l) -> {
+      return TaskBuilder.m_elxiakeb(arg -> arg.point((world, arg2, l) -> {
             arg2.getBrain().refreshActivities(world.getTimeOfDay(), world.getTime());
             return true;
          }));
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/SeekSkyTask.java namedSrc/net/minecraft/entity/ai/brain/task/SeekSkyTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/SeekSkyTask.java	2024-03-21 03:32:24.923862141 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/SeekSkyTask.java	2024-03-21 03:31:15.559948346 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.WalkTarget;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.random.RandomGenerator;
@@ -22,12 +21,12 @@
     * Mapping not found
     */
    public static ReportingTaskControl<LivingEntity> m_essunjsd(float f) {
-      return C_rcqaryar.m_elxiakeb(arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.WALK_TARGET)).apply(arg, argx -> (world, arg3, l) -> {
+      return TaskBuilder.m_elxiakeb(arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.WALK_TARGET)).apply(arg, argx -> (world, arg3, l) -> {
                if (world.isSkyVisible(arg3.getBlockPos())) {
                   return false;
                } else {
                   Optional<Vec3d> optional = Optional.ofNullable(findNearbySky(world, arg3));
-                  optional.ifPresent(arg2 -> argx.m_klbizcog(new WalkTarget(arg2, f, 0)));
+                  optional.ifPresent(arg2 -> argx.remember(new WalkTarget(arg2, f, 0)));
                   return true;
                }
             }));
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/SeekWaterTask.java namedSrc/net/minecraft/entity/ai/brain/task/SeekWaterTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/SeekWaterTask.java	2024-03-21 03:32:24.867862188 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/SeekWaterTask.java	2024-03-21 03:31:15.471948457 +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 org.apache.commons.lang3.mutable.MutableLong;
 
@@ -21,7 +20,7 @@
     */
    public static TaskControl<PathAwareEntity> m_xugfnoic(int i, float f) {
       MutableLong mutableLong = new MutableLong(0L);
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_owejzxbp(MemoryModuleType.ATTACK_TARGET), arg.m_owejzxbp(MemoryModuleType.WALK_TARGET), arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET)
                )
@@ -58,8 +57,8 @@
                         }
       
                         if (lv != null) {
-                           arg3.m_klbizcog(new BlockPosLookTarget(lv));
-                           arg2.m_klbizcog(new WalkTarget(new BlockPosLookTarget(lv), f, 0));
+                           arg3.remember(new BlockPosLookTarget(lv));
+                           arg2.remember(new WalkTarget(new BlockPosLookTarget(lv), f, 0));
                         }
       
                         mutableLong.setValue(l + 40L);
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/StartRaidTask.java namedSrc/net/minecraft/entity/ai/brain/task/StartRaidTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/StartRaidTask.java	2024-03-21 03:32:24.887862171 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/StartRaidTask.java	2024-03-21 03:31:15.515948402 +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;
 
 /**
@@ -15,7 +14,7 @@
     * Mapping not found
     */
    public static TaskControl<LivingEntity> m_hpsklqqe() {
-      return C_rcqaryar.m_elxiakeb(arg -> arg.point((world, arg2, l) -> {
+      return TaskBuilder.m_elxiakeb(arg -> arg.point((world, arg2, l) -> {
             if (world.random.nextInt(20) != 0) {
                return false;
             } else {
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/StartRidingTask.java namedSrc/net/minecraft/entity/ai/brain/task/StartRidingTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/StartRidingTask.java	2024-03-21 03:32:24.787862255 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/StartRidingTask.java	2024-03-21 03:31:15.355948604 +0000
@@ -5,7 +5,6 @@
 import net.minecraft.entity.ai.brain.EntityLookTarget;
 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_xydhluxp}
@@ -22,7 +21,7 @@
     * Mapping not found
     */
    public static TaskControl<LivingEntity> m_mxhhcnwc(float f) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET), arg.m_owejzxbp(MemoryModuleType.WALK_TARGET), arg.m_qgrmwbxe(MemoryModuleType.RIDE_TARGET)
                )
@@ -34,8 +33,8 @@
                         if (lv.isInRange(arg6, 1.0)) {
                            arg6.startRiding(lv);
                         } else {
-                           arg2.m_klbizcog(new EntityLookTarget(lv, true));
-                           arg3.m_klbizcog(new WalkTarget(new EntityLookTarget(lv, false), f, 1));
+                           arg2.remember(new EntityLookTarget(lv, true));
+                           arg3.remember(new WalkTarget(new EntityLookTarget(lv, false), f, 1));
                         }
       
                         return true;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/StartSniffingTask.java namedSrc/net/minecraft/entity/ai/brain/task/StartSniffingTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/StartSniffingTask.java	2024-03-21 03:32:24.895862165 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/StartSniffingTask.java	2024-03-21 03:31:15.523948391 +0000
@@ -3,7 +3,6 @@
 import net.minecraft.entity.EntityPose;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.Unit;
 import net.minecraft.util.math.int_provider.IntProvider;
 import net.minecraft.util.math.int_provider.UniformIntProvider;
@@ -23,7 +22,7 @@
     * Mapping not found
     */
    public static TaskControl<LivingEntity> m_puxtqkbo() {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_mzwocaxv(MemoryModuleType.IS_SNIFFING),
                   arg.m_mzwocaxv(MemoryModuleType.WALK_TARGET),
@@ -32,9 +31,9 @@
                   arg.m_owejzxbp(MemoryModuleType.DISTURBANCE_LOCATION)
                )
                .apply(arg, (argx, arg2, arg3, arg4, arg5) -> (world, arg5x, l) -> {
-                     argx.m_klbizcog(Unit.INSTANCE);
-                     arg3.m_zjdztcmb(Unit.INSTANCE, (long)SNIFF_COOLDOWN.get(world.getRandom()));
-                     arg2.m_gfsxfard();
+                     argx.remember(Unit.INSTANCE);
+                     arg3.remember(Unit.INSTANCE, (long)SNIFF_COOLDOWN.get(world.getRandom()));
+                     arg2.forget();
                      arg5x.setPose(EntityPose.SNIFFING);
                      return true;
                   })
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/StayCloseToTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/StayCloseToTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/StayCloseToTargetTask.java	2024-03-21 03:32:24.935862131 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/StayCloseToTargetTask.java	2024-03-21 03:31:15.575948325 +0000
@@ -7,7 +7,6 @@
 import net.minecraft.entity.ai.brain.LookTarget;
 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_xwbaenjp}
@@ -20,7 +19,7 @@
    public static TaskControl<LivingEntity> m_mxvxpsri(
       Function<LivingEntity, Optional<LookTarget>> function, Predicate<LivingEntity> predicate, int i, int j, float f
    ) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET), arg.m_mzwocaxv(MemoryModuleType.WALK_TARGET))
                .apply(arg, (argx, arg2) -> (world, arg4, l) -> {
                      Optional<LookTarget> optional = (Optional<LookTarget>)function.apply(arg4);
@@ -30,8 +29,8 @@
                            return false;
                         } else {
                            LookTarget lv2 = (LookTarget)optional.get();
-                           argx.m_klbizcog(lv2);
-                           arg2.m_klbizcog(new WalkTarget(lv2, f, i));
+                           argx.remember(lv2);
+                           arg2.remember(new WalkTarget(lv2, f, i));
                            return true;
                         }
                      } else {
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/StopPanickingTask.java namedSrc/net/minecraft/entity/ai/brain/task/StopPanickingTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/StopPanickingTask.java	2024-03-21 03:32:24.787862255 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/StopPanickingTask.java	2024-03-21 03:31:15.355948604 +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_qxrttckt}
@@ -19,7 +18,7 @@
     * Mapping not found
     */
    public static TaskControl<LivingEntity> m_ocrzuroh() {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_mzwocaxv(MemoryModuleType.HURT_BY), arg.m_mzwocaxv(MemoryModuleType.HURT_BY_ENTITY), arg.m_mzwocaxv(MemoryModuleType.NEAREST_HOSTILE)
                )
@@ -30,8 +29,8 @@
                            || arg.m_oxjxfuhs(arg4).isPresent()
                            || arg.m_oxjxfuhs(arg3).filter(arg2xx -> arg2xx.squaredDistanceTo(arg6) <= 36.0).isPresent();
                         if (!bl) {
-                           arg2.m_gfsxfard();
-                           arg3.m_gfsxfard();
+                           arg2.forget();
+                           arg3.forget();
                            arg6.getBrain().refreshActivities(world.getTimeOfDay(), world.getTime());
                         }
          
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/StrollTask.java namedSrc/net/minecraft/entity/ai/brain/task/StrollTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/StrollTask.java	2024-03-21 03:32:24.891862168 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/StrollTask.java	2024-03-21 03:31:15.519948397 +0000
@@ -10,7 +10,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;
 import org.jetbrains.annotations.Nullable;
@@ -74,12 +73,12 @@
     * Mapping not found
     */
    private static ReportingTaskControl<PathAwareEntity> m_sehqmidp(float f, Function<PathAwareEntity, Vec3d> function, Predicate<PathAwareEntity> predicate) {
-      return C_rcqaryar.m_elxiakeb(arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.WALK_TARGET)).apply(arg, argx -> (world, arg3, l) -> {
+      return TaskBuilder.m_elxiakeb(arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.WALK_TARGET)).apply(arg, argx -> (world, arg3, l) -> {
                if (!predicate.test(arg3)) {
                   return false;
                } else {
                   Optional<Vec3d> optional = Optional.ofNullable((Vec3d)function.apply(arg3));
-                  argx.m_bczdgokz(optional.map(argxxx -> new WalkTarget(argxxx, f, 0)));
+                  argx.remember(optional.map(argxxx -> new WalkTarget(argxxx, f, 0)));
                   return true;
                }
             }));
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.java namedSrc/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.java	2024-03-21 03:32:24.759862279 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.java	2024-03-21 03:31:15.311948660 +0000
@@ -9,7 +9,6 @@
 import net.minecraft.entity.passive.VillagerEntity;
 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.village.VillagerProfession;
@@ -24,7 +23,7 @@
     * Mapping not found
     */
    public static TaskControl<VillagerEntity> m_szrmsllv(float f) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_qgrmwbxe(MemoryModuleType.POTENTIAL_JOB_SITE),
                   arg.m_owejzxbp(MemoryModuleType.JOB_SITE),
@@ -53,9 +52,9 @@
                                  .filter(arg2xx -> canUseJobSite((Holder<PointOfInterestType>)optional.get(), arg2xx, lv))
                                  .findFirst()
                                  .ifPresent(arg6x -> {
-                                    arg5.m_gfsxfard();
-                                    arg6.m_gfsxfard();
-                                    arg2.m_gfsxfard();
+                                    arg5.forget();
+                                    arg6.forget();
+                                    arg2.forget();
                                     if (arg6x.getBrain().getOptionalMemory(MemoryModuleType.JOB_SITE).isEmpty()) {
                                        LookTargetUtil.walkTowards(arg6x, lv, f, 1);
                                        arg6x.getBrain().remember(MemoryModuleType.POTENTIAL_JOB_SITE, GlobalPos.create(world.getRegistryKey(), lv));
Only in namedSrc/net/minecraft/entity/ai/brain/task: TaskBuilder.java
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.java	2024-03-21 03:32:24.799862245 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.java	2024-03-21 03:31:15.391948559 +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_ulrbltvh}
@@ -24,7 +23,7 @@
     * Mapping not found
     */
    public static <E extends MobEntity> TaskControl<E> m_mmfxhdqe(Predicate<E> predicate, Function<E, Optional<? extends LivingEntity>> function) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.ATTACK_TARGET), arg.m_mzwocaxv(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE))
                .apply(arg, (argx, arg2) -> (world, arg4, l) -> {
                      if (!predicate.test(arg4)) {
@@ -38,8 +37,8 @@
                            if (!arg4.canTarget(lv)) {
                               return false;
                            } else {
-                              argx.m_klbizcog(lv);
-                              arg2.m_gfsxfard();
+                              argx.remember(lv);
+                              arg2.forget();
                               return true;
                            }
                         }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.java namedSrc/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.java	2024-03-21 03:32:24.883862175 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.java	2024-03-21 03:31:15.511948406 +0000
@@ -13,7 +13,6 @@
 import net.minecraft.entity.passive.PassiveEntity;
 import net.minecraft.entity.passive.VillagerEntity;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.unmapped.C_uccmgtyb;
 import net.minecraft.village.VillagerProfession;
 import net.minecraft.village.raid.Raid;
@@ -294,13 +293,13 @@
       return ImmutableList.of(
          Pair.of(
             0,
-            C_rcqaryar.m_xtjbildx(
-               C_rcqaryar.m_uxcmzqzq(VillagerTaskListProvider::m_yltipasg),
+            TaskBuilder.m_xtjbildx(
+               TaskBuilder.m_uxcmzqzq(VillagerTaskListProvider::m_yltipasg),
                C_uccmgtyb.m_gjfcgvbo(ImmutableList.of(Pair.of(SeekSkyTask.m_essunjsd(speed), 5), Pair.of(FindWalkTargetTask.run(speed * 1.1F), 2)))
             )
          ),
          Pair.of(0, new CelebrateRaidWinTask(600, 600)),
-         Pair.of(2, C_rcqaryar.m_xtjbildx(C_rcqaryar.m_uxcmzqzq(VillagerTaskListProvider::m_uqrujxkm), HideInHomeTask.m_frsalpsy(24, speed * 1.4F, 1))),
+         Pair.of(2, TaskBuilder.m_xtjbildx(TaskBuilder.m_uxcmzqzq(VillagerTaskListProvider::m_uqrujxkm), HideInHomeTask.m_frsalpsy(24, speed * 1.4F, 1))),
          createBusyFollowTask(),
          Pair.of(99, EndRaidTask.run())
       );
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.java namedSrc/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.java	2024-03-21 03:32:24.755862282 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.java	2024-03-21 03:31:15.299948675 +0000
@@ -6,7 +6,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 net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
@@ -20,7 +19,7 @@
     * Mapping not found
     */
    public static ReportingTaskControl<VillagerEntity> m_totgigfc(MemoryModuleType<GlobalPos> arg, float f, int i, int j, int k) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg2 -> arg2.group(arg2.m_mzwocaxv(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE), arg2.m_owejzxbp(MemoryModuleType.WALK_TARGET), arg2.m_qgrmwbxe(arg))
                .apply(arg2, (arg3, arg4, arg5) -> (world, arg7, l) -> {
                      GlobalPos lv = arg2.m_gcuzwcid(arg5);
@@ -35,20 +34,20 @@
                               lv2 = NoPenaltyTargeting.find(arg7, 15, 7, Vec3d.ofBottomCenter(lv.getPos()), (float) (Math.PI / 2));
                               if (++m == 1000) {
                                  arg7.releaseTicketFor(arg);
-                                 arg5.m_gfsxfard();
-                                 arg3.m_klbizcog(l);
+                                 arg5.forget();
+                                 arg3.remember(l);
                                  return true;
                               }
                            }
       
-                           arg4.m_klbizcog(new WalkTarget(lv2, f, i));
+                           arg4.remember(new WalkTarget(lv2, f, i));
                         } else if (lv.getPos().getManhattanDistance(arg7.getBlockPos()) > i) {
-                           arg4.m_klbizcog(new WalkTarget(lv.getPos(), f, i));
+                           arg4.remember(new WalkTarget(lv.getPos(), f, i));
                         }
                      } else {
                         arg7.releaseTicketFor(arg);
-                        arg5.m_gfsxfard();
-                        arg3.m_klbizcog(l);
+                        arg5.forget();
+                        arg3.remember(l);
                      }
       
                      return true;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/WakeUpTask.java namedSrc/net/minecraft/entity/ai/brain/task/WakeUpTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/WakeUpTask.java	2024-03-21 03:32:24.899862161 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/WakeUpTask.java	2024-03-21 03:31:15.527948386 +0000
@@ -2,7 +2,6 @@
 
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.Activity;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_qanaobzy}
@@ -13,7 +12,7 @@
     * Mapping not found
     */
    public static TaskControl<LivingEntity> m_idvvbczh() {
-      return C_rcqaryar.m_elxiakeb(arg -> arg.point((world, arg2, l) -> {
+      return TaskBuilder.m_elxiakeb(arg -> arg.point((world, arg2, l) -> {
             if (!arg2.getBrain().hasActivity(Activity.REST) && arg2.isSleeping()) {
                arg2.wakeUp();
                return true;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/WalkHomeTask.java namedSrc/net/minecraft/entity/ai/brain/task/WalkHomeTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/WalkHomeTask.java	2024-03-21 03:32:24.807862238 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/WalkHomeTask.java	2024-03-21 03:31:15.407948538 +0000
@@ -13,7 +13,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.math.BlockPos;
 import net.minecraft.world.poi.PointOfInterestStorage;
 import net.minecraft.world.poi.PointOfInterestType;
@@ -56,7 +55,7 @@
    public static TaskControl<PathAwareEntity> m_ptrptyvi(float f) {
       Long2LongMap long2LongMap = new Long2LongOpenHashMap();
       MutableLong mutableLong = new MutableLong(0L);
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.WALK_TARGET), arg.m_owejzxbp(MemoryModuleType.HOME))
                .apply(
                   arg,
@@ -95,7 +94,7 @@
                                  BlockPos lv3 = lv2.getTarget();
                                  Optional<Holder<PointOfInterestType>> optional2 = lv.getType(lv3);
                                  if (optional2.isPresent()) {
-                                    argx.m_klbizcog(new WalkTarget(lv3, f, 1));
+                                    argx.remember(new WalkTarget(lv3, f, 1));
                                     DebugInfoSender.sendPointOfInterest(world, lv3);
                                  }
                               } else if (mutableInt.getValue() < 5) {
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.java namedSrc/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.java	2024-03-21 03:32:24.787862255 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.java	2024-03-21 03:31:15.355948604 +0000
@@ -5,10 +5,9 @@
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.EntityLookTarget;
+import net.minecraft.entity.ai.brain.MemoryAccessor;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.WalkTarget;
-import net.minecraft.unmapped.C_rcqaryar;
-import net.minecraft.unmapped.C_ujlmiamh;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_rmejpnsf}
@@ -26,9 +25,9 @@
     * Mapping not found
     */
    public static <E extends LivingEntity> TaskControl<E> m_xkulsdab(Predicate<E> predicate, float f, boolean bl, int i) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> {
-            C_rcqaryar<E, ? extends C_ujlmiamh<? extends K1, WalkTarget>> lv = bl
+            TaskBuilder<E, ? extends MemoryAccessor<? extends K1, WalkTarget>> lv = bl
                ? arg.m_mzwocaxv(MemoryModuleType.WALK_TARGET)
                : arg.m_owejzxbp(MemoryModuleType.WALK_TARGET);
             return arg.group(
@@ -46,8 +45,8 @@
                            && lvx.isInRange(arg7, (double)i)
                            && arg7.getWorld().getWorldBorder().contains(lvx.getBlockPos())) {
                            WalkTarget lv2 = new WalkTarget(new EntityLookTarget(lvx, false), f, 0);
-                           arg2.m_klbizcog(new EntityLookTarget(lvx, true));
-                           arg3.m_klbizcog(lv2);
+                           arg2.remember(new EntityLookTarget(lvx, true));
+                           arg3.remember(lv2);
                            return true;
                         } else {
                            return false;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.java namedSrc/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.java	2024-03-21 03:32:24.875862182 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.java	2024-03-21 03:31:15.499948422 +0000
@@ -7,7 +7,6 @@
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.brain.WalkTarget;
 import net.minecraft.entity.passive.PassiveEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.math.int_provider.UniformIntProvider;
 
 /**
@@ -26,7 +25,7 @@
     * Mapping not found
     */
    public static ReportingTaskControl<PassiveEntity> m_csloyfcs(UniformIntProvider arg, Function<LivingEntity, Float> function) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg2 -> arg2.group(
                   arg2.m_qgrmwbxe(MemoryModuleType.NEAREST_VISIBLE_ADULT),
                   arg2.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
@@ -39,8 +38,8 @@
                         PassiveEntity lv = arg2.m_gcuzwcid(arg3);
                         if (arg7.isInRange(lv, (double)(arg.getMax() + 1)) && !arg7.isInRange(lv, (double)arg.getMin())) {
                            WalkTarget lv2 = new WalkTarget(new EntityLookTarget(lv, false), (Float)function.apply(arg7), arg.getMin() - 1);
-                           arg4.m_klbizcog(new EntityLookTarget(lv, true));
-                           arg5.m_klbizcog(lv2);
+                           arg4.remember(new EntityLookTarget(lv, true));
+                           arg5.remember(lv2);
                            return true;
                         } else {
                            return false;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.java namedSrc/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.java	2024-03-21 03:32:24.943862124 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.java	2024-03-21 03:31:15.587948310 +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.math.BlockPos;
 
 /**
@@ -18,7 +17,7 @@
     * Mapping not found
     */
    public static TaskControl<PathAwareEntity> m_wlqapoji(float f) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(arg.m_owejzxbp(MemoryModuleType.WALK_TARGET))
                .apply(
                   arg,
@@ -36,7 +35,7 @@
                               .filter(pos -> world.isTopSolid(pos, arg3))
                               .filter(pos -> world.isSpaceEmpty(arg3))
                               .findFirst()
-                              .ifPresent(pos -> argx.m_klbizcog(new WalkTarget(pos, f, 0)));
+                              .ifPresent(pos -> argx.remember(new WalkTarget(pos, f, 0)));
                            return true;
                         }
                      }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/WantNewItemTask.java namedSrc/net/minecraft/entity/ai/brain/task/WantNewItemTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/WantNewItemTask.java	2024-03-21 03:32:24.923862141 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/WantNewItemTask.java	2024-03-21 03:31:15.559948346 +0000
@@ -5,7 +5,6 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.mob.PiglinEntity;
-import net.minecraft.unmapped.C_rcqaryar;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_byhswlbt}
@@ -16,7 +15,7 @@
     * Mapping not found
     */
    public static TaskControl<LivingEntity> m_kgzclozu(int i) {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.ADMIRING_ITEM), arg.m_mzwocaxv(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM))
                .apply(arg, (arg2, arg3) -> (world, arg5, l) -> {
                      if (!arg5.getOffHandStack().isEmpty()) {
@@ -26,7 +25,7 @@
                         if (optional.isPresent() && ((ItemEntity)optional.get()).isInRange(arg5, (double)i)) {
                            return false;
                         } else {
-                           arg2.m_gfsxfard();
+                           arg2.forget();
                            return true;
                         }
                      }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/WardenLookAtEntityTask.java namedSrc/net/minecraft/entity/ai/brain/task/WardenLookAtEntityTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/WardenLookAtEntityTask.java	2024-03-21 03:32:24.875862182 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/WardenLookAtEntityTask.java	2024-03-21 03:31:15.499948422 +0000
@@ -5,7 +5,6 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.BlockPosLookTarget;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.math.BlockPos;
 
 /**
@@ -17,7 +16,7 @@
     * Mapping not found
     */
    public static TaskControl<LivingEntity> m_nxqouhrs() {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(
                   arg.m_mzwocaxv(MemoryModuleType.LOOK_TARGET),
                   arg.m_mzwocaxv(MemoryModuleType.DISTURBANCE_LOCATION),
@@ -29,7 +28,7 @@
                      if (optional.isEmpty()) {
                         return false;
                      } else {
-                        arg2.m_klbizcog(new BlockPosLookTarget((BlockPos)optional.get()));
+                        arg2.remember(new BlockPosLookTarget((BlockPos)optional.get()));
                         return true;
                      }
                   })
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.java namedSrc/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.java	2024-03-21 03:32:24.799862245 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.java	2024-03-21 03:31:15.395948554 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.passive.VillagerEntity;
 import net.minecraft.registry.Holder;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.dynamic.GlobalPos;
 import net.minecraft.village.VillagerProfession;
 import net.minecraft.world.poi.PointOfInterestType;
@@ -20,7 +19,7 @@
     * Mapping not found
     */
    public static TaskControl<VillagerEntity> m_sqbnhmnw() {
-      return C_rcqaryar.m_elxiakeb(
+      return TaskBuilder.m_elxiakeb(
          arg -> arg.group(arg.m_qgrmwbxe(MemoryModuleType.JOB_SITE), arg.m_qgrmwbxe(MemoryModuleType.MOBS))
                .apply(
                   arg,
diff -bur namedTargetSrc/net/minecraft/entity/ai/control/AquaticMoveControl.java namedSrc/net/minecraft/entity/ai/control/AquaticMoveControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/AquaticMoveControl.java	2024-03-21 03:32:24.935862131 +0000
+++ namedSrc/net/minecraft/entity/ai/control/AquaticMoveControl.java	2024-03-21 03:31:15.575948325 +0000
@@ -10,13 +10,15 @@
  */
 public class AquaticMoveControl extends MoveControl {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_gjisqjyf Lnet/minecraft/unmapped/C_rtyfovet;f_gjisqjyf:F}
+    * @mapping {@literal named FULL_SPEED_TURN_THRESHOLD Lnet/minecraft/entity/ai/control/AquaticMoveControl;FULL_SPEED_TURN_THRESHOLD:F}
     */
-   private static final float f_gjisqjyf = 10.0F;
+   private static final float FULL_SPEED_TURN_THRESHOLD = 10.0F;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_vqoqzfgz Lnet/minecraft/unmapped/C_rtyfovet;f_vqoqzfgz:F}
+    * @mapping {@literal named STOP_TURN_THRESHOLD Lnet/minecraft/entity/ai/control/AquaticMoveControl;STOP_TURN_THRESHOLD:F}
     */
-   private static final float f_vqoqzfgz = 60.0F;
+   private static final float STOP_TURN_THRESHOLD = 60.0F;
    /**
     * @mapping {@literal hashed f_cfjskqux Lnet/minecraft/unmapped/C_rtyfovet;f_cfjskqux:I}
     * @mapping {@literal named pitchChange Lnet/minecraft/entity/ai/control/AquaticMoveControl;pitchChange:I}
@@ -109,7 +111,7 @@
     * @mapping {@literal hashed m_rvgifltm Lnet/minecraft/unmapped/C_rtyfovet;m_rvgifltm(F)F}
     * @mapping {@literal named calcAirSpeedMultiplier Lnet/minecraft/entity/ai/control/AquaticMoveControl;calcAirSpeedMultiplier(F)F}
     */
-   private static float calcAirSpeedMultiplier(float f) {
-      return 1.0F - MathHelper.clamp((f - 10.0F) / 50.0F, 0.0F, 1.0F);
+   private static float calcAirSpeedMultiplier(float angle) {
+      return 1.0F - MathHelper.clamp((angle - 10.0F) / 50.0F, 0.0F, 1.0F);
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/control/MoveControl.java namedSrc/net/minecraft/entity/ai/control/MoveControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/MoveControl.java	2024-03-21 03:32:24.779862262 +0000
+++ namedSrc/net/minecraft/entity/ai/control/MoveControl.java	2024-03-21 03:31:15.331948634 +0000
@@ -198,7 +198,9 @@
       if (lv != null) {
          PathNodeMaker lv2 = lv.getNodeMaker();
          if (lv2 != null
-            && lv2.m_tyumpkdm(this.entity, BlockPos.create(this.entity.getX() + (double)x, (double)this.entity.getBlockY(), this.entity.getZ() + (double)z))
+            && lv2.getDefaultNodeType(
+                  this.entity, BlockPos.create(this.entity.getX() + (double)x, (double)this.entity.getBlockY(), this.entity.getZ() + (double)z)
+               )
                != PathNodeType.WALKABLE) {
             return false;
          }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/FollowOwnerGoal.java namedSrc/net/minecraft/entity/ai/goal/FollowOwnerGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/FollowOwnerGoal.java	2024-03-21 03:32:24.763862275 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/FollowOwnerGoal.java	2024-03-21 03:31:15.311948660 +0000
@@ -222,7 +222,7 @@
     * @mapping {@literal named canTeleportTo Lnet/minecraft/entity/ai/goal/FollowOwnerGoal;canTeleportTo(Lnet/minecraft/util/math/BlockPos;)Z}
     */
    private boolean canTeleportTo(BlockPos pos) {
-      PathNodeType lv = LandPathNodeMaker.m_femsgzut(this.tameable, pos);
+      PathNodeType lv = LandPathNodeMaker.getLandNodeType(this.tameable, pos);
       if (lv != PathNodeType.WALKABLE) {
          return false;
       } else {
diff -bur namedTargetSrc/net/minecraft/entity/ai/NavigationConditions.java namedSrc/net/minecraft/entity/ai/NavigationConditions.java
--- namedTargetSrc/net/minecraft/entity/ai/NavigationConditions.java	2024-03-21 03:32:24.807862238 +0000
+++ namedSrc/net/minecraft/entity/ai/NavigationConditions.java	2024-03-21 03:31:15.403948543 +0000
@@ -67,7 +67,7 @@
     * @mapping {@literal named hasPathfindingPenalty Lnet/minecraft/entity/ai/NavigationConditions;hasPathfindingPenalty(Lnet/minecraft/entity/mob/PathAwareEntity;Lnet/minecraft/util/math/BlockPos;)Z}
     */
    public static boolean hasPathfindingPenalty(PathAwareEntity entity, BlockPos pos) {
-      return entity.getPenalty(LandPathNodeMaker.m_femsgzut(entity, pos)) != 0.0F;
+      return entity.getPenalty(LandPathNodeMaker.getLandNodeType(entity, pos)) != 0.0F;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/pathing/AmphibiousPathNodeMaker.java namedSrc/net/minecraft/entity/ai/pathing/AmphibiousPathNodeMaker.java
--- namedTargetSrc/net/minecraft/entity/ai/pathing/AmphibiousPathNodeMaker.java	2024-03-21 03:32:24.891862168 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/AmphibiousPathNodeMaker.java	2024-03-21 03:31:15.519948397 +0000
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai.pathing;
 
 import net.minecraft.entity.mob.MobEntity;
-import net.minecraft.unmapped.C_amrnepho;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
@@ -67,7 +66,7 @@
    public PathNode getStart() {
       return !this.entity.isTouchingWater()
          ? super.getStart()
-         : this.m_etdbalqp(
+         : this.getStart(
             new BlockPos(
                MathHelper.floor(this.entity.getBounds().minX),
                MathHelper.floor(this.entity.getBounds().minY + 0.5),
@@ -100,19 +99,19 @@
       }
 
       double d = this.getFeetY(new BlockPos(node.x, node.y, node.z));
-      PathNode lv3 = this.m_kxrnaccr(node.x, node.y + 1, node.z, Math.max(0, j - 1), d, Direction.UP, lv2);
-      PathNode lv4 = this.m_kxrnaccr(node.x, node.y - 1, node.z, j, d, Direction.DOWN, lv2);
-      if (this.m_dgheloct(lv3, node)) {
+      PathNode lv3 = this.getPathNode(node.x, node.y + 1, node.z, Math.max(0, j - 1), d, Direction.UP, lv2);
+      PathNode lv4 = this.getPathNode(node.x, node.y - 1, node.z, j, d, Direction.DOWN, lv2);
+      if (this.isValidAquaticAdjacentSuccessor(lv3, node)) {
          successors[i++] = lv3;
       }
 
-      if (this.m_dgheloct(lv4, node) && lv2 != PathNodeType.TRAPDOOR) {
+      if (this.isValidAquaticAdjacentSuccessor(lv4, node) && lv2 != PathNodeType.TRAPDOOR) {
          successors[i++] = lv4;
       }
 
       for (int l = 0; l < i; l++) {
          PathNode lv5 = successors[l];
-         if (lv5.f_lzpxpqin == PathNodeType.WATER && this.penaliseDeepWater && lv5.y < this.entity.getWorld().getSeaLevel() - 10) {
+         if (lv5.type == PathNodeType.WATER && this.penaliseDeepWater && lv5.y < this.entity.getWorld().getSeaLevel() - 10) {
             lv5.penalty++;
          }
       }
@@ -122,10 +121,10 @@
 
    /**
     * @mapping {@literal hashed m_dgheloct Lnet/minecraft/unmapped/C_cwaqbmft;m_dgheloct(Lnet/minecraft/unmapped/C_dfzwsdmo;Lnet/minecraft/unmapped/C_dfzwsdmo;)Z}
-    * @mapping {@literal named m_dgheloct Lnet/minecraft/entity/ai/pathing/AmphibiousPathNodeMaker;m_dgheloct(Lnet/minecraft/entity/ai/pathing/PathNode;Lnet/minecraft/entity/ai/pathing/PathNode;)Z}
+    * @mapping {@literal named isValidAquaticAdjacentSuccessor Lnet/minecraft/entity/ai/pathing/AmphibiousPathNodeMaker;isValidAquaticAdjacentSuccessor(Lnet/minecraft/entity/ai/pathing/PathNode;Lnet/minecraft/entity/ai/pathing/PathNode;)Z}
     */
-   private boolean m_dgheloct(@Nullable PathNode node, PathNode successor) {
-      return this.isValidAdjacentSuccessor(node, successor) && node.f_lzpxpqin == PathNodeType.WATER;
+   private boolean isValidAquaticAdjacentSuccessor(@Nullable PathNode node, PathNode successor) {
+      return this.isValidAdjacentSuccessor(node, successor) && node.type == PathNodeType.WATER;
    }
 
    /**
@@ -140,14 +139,14 @@
     * Mapping not found
     */
    @Override
-   public PathNodeType m_amhxcrvm(C_amrnepho arg, int i, int j, int k) {
-      PathNodeType lv = arg.m_qrvkklwj(i, j, k);
+   public PathNodeType getDefaultNodeType(PathContext context, int x, int y, int z) {
+      PathNodeType lv = context.getNodeType(x, y, z);
       if (lv == PathNodeType.WATER) {
          BlockPos.Mutable lv2 = new BlockPos.Mutable();
 
          for (Direction lv3 : Direction.values()) {
-            lv2.set(i, j, k).move(lv3);
-            PathNodeType lv4 = arg.m_qrvkklwj(lv2.getX(), lv2.getY(), lv2.getZ());
+            lv2.set(x, y, z).move(lv3);
+            PathNodeType lv4 = context.getNodeType(lv2.getX(), lv2.getY(), lv2.getZ());
             if (lv4 == PathNodeType.BLOCKED) {
                return PathNodeType.WATER_BORDER;
             }
@@ -155,7 +154,7 @@
 
          return PathNodeType.WATER;
       } else {
-         return super.m_amhxcrvm(arg, i, j, k);
+         return super.getDefaultNodeType(context, x, y, z);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.java namedSrc/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.java
--- namedTargetSrc/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.java	2024-03-21 03:32:24.663862360 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.java	2024-03-21 03:31:15.195948807 +0000
@@ -7,7 +7,6 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.entity.mob.MobEntity;
-import net.minecraft.unmapped.C_amrnepho;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.MathHelper;
@@ -25,9 +24,10 @@
     */
    private final Long2ObjectMap<PathNodeType> pathNodes = new Long2ObjectOpenHashMap<>();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_wztobvqo Lnet/minecraft/unmapped/C_kecucmvl;f_wztobvqo:F}
+    * @mapping {@literal named SMALL_MOB_SIZE Lnet/minecraft/entity/ai/pathing/BirdPathNodeMaker;SMALL_MOB_SIZE:F}
     */
-   private static final float f_wztobvqo = 1.0F;
+   private static final float SMALL_MOB_SIZE = 1.0F;
    /**
     * @mapping {@literal hashed f_wayteepi Lnet/minecraft/unmapped/C_kecucmvl;f_wayteepi:F}
     * @mapping {@literal named START_NODE_BOUNDING_BOX Lnet/minecraft/entity/ai/pathing/BirdPathNodeMaker;START_NODE_BOUNDING_BOX:F}
@@ -69,7 +69,7 @@
          i = this.entity.getBlockY();
          BlockPos.Mutable lv = new BlockPos.Mutable(this.entity.getX(), (double)i, this.entity.getZ());
 
-         for (BlockState lv2 = this.f_jffuufhn.m_mdeqgtet(lv); lv2.isOf(Blocks.WATER); lv2 = this.f_jffuufhn.m_mdeqgtet(lv)) {
+         for (BlockState lv2 = this.context.getBlockState(lv); lv2.isOf(Blocks.WATER); lv2 = this.context.getBlockState(lv)) {
             lv.set(this.entity.getX(), (double)(++i), this.entity.getZ());
          }
       } else {
@@ -78,14 +78,14 @@
 
       BlockPos lv3 = BlockPos.create(this.entity.getX(), (double)i, this.entity.getZ());
       if (!this.hasPathfindingPenalty(lv3)) {
-         for (BlockPos lv4 : this.m_ugfyngjc(this.entity)) {
+         for (BlockPos lv4 : this.getStartNodeCandidatePositions(this.entity)) {
             if (this.hasPathfindingPenalty(lv4)) {
-               return super.m_etdbalqp(lv4);
+               return super.getStart(lv4);
             }
          }
       }
 
-      return super.m_etdbalqp(lv3);
+      return super.getStart(lv3);
    }
 
    /**
@@ -319,7 +319,7 @@
       float f = this.entity.getPenalty(lv2);
       if (f >= 0.0F) {
          lv = this.getNode(x, y, z);
-         lv.f_lzpxpqin = lv2;
+         lv.type = lv2;
          lv.penalty = Math.max(lv.penalty, f);
          if (lv2 == PathNodeType.WALKABLE) {
             lv.penalty++;
@@ -335,18 +335,18 @@
    @Override
    protected PathNodeType getNodeType(int x, int y, int z) {
       return this.pathNodes
-         .computeIfAbsent(BlockPos.asLong(x, y, z), (Long2ObjectFunction<? extends PathNodeType>)(l -> this.m_aquikxzw(this.f_jffuufhn, x, y, z, this.entity)));
+         .computeIfAbsent(BlockPos.asLong(x, y, z), (Long2ObjectFunction<? extends PathNodeType>)(l -> this.getNodeType(this.context, x, y, z, this.entity)));
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public PathNodeType m_amhxcrvm(C_amrnepho arg, int i, int j, int k) {
-      PathNodeType lv = arg.m_qrvkklwj(i, j, k);
-      if (lv == PathNodeType.OPEN && j >= arg.m_pbrulfze().getBottomY() + 1) {
-         BlockPos lv2 = new BlockPos(i, j - 1, k);
-         PathNodeType lv3 = arg.m_qrvkklwj(lv2.getX(), lv2.getY(), lv2.getZ());
+   public PathNodeType getDefaultNodeType(PathContext context, int x, int y, int z) {
+      PathNodeType lv = context.getNodeType(x, y, z);
+      if (lv == PathNodeType.OPEN && y >= context.getWorld().getBottomY() + 1) {
+         BlockPos lv2 = new BlockPos(x, y - 1, z);
+         PathNodeType lv3 = context.getNodeType(lv2.getX(), lv2.getY(), lv2.getZ());
          if (lv3 == PathNodeType.DAMAGE_FIRE || lv3 == PathNodeType.LAVA) {
             lv = PathNodeType.DAMAGE_FIRE;
          } else if (lv3 == PathNodeType.DAMAGE_OTHER) {
@@ -354,7 +354,7 @@
          } else if (lv3 == PathNodeType.COCOA) {
             lv = PathNodeType.COCOA;
          } else if (lv3 == PathNodeType.FENCE) {
-            if (!lv2.equals(arg.m_rexpdkbu())) {
+            if (!lv2.equals(context.getPos())) {
                lv = PathNodeType.FENCE;
             }
          } else {
@@ -363,7 +363,7 @@
       }
 
       if (lv == PathNodeType.WALKABLE || lv == PathNodeType.OPEN) {
-         lv = m_jprttgje(arg, i, j, k, lv);
+         lv = getNodeTypeFromNeighbors(context, x, y, z, lv);
       }
 
       return lv;
@@ -371,9 +371,9 @@
 
    /**
     * @mapping {@literal hashed m_ugfyngjc Lnet/minecraft/unmapped/C_kecucmvl;m_ugfyngjc(Lnet/minecraft/unmapped/C_dxkfswlz;)Ljava/lang/Iterable;}
-    * @mapping {@literal named m_ugfyngjc Lnet/minecraft/entity/ai/pathing/BirdPathNodeMaker;m_ugfyngjc(Lnet/minecraft/entity/mob/MobEntity;)Ljava/lang/Iterable;}
+    * @mapping {@literal named getStartNodeCandidatePositions Lnet/minecraft/entity/ai/pathing/BirdPathNodeMaker;getStartNodeCandidatePositions(Lnet/minecraft/entity/mob/MobEntity;)Ljava/lang/Iterable;}
     */
-   private Iterable<BlockPos> m_ugfyngjc(MobEntity entity) {
+   private Iterable<BlockPos> getStartNodeCandidatePositions(MobEntity entity) {
       Box lv = entity.getBounds();
       boolean bl = lv.getAverageSideLength() < 1.0;
       if (!bl) {

@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/pathing/EntityNavigation.java namedSrc/net/minecraft/entity/ai/pathing/EntityNavigation.java
--- namedTargetSrc/net/minecraft/entity/ai/pathing/EntityNavigation.java	2024-03-21 03:32:24.759862279 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/EntityNavigation.java	2024-03-21 03:31:15.307948665 +0000
@@ -31,13 +31,15 @@
     */
    private static final int RECALCULATE_COOLDOWN = 20;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_zyochajd Lnet/minecraft/unmapped/C_atbvfjwi;f_zyochajd:I}
+    * @mapping {@literal named STUCK_CHECK_INTERVAL Lnet/minecraft/entity/ai/pathing/EntityNavigation;STUCK_CHECK_INTERVAL:I}
     */
-   private static final int f_zyochajd = 100;
+   private static final int STUCK_CHECK_INTERVAL = 100;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_kgulcrtt Lnet/minecraft/unmapped/C_atbvfjwi;f_kgulcrtt:F}
+    * @mapping {@literal named STUCK_THRESHOLD_DISTANCE_FACTOR Lnet/minecraft/entity/ai/pathing/EntityNavigation;STUCK_THRESHOLD_DISTANCE_FACTOR:F}
     */
-   private static final float f_kgulcrtt = 0.25F;
+   private static final float STUCK_THRESHOLD_DISTANCE_FACTOR = 0.25F;
    /**
     * @mapping {@literal hashed f_ytabmjrn Lnet/minecraft/unmapped/C_atbvfjwi;f_ytabmjrn:Lnet/minecraft/unmapped/C_dxkfswlz;}
     * @mapping {@literal named entity Lnet/minecraft/entity/ai/pathing/EntityNavigation;entity:Lnet/minecraft/entity/mob/MobEntity;}
@@ -315,9 +317,9 @@
 
    /**
     * @mapping {@literal hashed m_tbseeosg Lnet/minecraft/unmapped/C_atbvfjwi;m_tbseeosg(DDDID)Z}
-    * @mapping {@literal named m_tbseeosg Lnet/minecraft/entity/ai/pathing/EntityNavigation;m_tbseeosg(DDDID)Z}
+    * @mapping {@literal named startMovingTo Lnet/minecraft/entity/ai/pathing/EntityNavigation;startMovingTo(DDDID)Z}
     */
-   public boolean m_tbseeosg(double x, double y, double z, int distance, double speed) {
+   public boolean startMovingTo(double x, double y, double z, int distance, double speed) {
       return this.startMovingAlong(this.findPathTo(x, y, z, distance), speed);
    }
 
@@ -422,7 +424,7 @@
       double e = Math.abs(this.entity.getY() - (double)lv2.getY());
       double f = Math.abs(this.entity.getZ() - ((double)lv2.getZ() + 0.5));
       boolean bl = d < (double)this.nodeReachProximity && f < (double)this.nodeReachProximity && e < 1.0;
-      if (bl || this.m_rfnahbaw(this.currentPath.getCurrentNode().f_lzpxpqin) && this.shouldJumpToNextNode(lv)) {
+      if (bl || this.canJumpToNext(this.currentPath.getCurrentNode().type) && this.shouldJumpToNextNode(lv)) {
          this.currentPath.next();
       }
 
@@ -588,22 +590,23 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rfnahbaw Lnet/minecraft/unmapped/C_atbvfjwi;m_rfnahbaw(Lnet/minecraft/unmapped/C_hahxxnjs;)Z}
+    * @mapping {@literal named canJumpToNext Lnet/minecraft/entity/ai/pathing/EntityNavigation;canJumpToNext(Lnet/minecraft/entity/ai/pathing/PathNodeType;)Z}
     */
-   public boolean m_rfnahbaw(PathNodeType arg) {
-      return arg != PathNodeType.DANGER_FIRE && arg != PathNodeType.DANGER_OTHER && arg != PathNodeType.WALKABLE_DOOR;
+   public boolean canJumpToNext(PathNodeType type) {
+      return type != PathNodeType.DANGER_FIRE && type != PathNodeType.DANGER_OTHER && type != PathNodeType.WALKABLE_DOOR;
    }
 
    /**
     * @mapping {@literal hashed m_ihvdiado Lnet/minecraft/unmapped/C_atbvfjwi;m_ihvdiado(Lnet/minecraft/unmapped/C_dxkfswlz;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;Z)Z}
     * @mapping {@literal named canPathDirectlyThrough Lnet/minecraft/entity/ai/pathing/EntityNavigation;canPathDirectlyThrough(Lnet/minecraft/entity/mob/MobEntity;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/Vec3d;Z)Z}
     */
-   protected static boolean canPathDirectlyThrough(MobEntity arg, Vec3d origin, Vec3d target, boolean handleFluid) {
-      Vec3d lv = new Vec3d(target.x, target.y + (double)arg.getHeight() * 0.5, target.z);
-      return arg.getWorld()
+   protected static boolean canPathDirectlyThrough(MobEntity entity, Vec3d origin, Vec3d target, boolean handleFluid) {
+      Vec3d lv = new Vec3d(target.x, target.y + (double)entity.getHeight() * 0.5, target.z);
+      return entity.getWorld()
             .raycast(
                new RaycastContext(
-                  origin, lv, RaycastContext.ShapeType.COLLIDER, handleFluid ? RaycastContext.FluidHandling.ANY : RaycastContext.FluidHandling.NONE, arg
+                  origin, lv, RaycastContext.ShapeType.COLLIDER, handleFluid ? RaycastContext.FluidHandling.ANY : RaycastContext.FluidHandling.NONE, entity
                )
             )
             .getType()
diff -bur namedTargetSrc/net/minecraft/entity/ai/pathing/LandPathNodeMaker.java namedSrc/net/minecraft/entity/ai/pathing/LandPathNodeMaker.java
--- namedTargetSrc/net/minecraft/entity/ai/pathing/LandPathNodeMaker.java	2024-03-21 03:32:24.907862155 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/LandPathNodeMaker.java	2024-03-21 03:31:15.539948371 +0000
@@ -20,7 +20,6 @@
 import net.minecraft.fluid.Fluids;
 import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.registry.tag.FluidTags;
-import net.minecraft.unmapped.C_amrnepho;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Direction;
@@ -42,22 +41,25 @@
     */
    public static final double Y_OFFSET = 0.5;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_opbpsmbg Lnet/minecraft/unmapped/C_hdkjlatd;f_opbpsmbg:D}
+    * @mapping {@literal named DEFAULT_STEP_HEIGHT Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;DEFAULT_STEP_HEIGHT:D}
     */
-   private static final double f_opbpsmbg = 1.125;
+   private static final double DEFAULT_STEP_HEIGHT = 1.125;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ybtkjkef Lnet/minecraft/unmapped/C_hdkjlatd;f_ybtkjkef:Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;}
+    * @mapping {@literal named collisionCache Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;collisionCache:Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;}
     */
-   private final Long2ObjectMap<PathNodeType> f_ybtkjkef = new Long2ObjectOpenHashMap<>();
+   private final Long2ObjectMap<PathNodeType> collisionCache = new Long2ObjectOpenHashMap<>();
    /**
     * @mapping {@literal hashed f_zuqizohc Lnet/minecraft/unmapped/C_hdkjlatd;f_zuqizohc:Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;}
     * @mapping {@literal named collidedBoxes Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;collidedBoxes:Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;}
     */
    private final Object2BooleanMap<Box> collidedBoxes = new Object2BooleanOpenHashMap<>();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_kgztuylw Lnet/minecraft/unmapped/C_hdkjlatd;f_kgztuylw:[Lnet/minecraft/unmapped/C_dfzwsdmo;}
+    * @mapping {@literal named neighborCache Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;neighborCache:[Lnet/minecraft/entity/ai/pathing/PathNode;}
     */
-   private final PathNode[] f_kgztuylw = new PathNode[Direction.Type.HORIZONTAL.m_fxxresix()];
+   private final PathNode[] neighborCache = new PathNode[Direction.Type.HORIZONTAL.length()];
 
    /**
     * Mapping not found
@@ -74,7 +76,7 @@
    @Override
    public void clear() {
       this.entity.onFinishPathfinding();
-      this.f_ybtkjkef.clear();
+      this.collisionCache.clear();
       this.collidedBoxes.clear();
       super.clear();
    }
@@ -86,7 +88,7 @@
    public PathNode getStart() {
       BlockPos.Mutable lv = new BlockPos.Mutable();
       int i = this.entity.getBlockY();
-      BlockState lv2 = this.f_jffuufhn.m_mdeqgtet(lv.set(this.entity.getX(), (double)i, this.entity.getZ()));
+      BlockState lv2 = this.context.getBlockState(lv.set(this.entity.getX(), (double)i, this.entity.getZ()));
       if (!this.entity.canWalkOnFluid(lv2.getFluidState())) {
          if (this.canSwim() && this.entity.isTouchingWater()) {
             while (true) {
@@ -95,17 +97,17 @@
                   break;
                }
 
-               lv2 = this.f_jffuufhn.m_mdeqgtet(lv.set(this.entity.getX(), (double)(++i), this.entity.getZ()));
+               lv2 = this.context.getBlockState(lv.set(this.entity.getX(), (double)(++i), this.entity.getZ()));
             }
          } else if (this.entity.isOnGround()) {
             i = MathHelper.floor(this.entity.getY() + 0.5);
          } else {
             lv.set(this.entity.getX(), this.entity.getY() + 1.0, this.entity.getZ());
 
-            while (lv.getY() > this.f_jffuufhn.m_pbrulfze().getBottomY()) {
+            while (lv.getY() > this.context.getWorld().getBottomY()) {
                i = lv.getY();
                lv.setY(lv.getY() - 1);
-               BlockState lv3 = this.f_jffuufhn.m_mdeqgtet(lv);
+               BlockState lv3 = this.context.getBlockState(lv);
                if (!lv3.isAir() && !lv3.canPathfindThrough(NavigationType.LAND)) {
                   break;
                }
@@ -113,7 +115,7 @@
          }
       } else {
          while (this.entity.canWalkOnFluid(lv2.getFluidState())) {
-            lv2 = this.f_jffuufhn.m_mdeqgtet(lv.set(this.entity.getX(), (double)(++i), this.entity.getZ()));
+            lv2 = this.context.getBlockState(lv.set(this.entity.getX(), (double)(++i), this.entity.getZ()));
          }
 
          i--;
@@ -126,21 +128,21 @@
             || this.hasPathfindingPenalty(lv.set(lv5.minX, (double)i, lv5.maxZ))
             || this.hasPathfindingPenalty(lv.set(lv5.maxX, (double)i, lv5.minZ))
             || this.hasPathfindingPenalty(lv.set(lv5.maxX, (double)i, lv5.maxZ))) {
-            return this.m_etdbalqp(lv);
+            return this.getStart(lv);
          }
       }
 
-      return this.m_etdbalqp(new BlockPos(lv4.getX(), i, lv4.getZ()));
+      return this.getStart(new BlockPos(lv4.getX(), i, lv4.getZ()));
    }
 
    /**
     * @mapping {@literal hashed m_etdbalqp Lnet/minecraft/unmapped/C_hdkjlatd;m_etdbalqp(Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_dfzwsdmo;}
-    * @mapping {@literal named m_etdbalqp Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;m_etdbalqp(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/entity/ai/pathing/PathNode;}
+    * @mapping {@literal named getStart Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;getStart(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/entity/ai/pathing/PathNode;}
     */
-   protected PathNode m_etdbalqp(BlockPos pos) {
+   protected PathNode getStart(BlockPos pos) {
       PathNode lv = this.getNode(pos);
-      lv.f_lzpxpqin = this.getNodeType(lv.x, lv.y, lv.z);
-      lv.penalty = this.entity.getPenalty(lv.f_lzpxpqin);
+      lv.type = this.getNodeType(lv.x, lv.y, lv.z);
+      lv.penalty = this.entity.getPenalty(lv.type);
       return lv;
    }
 
@@ -177,8 +179,8 @@
       double d = this.getFeetY(new BlockPos(node.x, node.y, node.z));
 
       for (Direction lv3 : Direction.Type.HORIZONTAL) {
-         PathNode lv4 = this.m_kxrnaccr(node.x + lv3.getOffsetX(), node.y, node.z + lv3.getOffsetZ(), j, d, lv3, lv2);
-         this.f_kgztuylw[lv3.getHorizontal()] = lv4;
+         PathNode lv4 = this.getPathNode(node.x + lv3.getOffsetX(), node.y, node.z + lv3.getOffsetZ(), j, d, lv3, lv2);
+         this.neighborCache[lv3.getHorizontal()] = lv4;
          if (this.isValidAdjacentSuccessor(lv4, node)) {
             successors[i++] = lv4;
          }
@@ -186,9 +188,9 @@
 
       for (Direction lv5 : Direction.Type.HORIZONTAL) {
          Direction lv6 = lv5.rotateYClockwise();
-         if (this.m_mkwbblfp(node, this.f_kgztuylw[lv5.getHorizontal()], this.f_kgztuylw[lv6.getHorizontal()])) {
-            PathNode lv7 = this.m_kxrnaccr(node.x + lv5.getOffsetX() + lv6.getOffsetX(), node.y, node.z + lv5.getOffsetZ() + lv6.getOffsetZ(), j, d, lv5, lv2);
-            if (this.m_rsepzcwn(lv7)) {
+         if (this.isDiagonalValid(node, this.neighborCache[lv5.getHorizontal()], this.neighborCache[lv6.getHorizontal()])) {
+            PathNode lv7 = this.getPathNode(node.x + lv5.getOffsetX() + lv6.getOffsetX(), node.y, node.z + lv5.getOffsetZ() + lv6.getOffsetZ(), j, d, lv5, lv2);
+            if (this.isDiagonalValid(lv7)) {
                successors[i++] = lv7;
             }
          }
@@ -206,35 +208,38 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mkwbblfp Lnet/minecraft/unmapped/C_hdkjlatd;m_mkwbblfp(Lnet/minecraft/unmapped/C_dfzwsdmo;Lnet/minecraft/unmapped/C_dfzwsdmo;Lnet/minecraft/unmapped/C_dfzwsdmo;)Z}
+    * @mapping {@literal named isDiagonalValid Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;isDiagonalValid(Lnet/minecraft/entity/ai/pathing/PathNode;Lnet/minecraft/entity/ai/pathing/PathNode;Lnet/minecraft/entity/ai/pathing/PathNode;)Z}
     */
-   protected boolean m_mkwbblfp(PathNode arg, @Nullable PathNode arg2, @Nullable PathNode arg3) {
-      if (arg3 == null || arg2 == null || arg3.y > arg.y || arg2.y > arg.y) {
+   protected boolean isDiagonalValid(PathNode node, @Nullable PathNode zNode, @Nullable PathNode xDiagonalNode) {
+      if (xDiagonalNode == null || zNode == null || xDiagonalNode.y > node.y || zNode.y > node.y) {
          return false;
-      } else if (arg2.f_lzpxpqin != PathNodeType.WALKABLE_DOOR && arg3.f_lzpxpqin != PathNodeType.WALKABLE_DOOR) {
-         boolean bl = arg3.f_lzpxpqin == PathNodeType.FENCE && arg2.f_lzpxpqin == PathNodeType.FENCE && (double)this.entity.getWidth() < 0.5;
-         return (arg3.y < arg.y || arg3.penalty >= 0.0F || bl) && (arg2.y < arg.y || arg2.penalty >= 0.0F || bl);
+      } else if (zNode.type != PathNodeType.WALKABLE_DOOR && xDiagonalNode.type != PathNodeType.WALKABLE_DOOR) {
+         boolean bl = xDiagonalNode.type == PathNodeType.FENCE && zNode.type == PathNodeType.FENCE && (double)this.entity.getWidth() < 0.5;
+         return (xDiagonalNode.y < node.y || xDiagonalNode.penalty >= 0.0F || bl) && (zNode.y < node.y || zNode.penalty >= 0.0F || bl);
       } else {
          return false;
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rsepzcwn Lnet/minecraft/unmapped/C_hdkjlatd;m_rsepzcwn(Lnet/minecraft/unmapped/C_dfzwsdmo;)Z}
+    * @mapping {@literal named isDiagonalValid Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;isDiagonalValid(Lnet/minecraft/entity/ai/pathing/PathNode;)Z}
     */
-   protected boolean m_rsepzcwn(@Nullable PathNode arg) {
-      if (arg == null || arg.visited) {
+   protected boolean isDiagonalValid(@Nullable PathNode node) {
+      if (node == null || node.visited) {
          return false;
       } else {
-         return arg.f_lzpxpqin == PathNodeType.WALKABLE_DOOR ? false : arg.penalty >= 0.0F;
+         return node.type == PathNodeType.WALKABLE_DOOR ? false : node.penalty >= 0.0F;
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_tgzoopmb Lnet/minecraft/unmapped/C_hdkjlatd;m_tgzoopmb(Lnet/minecraft/unmapped/C_hahxxnjs;)Z}
+    * @mapping {@literal named isBlocked Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;isBlocked(Lnet/minecraft/entity/ai/pathing/PathNodeType;)Z}
     */
-   private static boolean m_tgzoopmb(PathNodeType arg) {
-      return arg == PathNodeType.FENCE || arg == PathNodeType.DOOR_WOOD_CLOSED || arg == PathNodeType.DOOR_IRON_CLOSED;
+   private static boolean isBlocked(PathNodeType type) {
+      return type == PathNodeType.FENCE || type == PathNodeType.DOOR_WOOD_CLOSED || type == PathNodeType.DOOR_IRON_CLOSED;
    }
 
    /**
@@ -266,7 +271,7 @@
     * @mapping {@literal named getFeetY Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;getFeetY(Lnet/minecraft/util/math/BlockPos;)D}
     */
    protected double getFeetY(BlockPos pos) {
-      BlockView lv = this.f_jffuufhn.m_pbrulfze();
+      BlockView lv = this.context.getWorld();
       return (this.canSwim() || this.isAmphibious()) && lv.getFluidState(pos).isIn(FluidTags.WATER) ? (double)pos.getY() + 0.5 : getFeetY(lv, pos);
    }
 
@@ -290,40 +295,40 @@
 
    /**
     * @mapping {@literal hashed m_kxrnaccr Lnet/minecraft/unmapped/C_hdkjlatd;m_kxrnaccr(IIIIDLnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hahxxnjs;)Lnet/minecraft/unmapped/C_dfzwsdmo;}
-    * @mapping {@literal named m_kxrnaccr Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;m_kxrnaccr(IIIIDLnet/minecraft/util/math/Direction;Lnet/minecraft/entity/ai/pathing/PathNodeType;)Lnet/minecraft/entity/ai/pathing/PathNode;}
+    * @mapping {@literal named getPathNode Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;getPathNode(IIIIDLnet/minecraft/util/math/Direction;Lnet/minecraft/entity/ai/pathing/PathNodeType;)Lnet/minecraft/entity/ai/pathing/PathNode;}
     */
    @Nullable
-   protected PathNode m_kxrnaccr(int i, int j, int k, int l, double d, Direction direction, PathNodeType arg2) {
+   protected PathNode getPathNode(int x, int y, int z, int maxYStep, double prevFeetY, Direction direction, PathNodeType type) {
       PathNode lv = null;
       BlockPos.Mutable lv2 = new BlockPos.Mutable();
-      double e = this.getFeetY(lv2.set(i, j, k));
-      if (e - d > this.m_yzbojslm()) {
+      double e = this.getFeetY(lv2.set(x, y, z));
+      if (e - prevFeetY > this.getStepHeight()) {
          return null;
       } else {
-         PathNodeType lv3 = this.getNodeType(i, j, k);
+         PathNodeType lv3 = this.getNodeType(x, y, z);
          float f = this.entity.getPenalty(lv3);
          if (f >= 0.0F) {
-            lv = this.m_fkzockkt(i, j, k, lv3, f);
+            lv = this.getNodeWithPenalty(x, y, z, lv3, f);
          }
 
-         if (m_tgzoopmb(arg2) && lv != null && lv.penalty >= 0.0F && !this.isBlocked(lv)) {
+         if (isBlocked(type) && lv != null && lv.penalty >= 0.0F && !this.isBlocked(lv)) {
             lv = null;
          }
 
          if (lv3 != PathNodeType.WALKABLE && (!this.isAmphibious() || lv3 != PathNodeType.WATER)) {
             if ((lv == null || lv.penalty < 0.0F)
-               && l > 0
+               && maxYStep > 0
                && (lv3 != PathNodeType.FENCE || this.canWalkOverFences())
                && lv3 != PathNodeType.UNPASSABLE_RAIL
                && lv3 != PathNodeType.TRAPDOOR
                && lv3 != PathNodeType.POWDER_SNOW) {
-               lv = this.m_kurdvfmr(i, j, k, l, d, direction, arg2, lv2);
+               lv = this.getJumpUpNode(x, y, z, maxYStep, prevFeetY, direction, type, lv2);
             } else if (!this.isAmphibious() && lv3 == PathNodeType.WATER && !this.canSwim()) {
-               lv = this.m_mefnvwvz(i, j, k, lv);
+               lv = this.findFirstNonWaterNodeBelow(x, y, z, lv);
             } else if (lv3 == PathNodeType.OPEN) {
-               lv = this.m_ibznpaha(i, j, k);
-            } else if (m_tgzoopmb(lv3) && lv == null) {
-               lv = this.m_qhhanrdd(i, j, k, lv3);
+               lv = this.findFirstGroundNodeBelow(x, y, z);
+            } else if (isBlocked(lv3) && lv == null) {
+               lv = this.getNodeWithDefaultPenalty(x, y, z, lv3);
             }
 
             return lv;
@@ -334,64 +339,67 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yzbojslm Lnet/minecraft/unmapped/C_hdkjlatd;m_yzbojslm()D}
+    * @mapping {@literal named getStepHeight Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;getStepHeight()D}
     */
-   private double m_yzbojslm() {
+   private double getStepHeight() {
       return Math.max(1.125, (double)this.entity.getStepHeight());
    }
 
    /**
     * @mapping {@literal hashed m_fkzockkt Lnet/minecraft/unmapped/C_hdkjlatd;m_fkzockkt(IIILnet/minecraft/unmapped/C_hahxxnjs;F)Lnet/minecraft/unmapped/C_dfzwsdmo;}
-    * @mapping {@literal named m_fkzockkt Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;m_fkzockkt(IIILnet/minecraft/entity/ai/pathing/PathNodeType;F)Lnet/minecraft/entity/ai/pathing/PathNode;}
+    * @mapping {@literal named getNodeWithPenalty Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;getNodeWithPenalty(IIILnet/minecraft/entity/ai/pathing/PathNodeType;F)Lnet/minecraft/entity/ai/pathing/PathNode;}
     */
-   private PathNode m_fkzockkt(int i, int j, int k, PathNodeType arg, float b) {
-      PathNode lv = this.getNode(i, j, k);
-      lv.f_lzpxpqin = arg;
-      lv.penalty = Math.max(lv.penalty, b);
+   private PathNode getNodeWithPenalty(int x, int y, int z, PathNodeType type, float penalty) {
+      PathNode lv = this.getNode(x, y, z);
+      lv.type = type;
+      lv.penalty = Math.max(lv.penalty, penalty);
       return lv;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_eqwgnoco Lnet/minecraft/unmapped/C_hdkjlatd;m_eqwgnoco(III)Lnet/minecraft/unmapped/C_dfzwsdmo;}
+    * @mapping {@literal named getBlockedNode Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;getBlockedNode(III)Lnet/minecraft/entity/ai/pathing/PathNode;}
     */
-   private PathNode m_eqwgnoco(int i, int j, int k) {
-      PathNode lv = this.getNode(i, j, k);
-      lv.f_lzpxpqin = PathNodeType.BLOCKED;
+   private PathNode getBlockedNode(int x, int y, int z) {
+      PathNode lv = this.getNode(x, y, z);
+      lv.type = PathNodeType.BLOCKED;
       lv.penalty = -1.0F;
       return lv;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qhhanrdd Lnet/minecraft/unmapped/C_hdkjlatd;m_qhhanrdd(IIILnet/minecraft/unmapped/C_hahxxnjs;)Lnet/minecraft/unmapped/C_dfzwsdmo;}
+    * @mapping {@literal named getNodeWithDefaultPenalty Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;getNodeWithDefaultPenalty(IIILnet/minecraft/entity/ai/pathing/PathNodeType;)Lnet/minecraft/entity/ai/pathing/PathNode;}
     */
-   private PathNode m_qhhanrdd(int i, int j, int k, PathNodeType arg) {
-      PathNode lv = this.getNode(i, j, k);
+   private PathNode getNodeWithDefaultPenalty(int x, int y, int z, PathNodeType type) {
+      PathNode lv = this.getNode(x, y, z);
       lv.visited = true;
-      lv.f_lzpxpqin = arg;
-      lv.penalty = arg.getDefaultPenalty();
+      lv.type = type;
+      lv.penalty = type.getDefaultPenalty();
       return lv;
    }
 
    /**
     * @mapping {@literal hashed m_kurdvfmr Lnet/minecraft/unmapped/C_hdkjlatd;m_kurdvfmr(IIIIDLnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hahxxnjs;Lnet/minecraft/unmapped/C_hynzadkk$C_egqitdjk;)Lnet/minecraft/unmapped/C_dfzwsdmo;}
-    * @mapping {@literal named m_kurdvfmr Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;m_kurdvfmr(IIIIDLnet/minecraft/util/math/Direction;Lnet/minecraft/entity/ai/pathing/PathNodeType;Lnet/minecraft/util/math/BlockPos$Mutable;)Lnet/minecraft/entity/ai/pathing/PathNode;}
+    * @mapping {@literal named getJumpUpNode Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;getJumpUpNode(IIIIDLnet/minecraft/util/math/Direction;Lnet/minecraft/entity/ai/pathing/PathNodeType;Lnet/minecraft/util/math/BlockPos$Mutable;)Lnet/minecraft/entity/ai/pathing/PathNode;}
     */
    @Nullable
-   private PathNode m_kurdvfmr(int i, int j, int k, int l, double d, Direction direction, PathNodeType arg2, BlockPos.Mutable pos) {
-      PathNode lv = this.m_kxrnaccr(i, j + 1, k, l - 1, d, direction, arg2);
+   private PathNode getJumpUpNode(int x, int y, int z, int maxYStep, double prevFeetY, Direction direction, PathNodeType type, BlockPos.Mutable pos) {
+      PathNode lv = this.getPathNode(x, y + 1, z, maxYStep - 1, prevFeetY, direction, type);
       if (lv == null) {
          return null;
       } else if (this.entity.getWidth() >= 1.0F) {
          return lv;
-      } else if (lv.f_lzpxpqin != PathNodeType.OPEN && lv.f_lzpxpqin != PathNodeType.WALKABLE) {
+      } else if (lv.type != PathNodeType.OPEN && lv.type != PathNodeType.WALKABLE) {
          return lv;
       } else {
-         double e = (double)(i - direction.getOffsetX()) + 0.5;
-         double f = (double)(k - direction.getOffsetZ()) + 0.5;
+         double e = (double)(x - direction.getOffsetX()) + 0.5;
+         double f = (double)(z - direction.getOffsetZ()) + 0.5;
          double g = (double)this.entity.getWidth() / 2.0;
          Box lv2 = new Box(
             e - g,
-            this.getFeetY(pos.set(e, (double)(j + 1), f)) + 0.001,
+            this.getFeetY(pos.set(e, (double)(y + 1), f)) + 0.001,
             f - g,
             e + g,
             (double)this.entity.getHeight() + this.getFeetY(pos.set((double)lv.x, (double)lv.y, (double)lv.z)) - 0.002,
@@ -402,46 +410,48 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mefnvwvz Lnet/minecraft/unmapped/C_hdkjlatd;m_mefnvwvz(IIILnet/minecraft/unmapped/C_dfzwsdmo;)Lnet/minecraft/unmapped/C_dfzwsdmo;}
+    * @mapping {@literal named findFirstNonWaterNodeBelow Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;findFirstNonWaterNodeBelow(IIILnet/minecraft/entity/ai/pathing/PathNode;)Lnet/minecraft/entity/ai/pathing/PathNode;}
     */
    @Nullable
-   private PathNode m_mefnvwvz(int i, int j, int k, @Nullable PathNode arg) {
-      j--;
+   private PathNode findFirstNonWaterNodeBelow(int x, int y, int z, @Nullable PathNode node) {
+      y--;
 
-      while (j > this.entity.getWorld().getBottomY()) {
-         PathNodeType lv = this.getNodeType(i, j, k);
+      while (y > this.entity.getWorld().getBottomY()) {
+         PathNodeType lv = this.getNodeType(x, y, z);
          if (lv != PathNodeType.WATER) {
-            return arg;
+            return node;
          }
 
-         arg = this.m_fkzockkt(i, j, k, lv, this.entity.getPenalty(lv));
-         j--;
+         node = this.getNodeWithPenalty(x, y, z, lv, this.entity.getPenalty(lv));
+         y--;
       }
 
-      return arg;
+      return node;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ibznpaha Lnet/minecraft/unmapped/C_hdkjlatd;m_ibznpaha(III)Lnet/minecraft/unmapped/C_dfzwsdmo;}
+    * @mapping {@literal named findFirstGroundNodeBelow Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;findFirstGroundNodeBelow(III)Lnet/minecraft/entity/ai/pathing/PathNode;}
     */
-   private PathNode m_ibznpaha(int i, int j, int k) {
-      for (int l = j - 1; l >= this.entity.getWorld().getBottomY(); l--) {
-         if (j - l > this.entity.getSafeFallDistance()) {
-            return this.m_eqwgnoco(i, l, k);
+   private PathNode findFirstGroundNodeBelow(int x, int y, int z) {
+      for (int l = y - 1; l >= this.entity.getWorld().getBottomY(); l--) {
+         if (y - l > this.entity.getSafeFallDistance()) {
+            return this.getBlockedNode(x, l, z);
          }
 
-         PathNodeType lv = this.getNodeType(i, l, k);
+         PathNodeType lv = this.getNodeType(x, l, z);
          float f = this.entity.getPenalty(lv);
          if (lv != PathNodeType.OPEN) {
             if (f >= 0.0F) {
-               return this.m_fkzockkt(i, l, k, lv, f);
+               return this.getNodeWithPenalty(x, l, z, lv, f);
             }
 
-            return this.m_eqwgnoco(i, l, k);
+            return this.getBlockedNode(x, l, z);
          }
       }
 
-      return this.m_eqwgnoco(i, j, k);
+      return this.getBlockedNode(x, y, z);
    }
 
    /**
@@ -449,8 +459,7 @@
     * @mapping {@literal named checkBoxCollision Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;checkBoxCollision(Lnet/minecraft/util/math/Box;)Z}
     */
    private boolean checkBoxCollision(Box box) {
-      return this.collidedBoxes
-         .computeIfAbsent(box, (Object2BooleanFunction<? super Box>)(object -> !this.f_jffuufhn.m_pbrulfze().isSpaceEmpty(this.entity, box)));
+      return this.collidedBoxes.computeIfAbsent(box, (Object2BooleanFunction<? super Box>)(b -> !this.context.getWorld().isSpaceEmpty(this.entity, box)));
    }
 
    /**
@@ -458,16 +467,16 @@
     * @mapping {@literal named getNodeType Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;getNodeType(III)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
     */
    protected PathNodeType getNodeType(int x, int y, int z) {
-      return this.f_ybtkjkef
-         .computeIfAbsent(BlockPos.asLong(x, y, z), (Long2ObjectFunction<? extends PathNodeType>)(l -> this.m_aquikxzw(this.f_jffuufhn, x, y, z, this.entity)));
+      return this.collisionCache
+         .computeIfAbsent(BlockPos.asLong(x, y, z), (Long2ObjectFunction<? extends PathNodeType>)(l -> this.getNodeType(this.context, x, y, z, this.entity)));
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public PathNodeType m_aquikxzw(C_amrnepho arg, int i, int j, int k, MobEntity arg2) {
-      Set<PathNodeType> set = this.m_xmcbfbhg(arg, i, j, k);
+   public PathNodeType getNodeType(PathContext context, int x, int y, int z, MobEntity entity) {
+      Set<PathNodeType> set = this.getCollidingNodeTypes(context, x, y, z);
       if (set.contains(PathNodeType.FENCE)) {
          return PathNodeType.FENCE;
       } else if (set.contains(PathNodeType.UNPASSABLE_RAIL)) {
@@ -476,34 +485,38 @@
          PathNodeType lv = PathNodeType.BLOCKED;
 
          for (PathNodeType lv2 : set) {
-            if (arg2.getPenalty(lv2) < 0.0F) {
+            if (entity.getPenalty(lv2) < 0.0F) {
                return lv2;
             }
 
-            if (arg2.getPenalty(lv2) >= arg2.getPenalty(lv)) {
+            if (entity.getPenalty(lv2) >= entity.getPenalty(lv)) {
                lv = lv2;
             }
          }
 
-         return this.entityBlockXSize <= 1 && lv != PathNodeType.OPEN && arg2.getPenalty(lv) == 0.0F && this.m_amhxcrvm(arg, i, j, k) == PathNodeType.OPEN
+         return this.entityBlockXSize <= 1
+               && lv != PathNodeType.OPEN
+               && entity.getPenalty(lv) == 0.0F
+               && this.getDefaultNodeType(context, x, y, z) == PathNodeType.OPEN
             ? PathNodeType.OPEN
             : lv;
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xmcbfbhg Lnet/minecraft/unmapped/C_hdkjlatd;m_xmcbfbhg(Lnet/minecraft/unmapped/C_amrnepho;III)Ljava/util/Set;}
+    * @mapping {@literal named getCollidingNodeTypes Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;getCollidingNodeTypes(Lnet/minecraft/entity/ai/pathing/PathContext;III)Ljava/util/Set;}
     */
-   public Set<PathNodeType> m_xmcbfbhg(C_amrnepho arg, int i, int j, int k) {
+   public Set<PathNodeType> getCollidingNodeTypes(PathContext context, int x, int y, int z) {
       EnumSet<PathNodeType> enumSet = EnumSet.noneOf(PathNodeType.class);
 
       for (int l = 0; l < this.entityBlockXSize; l++) {
          for (int m = 0; m < this.entityBlockYSize; m++) {
             for (int n = 0; n < this.entityBlockZSize; n++) {
-               int o = l + i;
-               int p = m + j;
-               int q = n + k;
-               PathNodeType lv = this.m_amhxcrvm(arg, o, p, q);
+               int o = l + x;
+               int p = m + y;
+               int q = n + z;
+               PathNodeType lv = this.getDefaultNodeType(context, o, p, q);
                BlockPos lv2 = this.entity.getBlockPos();
                boolean bl = this.canEnterOpenDoors();
                if (lv == PathNodeType.DOOR_WOOD_CLOSED && this.canOpenDoors() && bl) {
@@ -515,8 +528,8 @@
                }
 
                if (lv == PathNodeType.RAIL
-                  && this.m_amhxcrvm(arg, lv2.getX(), lv2.getY(), lv2.getZ()) != PathNodeType.RAIL
-                  && this.m_amhxcrvm(arg, lv2.getX(), lv2.getY() - 1, lv2.getZ()) != PathNodeType.RAIL) {
+                  && this.getDefaultNodeType(context, lv2.getX(), lv2.getY(), lv2.getZ()) != PathNodeType.RAIL
+                  && this.getDefaultNodeType(context, lv2.getX(), lv2.getY() - 1, lv2.getZ()) != PathNodeType.RAIL) {
                   lv = PathNodeType.UNPASSABLE_RAIL;
                }
 
@@ -532,29 +545,29 @@
     * Mapping not found
     */
    @Override
-   public PathNodeType m_amhxcrvm(C_amrnepho arg, int i, int j, int k) {
-      return m_txuqlgaw(arg, new BlockPos.Mutable(i, j, k));
+   public PathNodeType getDefaultNodeType(PathContext context, int x, int y, int z) {
+      return getLandNodeType(context, new BlockPos.Mutable(x, y, z));
    }
 
    /**
     * @mapping {@literal hashed m_femsgzut Lnet/minecraft/unmapped/C_hdkjlatd;m_femsgzut(Lnet/minecraft/unmapped/C_dxkfswlz;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_hahxxnjs;}
-    * @mapping {@literal named m_femsgzut Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;m_femsgzut(Lnet/minecraft/entity/mob/MobEntity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
+    * @mapping {@literal named getLandNodeType Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;getLandNodeType(Lnet/minecraft/entity/mob/MobEntity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
     */
-   public static PathNodeType m_femsgzut(MobEntity arg, BlockPos pos) {
-      return m_txuqlgaw(new C_amrnepho(arg.getWorld(), arg), pos.mutableCopy());
+   public static PathNodeType getLandNodeType(MobEntity entity, BlockPos pos) {
+      return getLandNodeType(new PathContext(entity.getWorld(), entity), pos.mutableCopy());
    }
 
    /**
     * @mapping {@literal hashed m_txuqlgaw Lnet/minecraft/unmapped/C_hdkjlatd;m_txuqlgaw(Lnet/minecraft/unmapped/C_amrnepho;Lnet/minecraft/unmapped/C_hynzadkk$C_egqitdjk;)Lnet/minecraft/unmapped/C_hahxxnjs;}
-    * @mapping {@literal named m_txuqlgaw Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;m_txuqlgaw(Lnet/minecraft/unmapped/C_amrnepho;Lnet/minecraft/util/math/BlockPos$Mutable;)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
+    * @mapping {@literal named getLandNodeType Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;getLandNodeType(Lnet/minecraft/entity/ai/pathing/PathContext;Lnet/minecraft/util/math/BlockPos$Mutable;)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
     */
-   public static PathNodeType m_txuqlgaw(C_amrnepho arg, BlockPos.Mutable pos) {
+   public static PathNodeType getLandNodeType(PathContext context, BlockPos.Mutable pos) {
       int i = pos.getX();
       int j = pos.getY();
       int k = pos.getZ();
-      PathNodeType lv = arg.m_qrvkklwj(i, j, k);
-      if (lv == PathNodeType.OPEN && j >= arg.m_pbrulfze().getBottomY() + 1) {
-         return switch (arg.m_qrvkklwj(i, j - 1, k)) {
+      PathNodeType lv = context.getNodeType(i, j, k);
+      if (lv == PathNodeType.OPEN && j >= context.getWorld().getBottomY() + 1) {
+         return switch (context.getNodeType(i, j - 1, k)) {
             case OPEN, WATER, LAVA, WALKABLE -> PathNodeType.OPEN;
             case DAMAGE_FIRE -> PathNodeType.DAMAGE_FIRE;
             case DAMAGE_OTHER -> PathNodeType.DAMAGE_OTHER;
@@ -562,7 +575,7 @@
             case POWDER_SNOW -> PathNodeType.DANGER_POWDER_SNOW;
             case DAMAGE_CAUTIOUS -> PathNodeType.DAMAGE_CAUTIOUS;
             case TRAPDOOR -> PathNodeType.DANGER_TRAPDOOR;
-            default -> m_jprttgje(arg, i, j, k, PathNodeType.WALKABLE);
+            default -> getNodeTypeFromNeighbors(context, i, j, k, PathNodeType.WALKABLE);
          };
       } else {
          return lv;
@@ -570,14 +583,15 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jprttgje Lnet/minecraft/unmapped/C_hdkjlatd;m_jprttgje(Lnet/minecraft/unmapped/C_amrnepho;IIILnet/minecraft/unmapped/C_hahxxnjs;)Lnet/minecraft/unmapped/C_hahxxnjs;}
+    * @mapping {@literal named getNodeTypeFromNeighbors Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;getNodeTypeFromNeighbors(Lnet/minecraft/entity/ai/pathing/PathContext;IIILnet/minecraft/entity/ai/pathing/PathNodeType;)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
     */
-   public static PathNodeType m_jprttgje(C_amrnepho arg, int i, int j, int k, PathNodeType arg2) {
+   public static PathNodeType getNodeTypeFromNeighbors(PathContext context, int x, int y, int z, PathNodeType fallback) {
       for (int l = -1; l <= 1; l++) {
          for (int m = -1; m <= 1; m++) {
             for (int n = -1; n <= 1; n++) {
                if (l != 0 || n != 0) {
-                  PathNodeType lv = arg.m_qrvkklwj(i + l, j + m, k + n);
+                  PathNodeType lv = context.getNodeType(x + l, y + m, z + n);
                   if (lv == PathNodeType.DAMAGE_OTHER) {
                      return PathNodeType.DANGER_OTHER;
                   }
@@ -598,14 +612,14 @@
          }
       }
 
-      return arg2;
+      return fallback;
    }
 
    /**
     * @mapping {@literal hashed m_franhrzn Lnet/minecraft/unmapped/C_hdkjlatd;m_franhrzn(Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_hahxxnjs;}
-    * @mapping {@literal named m_franhrzn Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;m_franhrzn(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
+    * @mapping {@literal named getNodeTypeFromState Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;getNodeTypeFromState(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
     */
-   protected static PathNodeType m_franhrzn(BlockView world, BlockPos pos) {
+   protected static PathNodeType getNodeTypeFromState(BlockView world, BlockPos pos) {
       BlockState lv = world.getBlockState(pos);
       Block lv2 = lv.getBlock();
       if (lv.isAir()) {
@@ -624,7 +638,7 @@
          FluidState lv3 = lv.getFluidState();
          if (lv3.isIn(FluidTags.LAVA)) {
             return PathNodeType.LAVA;
-         } else if (m_ccdrwtxl(lv)) {
+         } else if (inflictsFireDamage(lv)) {
             return PathNodeType.DAMAGE_FIRE;
          } else if (lv2 instanceof DoorBlock lv4) {
             if ((Boolean)lv.get(DoorBlock.OPEN)) {
diff -bur namedTargetSrc/net/minecraft/entity/ai/pathing/MobNavigation.java namedSrc/net/minecraft/entity/ai/pathing/MobNavigation.java
--- namedTargetSrc/net/minecraft/entity/ai/pathing/MobNavigation.java	2024-03-21 03:32:24.763862275 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/MobNavigation.java	2024-03-21 03:31:15.311948660 +0000
@@ -152,13 +152,14 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jlobybcp Lnet/minecraft/unmapped/C_umfumcxf;m_jlobybcp(Lnet/minecraft/unmapped/C_hahxxnjs;)Z}
+    * @mapping {@literal named isValidPathType Lnet/minecraft/entity/ai/pathing/MobNavigation;isValidPathType(Lnet/minecraft/entity/ai/pathing/PathNodeType;)Z}
     */
-   protected boolean m_jlobybcp(PathNodeType arg) {
-      if (arg == PathNodeType.WATER) {
+   protected boolean isValidPathType(PathNodeType type) {
+      if (type == PathNodeType.WATER) {
          return false;
       } else {
-         return arg == PathNodeType.LAVA ? false : arg != PathNodeType.OPEN;
+         return type == PathNodeType.LAVA ? false : type != PathNodeType.OPEN;
       }
    }
 
Only in namedSrc/net/minecraft/entity/ai/pathing: PathContext.java
diff -bur namedTargetSrc/net/minecraft/entity/ai/pathing/Path.java namedSrc/net/minecraft/entity/ai/pathing/Path.java
--- namedTargetSrc/net/minecraft/entity/ai/pathing/Path.java	2024-03-21 03:32:24.887862171 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/Path.java	2024-03-21 03:31:15.515948402 +0000
@@ -21,10 +21,11 @@
     */
    private final List<PathNode> nodes;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_npdimlgm Lnet/minecraft/unmapped/C_motipebf;f_npdimlgm:Lnet/minecraft/unmapped/C_motipebf$C_ekwhyzmc;}
+    * @mapping {@literal named debugData Lnet/minecraft/entity/ai/pathing/Path;debugData:Lnet/minecraft/entity/ai/pathing/Path$DebugData;}
     */
    @Nullable
-   private Path.C_ekwhyzmc f_npdimlgm;
+   private Path.DebugData debugData;
    /**
     * @mapping {@literal hashed f_qymekvni Lnet/minecraft/unmapped/C_motipebf;f_qymekvni:I}
     * @mapping {@literal named currentNodeIndex Lnet/minecraft/entity/ai/pathing/Path;currentNodeIndex:I}
@@ -231,15 +232,16 @@
     */
    @Debug
    void setDebugInfo(PathNode[] debugNodes, PathNode[] debugSecondNodes, Set<TargetPathNode> debugTargetNodes) {
-      this.f_npdimlgm = new Path.C_ekwhyzmc(debugNodes, debugSecondNodes, debugTargetNodes);
+      this.debugData = new Path.DebugData(debugNodes, debugSecondNodes, debugTargetNodes);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pcofzwtj Lnet/minecraft/unmapped/C_motipebf;m_pcofzwtj()Lnet/minecraft/unmapped/C_motipebf$C_ekwhyzmc;}
+    * @mapping {@literal named getDebugData Lnet/minecraft/entity/ai/pathing/Path;getDebugData()Lnet/minecraft/entity/ai/pathing/Path$DebugData;}
     */
    @Nullable
-   public Path.C_ekwhyzmc m_pcofzwtj() {
-      return this.f_npdimlgm;
+   public Path.DebugData getDebugData() {
+      return this.debugData;
    }
 
    /**
@@ -247,12 +249,12 @@
     * @mapping {@literal named toBuffer Lnet/minecraft/entity/ai/pathing/Path;toBuffer(Lnet/minecraft/network/PacketByteBuf;)V}
     */
    public void toBuffer(PacketByteBuf buffer) {
-      if (this.f_npdimlgm != null && !this.f_npdimlgm.targetNodes.isEmpty()) {
+      if (this.debugData != null && !this.debugData.targetNodes.isEmpty()) {
          buffer.writeBoolean(this.reachesTarget);
          buffer.writeInt(this.currentNodeIndex);
          buffer.writePos(this.target);
-         buffer.writeCollection(this.nodes, (buf, arg2) -> arg2.toBuffer(buf));
-         this.f_npdimlgm.m_xtzdpdgy(buffer);
+         buffer.writeCollection(this.nodes, (buf, node) -> node.write(buf));
+         this.debugData.write(buffer);
       }
    }
 
@@ -265,9 +267,9 @@
       int i = buffer.readInt();
       BlockPos lv = buffer.readPos();
       List<PathNode> list = buffer.readList(PathNode::readBuf);
-      Path.C_ekwhyzmc lv2 = Path.C_ekwhyzmc.m_dqwsgkcf(buffer);
+      Path.DebugData lv2 = Path.DebugData.read(buffer);
       Path lv3 = new Path(list, lv, bl);
-      lv3.f_npdimlgm = lv2;
+      lv3.debugData = lv2;
       lv3.currentNodeIndex = i;
       return lv3;
    }
@@ -297,9 +299,9 @@
 
    /**
     * @mapping {@literal hashed m_kelqkczg Lnet/minecraft/unmapped/C_motipebf;m_kelqkczg(Lnet/minecraft/unmapped/C_idfydwco;)[Lnet/minecraft/unmapped/C_dfzwsdmo;}
-    * @mapping {@literal named m_kelqkczg Lnet/minecraft/entity/ai/pathing/Path;m_kelqkczg(Lnet/minecraft/network/PacketByteBuf;)[Lnet/minecraft/entity/ai/pathing/PathNode;}
+    * @mapping {@literal named readNodes Lnet/minecraft/entity/ai/pathing/Path;readNodes(Lnet/minecraft/network/PacketByteBuf;)[Lnet/minecraft/entity/ai/pathing/PathNode;}
     */
-   static PathNode[] m_kelqkczg(PacketByteBuf buf) {
+   static PathNode[] readNodes(PacketByteBuf buf) {
       PathNode[] lvs = new PathNode[buf.readVarInt()];
 
       for (int i = 0; i < lvs.length; i++) {
@@ -311,51 +313,52 @@
 
    /**
     * @mapping {@literal hashed m_dnyzefqj Lnet/minecraft/unmapped/C_motipebf;m_dnyzefqj(Lnet/minecraft/unmapped/C_idfydwco;[Lnet/minecraft/unmapped/C_dfzwsdmo;)V}
-    * @mapping {@literal named m_dnyzefqj Lnet/minecraft/entity/ai/pathing/Path;m_dnyzefqj(Lnet/minecraft/network/PacketByteBuf;[Lnet/minecraft/entity/ai/pathing/PathNode;)V}
+    * @mapping {@literal named write Lnet/minecraft/entity/ai/pathing/Path;write(Lnet/minecraft/network/PacketByteBuf;[Lnet/minecraft/entity/ai/pathing/PathNode;)V}
     */
-   static void m_dnyzefqj(PacketByteBuf buf, PathNode[] nodes) {
+   static void write(PacketByteBuf buf, PathNode[] nodes) {
       buf.writeVarInt(nodes.length);
 
       for (PathNode lv : nodes) {
-         lv.toBuffer(buf);
+         lv.write(buf);
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wczjqbsn Lnet/minecraft/unmapped/C_motipebf;m_wczjqbsn()Lnet/minecraft/unmapped/C_motipebf;}
+    * @mapping {@literal named copy Lnet/minecraft/entity/ai/pathing/Path;copy()Lnet/minecraft/entity/ai/pathing/Path;}
     */
-   public Path m_wczjqbsn() {
+   public Path copy() {
       Path lv = new Path(this.nodes, this.target, this.reachesTarget);
-      lv.f_npdimlgm = this.f_npdimlgm;
+      lv.debugData = this.debugData;
       lv.currentNodeIndex = this.currentNodeIndex;
       return lv;
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_motipebf$C_ekwhyzmc}
-    * @mapping {@literal named net/minecraft/entity/ai/pathing/Path$C_ekwhyzmc}
+    * @mapping {@literal named net/minecraft/entity/ai/pathing/Path$DebugData}
     */
-   public static record C_ekwhyzmc(PathNode[] openSet, PathNode[] closedSet, Set<TargetPathNode> targetNodes) {
+   public static record DebugData(PathNode[] openSet, PathNode[] closedSet, Set<TargetPathNode> targetNodes) {
 
       /**
        * @mapping {@literal hashed m_xtzdpdgy Lnet/minecraft/unmapped/C_motipebf$C_ekwhyzmc;m_xtzdpdgy(Lnet/minecraft/unmapped/C_idfydwco;)V}
-       * @mapping {@literal named m_xtzdpdgy Lnet/minecraft/entity/ai/pathing/Path$C_ekwhyzmc;m_xtzdpdgy(Lnet/minecraft/network/PacketByteBuf;)V}
+       * @mapping {@literal named write Lnet/minecraft/entity/ai/pathing/Path$DebugData;write(Lnet/minecraft/network/PacketByteBuf;)V}
        */
-      public void m_xtzdpdgy(PacketByteBuf buf) {
-         buf.writeCollection(this.targetNodes, (bufx, arg2) -> arg2.toBuffer(bufx));
-         Path.m_dnyzefqj(buf, this.openSet);
-         Path.m_dnyzefqj(buf, this.closedSet);
+      public void write(PacketByteBuf buf) {
+         buf.writeCollection(this.targetNodes, (bufx, arg2) -> arg2.write(bufx));
+         Path.write(buf, this.openSet);
+         Path.write(buf, this.closedSet);
       }
 
       /**
        * @mapping {@literal hashed m_dqwsgkcf Lnet/minecraft/unmapped/C_motipebf$C_ekwhyzmc;m_dqwsgkcf(Lnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_motipebf$C_ekwhyzmc;}
-       * @mapping {@literal named m_dqwsgkcf Lnet/minecraft/entity/ai/pathing/Path$C_ekwhyzmc;m_dqwsgkcf(Lnet/minecraft/network/PacketByteBuf;)Lnet/minecraft/entity/ai/pathing/Path$C_ekwhyzmc;}
+       * @mapping {@literal named read Lnet/minecraft/entity/ai/pathing/Path$DebugData;read(Lnet/minecraft/network/PacketByteBuf;)Lnet/minecraft/entity/ai/pathing/Path$DebugData;}
        */
-      public static Path.C_ekwhyzmc m_dqwsgkcf(PacketByteBuf buf) {
+      public static Path.DebugData read(PacketByteBuf buf) {
          HashSet<TargetPathNode> hashSet = buf.readCollection(HashSet::new, TargetPathNode::fromBuffer);
-         PathNode[] lvs = Path.m_kelqkczg(buf);
-         PathNode[] lvs2 = Path.m_kelqkczg(buf);
-         return new Path.C_ekwhyzmc(lvs, lvs2, hashSet);
+         PathNode[] lvs = Path.readNodes(buf);
+         PathNode[] lvs2 = Path.readNodes(buf);
+         return new Path.DebugData(lvs, lvs2, hashSet);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/pathing/PathNode.java namedSrc/net/minecraft/entity/ai/pathing/PathNode.java
--- namedTargetSrc/net/minecraft/entity/ai/pathing/PathNode.java	2024-03-21 03:32:24.747862289 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/PathNode.java	2024-03-21 03:31:15.291948685 +0000
@@ -73,9 +73,10 @@
     */
    public float penalty;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_lzpxpqin Lnet/minecraft/unmapped/C_dfzwsdmo;f_lzpxpqin:Lnet/minecraft/unmapped/C_hahxxnjs;}
+    * @mapping {@literal named type Lnet/minecraft/entity/ai/pathing/PathNode;type:Lnet/minecraft/entity/ai/pathing/PathNodeType;}
     */
-   public PathNodeType f_lzpxpqin = PathNodeType.BLOCKED;
+   public PathNodeType type = PathNodeType.BLOCKED;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_dfzwsdmo;<init>(III)V}
@@ -102,7 +103,7 @@
       lv.visited = this.visited;
       lv.pathLength = this.pathLength;
       lv.penalty = this.penalty;
-      lv.f_lzpxpqin = this.f_lzpxpqin;
+      lv.type = this.type;
       return lv;
    }
 
@@ -238,16 +239,16 @@
 
    /**
     * @mapping {@literal hashed m_cmwrnysk Lnet/minecraft/unmapped/C_dfzwsdmo;m_cmwrnysk(Lnet/minecraft/unmapped/C_idfydwco;)V}
-    * @mapping {@literal named toBuffer Lnet/minecraft/entity/ai/pathing/PathNode;toBuffer(Lnet/minecraft/network/PacketByteBuf;)V}
+    * @mapping {@literal named write Lnet/minecraft/entity/ai/pathing/PathNode;write(Lnet/minecraft/network/PacketByteBuf;)V}
     */
-   public void toBuffer(PacketByteBuf buffer) {
+   public void write(PacketByteBuf buffer) {
       buffer.writeInt(this.x);
       buffer.writeInt(this.y);
       buffer.writeInt(this.z);
       buffer.writeFloat(this.pathLength);
       buffer.writeFloat(this.penalty);
       buffer.writeBoolean(this.visited);
-      buffer.writeEnumConstant(this.f_lzpxpqin);
+      buffer.writeEnumConstant(this.type);
       buffer.writeFloat(this.heapWeight);
    }
 
@@ -269,7 +270,7 @@
       node.pathLength = buf.readFloat();
       node.penalty = buf.readFloat();
       node.visited = buf.readBoolean();
-      node.f_lzpxpqin = buf.readEnumConstant(PathNodeType.class);
+      node.type = buf.readEnumConstant(PathNodeType.class);
       node.heapWeight = buf.readFloat();
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/pathing/PathNodeMaker.java namedSrc/net/minecraft/entity/ai/pathing/PathNodeMaker.java
--- namedTargetSrc/net/minecraft/entity/ai/pathing/PathNodeMaker.java	2024-03-21 03:32:24.895862165 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/PathNodeMaker.java	2024-03-21 03:31:15.523948391 +0000
@@ -8,7 +8,6 @@
 import net.minecraft.block.CampfireBlock;
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.registry.tag.BlockTags;
-import net.minecraft.unmapped.C_amrnepho;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.chunk.ChunkCache;
@@ -19,9 +18,10 @@
  */
 public abstract class PathNodeMaker {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jffuufhn Lnet/minecraft/unmapped/C_pbtgpvfg;f_jffuufhn:Lnet/minecraft/unmapped/C_amrnepho;}
+    * @mapping {@literal named context Lnet/minecraft/entity/ai/pathing/PathNodeMaker;context:Lnet/minecraft/entity/ai/pathing/PathContext;}
     */
-   protected C_amrnepho f_jffuufhn;
+   protected PathContext context;
    /**
     * @mapping {@literal hashed f_mkveapwo Lnet/minecraft/unmapped/C_pbtgpvfg;f_mkveapwo:Lnet/minecraft/unmapped/C_dxkfswlz;}
     * @mapping {@literal named entity Lnet/minecraft/entity/ai/pathing/PathNodeMaker;entity:Lnet/minecraft/entity/mob/MobEntity;}
@@ -73,7 +73,7 @@
     * @mapping {@literal named init Lnet/minecraft/entity/ai/pathing/PathNodeMaker;init(Lnet/minecraft/world/chunk/ChunkCache;Lnet/minecraft/entity/mob/MobEntity;)V}
     */
    public void init(ChunkCache cachedWorld, MobEntity entity) {
-      this.f_jffuufhn = new C_amrnepho(cachedWorld, entity);
+      this.context = new PathContext(cachedWorld, entity);
       this.entity = entity;
       this.pathNodeCache.clear();
       this.entityBlockXSize = MathHelper.floor(entity.getWidth() + 1.0F);
@@ -86,7 +86,7 @@
     * @mapping {@literal named clear Lnet/minecraft/entity/ai/pathing/PathNodeMaker;clear()V}
     */
    public void clear() {
-      this.f_jffuufhn = null;
+      this.context = null;
       this.entity = null;
    }
 
@@ -134,22 +134,22 @@
 
    /**
     * @mapping {@literal hashed m_aquikxzw Lnet/minecraft/unmapped/C_pbtgpvfg;m_aquikxzw(Lnet/minecraft/unmapped/C_amrnepho;IIILnet/minecraft/unmapped/C_dxkfswlz;)Lnet/minecraft/unmapped/C_hahxxnjs;}
-    * @mapping {@literal named m_aquikxzw Lnet/minecraft/entity/ai/pathing/PathNodeMaker;m_aquikxzw(Lnet/minecraft/unmapped/C_amrnepho;IIILnet/minecraft/entity/mob/MobEntity;)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
+    * @mapping {@literal named getNodeType Lnet/minecraft/entity/ai/pathing/PathNodeMaker;getNodeType(Lnet/minecraft/entity/ai/pathing/PathContext;IIILnet/minecraft/entity/mob/MobEntity;)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
     */
-   public abstract PathNodeType m_aquikxzw(C_amrnepho arg, int x, int y, int z, MobEntity entity);
+   public abstract PathNodeType getNodeType(PathContext context, int x, int y, int z, MobEntity entity);
 
    /**
     * @mapping {@literal hashed m_amhxcrvm Lnet/minecraft/unmapped/C_pbtgpvfg;m_amhxcrvm(Lnet/minecraft/unmapped/C_amrnepho;III)Lnet/minecraft/unmapped/C_hahxxnjs;}
-    * @mapping {@literal named m_amhxcrvm Lnet/minecraft/entity/ai/pathing/PathNodeMaker;m_amhxcrvm(Lnet/minecraft/unmapped/C_amrnepho;III)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
+    * @mapping {@literal named getDefaultNodeType Lnet/minecraft/entity/ai/pathing/PathNodeMaker;getDefaultNodeType(Lnet/minecraft/entity/ai/pathing/PathContext;III)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
     */
-   public abstract PathNodeType m_amhxcrvm(C_amrnepho arg, int x, int y, int z);
+   public abstract PathNodeType getDefaultNodeType(PathContext context, int x, int y, int z);
 
    /**
     * @mapping {@literal hashed m_tyumpkdm Lnet/minecraft/unmapped/C_pbtgpvfg;m_tyumpkdm(Lnet/minecraft/unmapped/C_dxkfswlz;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_hahxxnjs;}
-    * @mapping {@literal named m_tyumpkdm Lnet/minecraft/entity/ai/pathing/PathNodeMaker;m_tyumpkdm(Lnet/minecraft/entity/mob/MobEntity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
+    * @mapping {@literal named getDefaultNodeType Lnet/minecraft/entity/ai/pathing/PathNodeMaker;getDefaultNodeType(Lnet/minecraft/entity/mob/MobEntity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
     */
-   public PathNodeType m_tyumpkdm(MobEntity arg, BlockPos pos) {
-      return this.m_amhxcrvm(new C_amrnepho(arg.getWorld(), arg), pos.getX(), pos.getY(), pos.getZ());
+   public PathNodeType getDefaultNodeType(MobEntity entity, BlockPos pos) {
+      return this.getDefaultNodeType(new PathContext(entity.getWorld(), entity), pos.getX(), pos.getY(), pos.getZ());
    }
 
    /**
@@ -218,9 +218,9 @@
 
    /**
     * @mapping {@literal hashed m_ccdrwtxl Lnet/minecraft/unmapped/C_pbtgpvfg;m_ccdrwtxl(Lnet/minecraft/unmapped/C_txtbiemp;)Z}
-    * @mapping {@literal named m_ccdrwtxl Lnet/minecraft/entity/ai/pathing/PathNodeMaker;m_ccdrwtxl(Lnet/minecraft/block/BlockState;)Z}
+    * @mapping {@literal named inflictsFireDamage Lnet/minecraft/entity/ai/pathing/PathNodeMaker;inflictsFireDamage(Lnet/minecraft/block/BlockState;)Z}
     */
-   public static boolean m_ccdrwtxl(BlockState state) {
+   public static boolean inflictsFireDamage(BlockState state) {
       return state.isIn(BlockTags.FIRE)
          || state.isOf(Blocks.LAVA)
          || state.isOf(Blocks.MAGMA_BLOCK)
Only in namedSrc/net/minecraft/entity/ai/pathing: PathNodeTypeCache.java
diff -bur namedTargetSrc/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.java namedSrc/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.java
--- namedTargetSrc/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.java	2024-03-21 03:32:24.799862245 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.java	2024-03-21 03:31:15.395948554 +0000
@@ -9,7 +9,6 @@
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.registry.tag.FluidTags;
-import net.minecraft.unmapped.C_amrnepho;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
@@ -85,7 +84,7 @@
       Map<Direction, PathNode> map = Maps.newEnumMap(Direction.class);
 
       for (Direction lv : Direction.values()) {
-         PathNode lv2 = this.m_qgilkbuc(node.x + lv.getOffsetX(), node.y + lv.getOffsetY(), node.z + lv.getOffsetZ());
+         PathNode lv2 = this.findUsableNode(node.x + lv.getOffsetX(), node.y + lv.getOffsetY(), node.z + lv.getOffsetZ());
          map.put(lv, lv2);
          if (this.isNodeValid(lv2)) {
             successors[i++] = lv2;
@@ -95,7 +94,7 @@
       for (Direction lv3 : Direction.Type.HORIZONTAL) {
          Direction lv4 = lv3.rotateYClockwise();
          if (hasPenalty((PathNode)map.get(lv3)) && hasPenalty((PathNode)map.get(lv4))) {
-            PathNode lv5 = this.m_qgilkbuc(node.x + lv3.getOffsetX() + lv4.getOffsetX(), node.y, node.z + lv3.getOffsetZ() + lv4.getOffsetZ());
+            PathNode lv5 = this.findUsableNode(node.x + lv3.getOffsetX() + lv4.getOffsetX(), node.y, node.z + lv3.getOffsetZ() + lv4.getOffsetZ());
             if (this.isNodeValid(lv5)) {
                successors[i++] = lv5;
             }
@@ -123,19 +122,19 @@
 
    /**
     * @mapping {@literal hashed m_qgilkbuc Lnet/minecraft/unmapped/C_dcgyuvyc;m_qgilkbuc(III)Lnet/minecraft/unmapped/C_dfzwsdmo;}
-    * @mapping {@literal named m_qgilkbuc Lnet/minecraft/entity/ai/pathing/WaterPathNodeMaker;m_qgilkbuc(III)Lnet/minecraft/entity/ai/pathing/PathNode;}
+    * @mapping {@literal named findUsableNode Lnet/minecraft/entity/ai/pathing/WaterPathNodeMaker;findUsableNode(III)Lnet/minecraft/entity/ai/pathing/PathNode;}
     */
    @Nullable
-   protected PathNode m_qgilkbuc(int x, int y, int z) {
+   protected PathNode findUsableNode(int x, int y, int z) {
       PathNode lv = null;
-      PathNodeType lv2 = this.m_ulwsbsmz(x, y, z);
+      PathNodeType lv2 = this.getNodeType(x, y, z);
       if (this.canJumpOutOfWater && lv2 == PathNodeType.BREACH || lv2 == PathNodeType.WATER) {
          float f = this.entity.getPenalty(lv2);
          if (f >= 0.0F) {
             lv = this.getNode(x, y, z);
-            lv.f_lzpxpqin = lv2;
+            lv.type = lv2;
             lv.penalty = Math.max(lv.penalty, f);
-            if (this.f_jffuufhn.m_pbrulfze().getFluidState(new BlockPos(x, y, z)).isEmpty()) {
+            if (this.context.getWorld().getFluidState(new BlockPos(x, y, z)).isEmpty()) {
                lv.penalty += 8.0F;
             }
          }
@@ -146,32 +145,32 @@
 
    /**
     * @mapping {@literal hashed m_ulwsbsmz Lnet/minecraft/unmapped/C_dcgyuvyc;m_ulwsbsmz(III)Lnet/minecraft/unmapped/C_hahxxnjs;}
-    * @mapping {@literal named m_ulwsbsmz Lnet/minecraft/entity/ai/pathing/WaterPathNodeMaker;m_ulwsbsmz(III)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
+    * @mapping {@literal named getNodeType Lnet/minecraft/entity/ai/pathing/WaterPathNodeMaker;getNodeType(III)Lnet/minecraft/entity/ai/pathing/PathNodeType;}
     */
-   protected PathNodeType m_ulwsbsmz(int x, int y, int z) {
+   protected PathNodeType getNodeType(int x, int y, int z) {
       return this.nodeTypesByPosCache
-         .computeIfAbsent(BlockPos.asLong(x, y, z), (Long2ObjectFunction<? extends PathNodeType>)(l -> this.m_amhxcrvm(this.f_jffuufhn, x, y, z)));
+         .computeIfAbsent(BlockPos.asLong(x, y, z), (Long2ObjectFunction<? extends PathNodeType>)(l -> this.getDefaultNodeType(this.context, x, y, z)));
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public PathNodeType m_amhxcrvm(C_amrnepho arg, int i, int j, int k) {
-      return this.m_aquikxzw(arg, i, j, k, this.entity);
+   public PathNodeType getDefaultNodeType(PathContext context, int x, int y, int z) {
+      return this.getNodeType(context, x, y, z, this.entity);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public PathNodeType m_aquikxzw(C_amrnepho arg, int i, int j, int k, MobEntity arg2) {
+   public PathNodeType getNodeType(PathContext context, int x, int y, int z, MobEntity entity) {
       BlockPos.Mutable lv = new BlockPos.Mutable();
 
-      for (int l = i; l < i + this.entityBlockXSize; l++) {
-         for (int m = j; m < j + this.entityBlockYSize; m++) {
-            for (int n = k; n < k + this.entityBlockZSize; n++) {
-               BlockState lv2 = arg.m_mdeqgtet(lv.set(l, m, n));
+      for (int l = x; l < x + this.entityBlockXSize; l++) {
+         for (int m = y; m < y + this.entityBlockYSize; m++) {
+            for (int n = z; n < z + this.entityBlockZSize; n++) {
+               BlockState lv2 = context.getBlockState(lv.set(l, m, n));
                FluidState lv3 = lv2.getFluidState();
                if (lv3.isEmpty() && lv2.canPathfindThrough(NavigationType.WATER) && lv2.isAir()) {
                   return PathNodeType.BREACH;
@@ -184,7 +183,7 @@
          }
       }
 
-      BlockState lv4 = arg.m_mdeqgtet(lv);
+      BlockState lv4 = context.getBlockState(lv);
       return lv4.canPathfindThrough(NavigationType.WATER) ? PathNodeType.WATER : PathNodeType.BLOCKED;
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/EntityType.java namedSrc/net/minecraft/entity/EntityType.java
--- namedTargetSrc/net/minecraft/entity/EntityType.java	2024-03-21 03:32:24.699862329 +0000
+++ namedSrc/net/minecraft/entity/EntityType.java	2024-03-21 03:31:15.231948761 +0000
@@ -1963,7 +1963,7 @@
       if (this.canSpawnInside.contains(state.getBlock())) {
          return false;
       } else {
-         return !this.fireImmune && PathNodeMaker.m_ccdrwtxl(state)
+         return !this.fireImmune && PathNodeMaker.inflictsFireDamage(state)
             ? true
             : state.isOf(Blocks.WITHER_ROSE) || state.isOf(Blocks.SWEET_BERRY_BUSH) || state.isOf(Blocks.CACTUS) || state.isOf(Blocks.POWDER_SNOW);
       }
diff -bur namedTargetSrc/net/minecraft/entity/mob/HoglinBrain.java namedSrc/net/minecraft/entity/mob/HoglinBrain.java
--- namedTargetSrc/net/minecraft/entity/mob/HoglinBrain.java	2024-03-21 03:32:24.823862225 +0000
+++ namedSrc/net/minecraft/entity/mob/HoglinBrain.java	2024-03-21 03:31:15.423948518 +0000
@@ -23,6 +23,7 @@
 import net.minecraft.entity.ai.brain.task.RandomTask;
 import net.minecraft.entity.ai.brain.task.RangedApproachTask;
 import net.minecraft.entity.ai.brain.task.StrollTask;
+import net.minecraft.entity.ai.brain.task.TaskBuilder;
 import net.minecraft.entity.ai.brain.task.UpdateAttackTargetTask;
 import net.minecraft.entity.ai.brain.task.WaitTask;
 import net.minecraft.entity.ai.brain.task.WalkTowardClosestAdultTask;
@@ -31,7 +32,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.unmapped.C_lygsomtd;
-import net.minecraft.unmapped.C_rcqaryar;
 import net.minecraft.util.TimeHelper;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.int_provider.UniformIntProvider;
@@ -153,7 +153,7 @@
             new BreedTask(EntityType.HOGLIN, 0.6F, 2),
             GoToRememberedPositionTask.toBlock(MemoryModuleType.NEAREST_REPELLENT, 1.0F, 8, true),
             UpdateAttackTargetTask.m_cstouyov(HoglinBrain::getNearestVisibleTargetablePlayer),
-            C_rcqaryar.m_ipranrme(HoglinEntity::isAdult, GoToRememberedPositionTask.toEntity(MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLIN, 0.4F, 8, false)),
+            TaskBuilder.m_ipranrme(HoglinEntity::isAdult, GoToRememberedPositionTask.toEntity(MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLIN, 0.4F, 8, false)),
             C_lygsomtd.m_ouvkkubu(8.0F, UniformIntProvider.create(30, 60)),
             WalkTowardClosestAdultTask.m_ngwtqsza(WALK_TOWARD_CLOSEST_ADULT_RANGE, 0.6F),
             makeRandomWalkTask()
@@ -173,8 +173,8 @@
             PacifyTask.m_dlfrarsr(MemoryModuleType.NEAREST_REPELLENT, 200),
             new BreedTask(EntityType.HOGLIN, 0.6F, 2),
             RangedApproachTask.m_lybdhlji(1.0F),
-            C_rcqaryar.m_ipranrme(HoglinEntity::isAdult, MeleeAttackTask.m_bsseqsar(40)),
-            C_rcqaryar.m_ipranrme(PassiveEntity::isBaby, MeleeAttackTask.m_bsseqsar(15)),
+            TaskBuilder.m_ipranrme(HoglinEntity::isAdult, MeleeAttackTask.m_bsseqsar(40)),
+            TaskBuilder.m_ipranrme(PassiveEntity::isBaby, MeleeAttackTask.m_bsseqsar(15)),
             ForgetAttackTargetTask.run(),
             ForgetTask.run(HoglinBrain::hasBreedTarget, MemoryModuleType.ATTACK_TARGET)
          ),


The remaining diff is too long!

Please sign in to comment.