Revert AI goal selector to vanilla behavior (#458)

* Revert AI goal selector to vanilla behavior

* remove config

* Remove config & Update patch comments

* rename

* re apply

build-data/leaf.at

@@ -1,8 +1,6 @@
 # This file is auto generated, any changes may be overridden!
 # See CONTRIBUTING.md on how to add access transformers.
 protected net.minecraft.world.entity.Entity dimensions
-protected net.minecraft.world.entity.ai.goal.RemoveBlockGoal blockToRemove
-protected net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal getTargetConditions()Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;
 protected-f net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase$Cache largeCollisionShape
 public net.minecraft.core.Direction VALUES
 public net.minecraft.server.level.ServerChunkCache fullChunks

leaf-archived-patches/removed/1.21.8/mcserver/0093-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch

@@ -3,6 +3,8 @@ From: Kevin Raneri <kevin.raneri@gmail.com>
 Date: Sat, 11 Dec 2021 22:20:45 -0500
 Subject: [PATCH] Pufferfish: Throttle goal selector during inactive ticking
 
+Removed since Leaf 1.21.8, no need
+
 Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 

leaf-archived-patches/removed/1.21.8/mcserver/0227-Async-target-finding.patch

@@ -3,6 +3,7 @@ From: Taiyou06 <kaandindar21@gmail.com>
 Date: Sat, 29 Mar 2025 13:40:46 +0100
 Subject: [PATCH] Async target finding
 
+Removed since Leaf 1.21.8, no need
 
 diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java
 index fee4a7452178c274eb835d758b718d8e874d79d0..9a2539e1fe2cee30066634ef47a991fa5837a5e4 100644

leaf-server/minecraft-patches/features/0092-Pufferfish-Dynamic-Activation-of-Brain.patch

@@ -3,8 +3,6 @@ From: Paul Sauve <paul@technove.co>
 Date: Fri, 15 Jan 2021 19:05:01 -0600
 Subject: [PATCH] Pufferfish: Dynamic Activation of Brain
 
-Dreeam TODO: waiting Paper dealing with the newGoalRate
-
 Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
@@ -109,38 +107,6 @@ index 96e1f8f40a0af4350155f192ac2126b523c9f0f5..388689c44cf63ade939e271d490051c9
      private final String descriptionId;
      @Nullable
      private Component description;
-diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
-index 37c6567701fe10011a364b8def9ebf3391376592..cb045fce223482be345066b4fe796341667e8023 100644
---- a/net/minecraft/world/entity/Mob.java
-+++ b/net/minecraft/world/entity/Mob.java
-@@ -209,10 +209,10 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
-     @Override
-     public void inactiveTick() {
-         super.inactiveTick();
--        if (this.goalSelector.inactiveTick()) {
-+        if (this.goalSelector.inactiveTick(this.activatedPriority, true)) { // Pufferfish - pass activated priroity
-             this.goalSelector.tick();
-         }
--        if (this.targetSelector.inactiveTick()) {
-+        if (this.targetSelector.inactiveTick(this.activatedPriority, true)) { // Pufferfish - pass activated priority
-             this.targetSelector.tick();
-         }
-     }
-@@ -747,10 +747,14 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
-         this.sensing.tick();
-         int i = this.tickCount + this.getId();
-         if (i % 2 != 0 && this.tickCount > 1) {
-+            if (this.targetSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
-             this.targetSelector.tickRunningGoals(false);
-+            if (this.goalSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
-             this.goalSelector.tickRunningGoals(false);
-         } else {
-+            if (this.targetSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
-             this.targetSelector.tick();
-+            if (this.goalSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
-             this.goalSelector.tick();
-         }
- 
 diff --git a/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java b/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java
 index f6c673b1abe53afcb14fd68d590431027ed29f67..21deb221b87ecb70c8a0dc963ab79124b26ac930 100644
 --- a/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java
@@ -158,26 +124,6 @@ index f6c673b1abe53afcb14fd68d590431027ed29f67..21deb221b87ecb70c8a0dc963ab79124
              owner.spawnGolemIfNeeded(level, gameTime, 3);
          }
      }
-diff --git a/net/minecraft/world/entity/ai/goal/GoalSelector.java b/net/minecraft/world/entity/ai/goal/GoalSelector.java
-index 653c58c7637c46c8b46a5082f671324a2221d431..55f1c138039b80894f655d180192f5cb95e32778 100644
---- a/net/minecraft/world/entity/ai/goal/GoalSelector.java
-+++ b/net/minecraft/world/entity/ai/goal/GoalSelector.java
-@@ -34,9 +34,13 @@ public class GoalSelector {
-     }
- 
-     // Paper start - EAR 2
--    public boolean inactiveTick() {
-+    public boolean inactiveTick(int tickRate, boolean inactive) { // Pufferfish start
-+        if (inactive && !org.dreeam.leaf.config.modules.opt.DynamicActivationofBrain.enabled) tickRate = 4; // reset to Paper's
-+        tickRate = Math.min(tickRate, 3); // Dreeam TODO - Waiting Paper
-         this.curRate++;
--        return this.curRate % 3 == 0; // TODO newGoalRate was already unused in 1.20.4, check if this is correct
-+        //return this.curRate % 3 == 0; // TODO newGoalRate was already unused in 1.20.4, check if this is correct
-+        return this.curRate % tickRate == 0;
-+        // Pufferfish end
-     }
- 
-     public boolean hasTasks() {
 diff --git a/net/minecraft/world/entity/animal/allay/Allay.java b/net/minecraft/world/entity/animal/allay/Allay.java
 index de3bf0b62371f06ecb5d2035638e352ca0c06182..69500fa0b207fc3d5b1bc2bd665fa39f6725d23d 100644
 --- a/net/minecraft/world/entity/animal/allay/Allay.java

leaf-server/minecraft-patches/features/0093-Purpur-Server-Minecraft-Changes.patch

@@ -2673,7 +2673,7 @@ index da46c16d9ce8c66ce02133d74b2a41f375398528..d79bb361783082ec2aaafdc1b2e6bb4d
          return slot != EquipmentSlot.HEAD && slot != EquipmentSlot.MAINHAND && slot != EquipmentSlot.OFFHAND
              ? SlotAccess.forEquipmentSlot(entity, slot, itemStack -> itemStack.isEmpty() || entity.getEquipmentSlotForItem(itemStack) == slot)
 diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
-index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f015807fc6484b 100644
+index 37c6567701fe10011a364b8def9ebf3391376592..706bdb81f831ee79afb8c32feba1a13bdac59c66 100644
 --- a/net/minecraft/world/entity/Mob.java
 +++ b/net/minecraft/world/entity/Mob.java
 @@ -138,13 +138,14 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -2693,7 +2693,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580
          this.jumpControl = new JumpControl(this);
          this.bodyRotationControl = this.createBodyControl();
          this.navigation = this.createNavigation(level);
-@@ -285,6 +286,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -283,6 +284,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
                  target = null;
              }
          }
@@ -2701,7 +2701,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580
          this.target = target;
          return true;
          // CraftBukkit end
-@@ -324,8 +326,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -322,8 +324,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              this.resetAmbientSoundTime();
              this.playAmbientSound();
          }
@@ -2730,7 +2730,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580
      @Override
      protected void playHurtSound(DamageSource source) {
          this.resetAmbientSoundTime();
-@@ -429,6 +451,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -427,6 +449,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              output.putString("Paper.DespawnInPeacefulOverride", this.despawnInPeacefulOverride.name());
          }
          // Paper end - allow changing despawnInPeaceful
@@ -2738,7 +2738,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580
      }
  
      @Override
-@@ -457,6 +480,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -455,6 +478,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
          this.setNoAi(input.getBooleanOr("NoAI", false));
          this.aware = input.getBooleanOr("Bukkit.Aware", true); // CraftBukkit
          this.despawnInPeacefulOverride = input.read("Paper.DespawnInPeacefulOverride", io.papermc.paper.util.PaperCodecs.TRI_STATE_CODEC).orElse(net.kyori.adventure.util.TriState.NOT_SET); // Paper - allow changing despawnInPeaceful
@@ -2746,7 +2746,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580
      }
  
      @Override
-@@ -509,7 +533,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -507,7 +531,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              && this.canPickUpLoot()
              && this.isAlive()
              && !this.dead
@@ -2755,7 +2755,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580
              Vec3i pickupReach = this.getPickupReach();
  
              for (ItemEntity itemEntity : this.level()
-@@ -1176,7 +1200,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1170,7 +1194,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              );
          }
  
@@ -2764,7 +2764,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580
          return spawnGroupData;
      }
  
-@@ -1264,7 +1288,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1258,7 +1282,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
      }
  
      protected InteractionResult mobInteract(Player player, InteractionHand hand) {
@@ -2773,7 +2773,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580
      }
  
      public boolean isWithinHome() {
-@@ -1513,6 +1537,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1507,6 +1531,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              this.playAttackSound();
          }
  
@@ -2781,7 +2781,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580
          return flag;
      }
  
-@@ -1524,26 +1549,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1518,26 +1543,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
      private net.minecraft.world.phys.Vec3 cached_position;
      // Gale end - JettPack - optimize sun burn tick - cache eye blockpos
      public boolean isSunBurnTick() {
@@ -2810,7 +2810,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580
      }
  
      @Override
-@@ -1591,4 +1598,58 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1585,4 +1592,58 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              this.getNavigation().updatePathfinderMaxVisitedNodes();
          }
      }

leaf-server/minecraft-patches/features/0094-Fix-Pufferfish-and-Purpur-patches.patch

@@ -78,7 +78,7 @@ index 2c7f35ec3276f420875cf52596ada42b25fe64c8..a0941c15a9391f85af9fcb3784c66514
                  this.disconnectAsync(Component.literal("Book too large!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause // Paper - add proper async disconnect
                  return;
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 53a0d464c1eb68ee2eff7f93c5c745ee4667093a..e0615ffe3e5cd317e5f05e167dbc857d5abaf50f 100644
+index 98f9a1378c6cef93adb431730972d6b05c14b121..4a1cfd5247073bd57f88151425ea1c866d971c4d 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -543,23 +543,36 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -150,10 +150,10 @@ index d79bb361783082ec2aaafdc1b2e6bb4d51813666..f712d4445d8ffdc8dbd5f51c2a8104b0
              }
              // Purpur end - Mob head visibility percent
 diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
-index 702722bf42bbd0746e12d3a967f015807fc6484b..6aed8d7c737a35943718535226cedd65f86d3b3c 100644
+index 706bdb81f831ee79afb8c32feba1a13bdac59c66..26db3eb9dfc3d9c0c7efa4cf25827f15c37a7775 100644
 --- a/net/minecraft/world/entity/Mob.java
 +++ b/net/minecraft/world/entity/Mob.java
-@@ -1544,10 +1544,6 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1538,10 +1538,6 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
      protected void playAttackSound() {
      }
  
@@ -293,7 +293,7 @@ index fb58af763cf75c80703360a5c668168775b1458c..e442784741f1d0b4892284b6811343f9
          PiglinAi.updateActivity(this);
          super.customServerAiStep(level);
 diff --git a/net/minecraft/world/entity/projectile/Projectile.java b/net/minecraft/world/entity/projectile/Projectile.java
-index ef960ee83adbb5e3ebfa44cd2457b23718045f61..e53c18efb573dea39a3d45f3cdb827d73b901ab6 100644
+index 5daa37fc0e44d3c4f3755ec3d3d89213f6670de1..c98a15653e388e7d8301ac4f6baa11095b7b18cc 100644
 --- a/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/net/minecraft/world/entity/projectile/Projectile.java
 @@ -82,7 +82,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {

leaf-server/minecraft-patches/features/0107-Leaves-Protocol-Core.patch

@@ -50,7 +50,7 @@ index 7b4437c06c2ede0be7dd58b42863e88b4b205106..73c63330b67b3d16ceebc644ce177980
              this.tickables.get(i).run();
          }
 diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index ca9ba2a2535eab66622230778efdf941f540f6d2..fa6095200243fafa796e49df3930c6d7ab2dcd84 100644
+index 9af8f731bd583c46b93336b635ba9a5cea7e1ff3..82c22ca54cc7c8371b744c93f133dfc2b798195b 100644
 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -64,6 +64,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack

leaf-server/minecraft-patches/features/0112-Petal-Async-Pathfinding.patch

@@ -19,10 +19,10 @@ This patch was ported downstream from the Petal fork.
 Makes most pathfinding-related work happen asynchronously
 
 diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
-index 6aed8d7c737a35943718535226cedd65f86d3b3c..ec50760ec81728a0b8ab8d691ed65ba6d25d32f9 100644
+index 26db3eb9dfc3d9c0c7efa4cf25827f15c37a7775..e5a93f7256d904a3401a68ca8ad5962d92ed67f3 100644
 --- a/net/minecraft/world/entity/Mob.java
 +++ b/net/minecraft/world/entity/Mob.java
-@@ -247,6 +247,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -245,6 +245,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
      @Nullable
      @Override
      public LivingEntity getTarget() {

leaf-server/minecraft-patches/features/0131-Mirai-Configurable-chat-message-signatures.patch

@@ -103,7 +103,7 @@ index 87fc8861948b50361ec04c5a23406d3abdec6eac..77f11179836636424927843f5f10c3fd
          // Paper start - Add setting for proxy online mode status
          return properties.enforceSecureProfile
 diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index fa6095200243fafa796e49df3930c6d7ab2dcd84..84030c40f2f91b433b3ccd21e0367d2f8b7c97b6 100644
+index 82c22ca54cc7c8371b744c93f133dfc2b798195b..6b73679351f786362daf988b02b2a226d6b43984 100644
 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -363,10 +363,30 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack

leaf-server/minecraft-patches/features/0134-Faster-random-generator.patch

@@ -97,7 +97,7 @@ index 8516d47b0ba79d91638837199e7ae0fb6cb44a79..4f4b55dd099dd2c2fea118b18b535881
      RandomSource fork();
  
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index e0615ffe3e5cd317e5f05e167dbc857d5abaf50f..c44cc7107ff6cf1fd72e222773847deddf05e61c 100644
+index 4a1cfd5247073bd57f88151425ea1c866d971c4d..d544d66542d53db1a847a6b1ab8cf5ee848f31de 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -155,7 +155,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

leaf-server/minecraft-patches/features/0162-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch

@@ -8,10 +8,10 @@ Original project: https://github.com/PaperMC/Paper
 Paper pull request: https://github.com/PaperMC/Paper/pull/10990
 
 diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
-index ec50760ec81728a0b8ab8d691ed65ba6d25d32f9..b22960f06f92ef4d9d12ab5b3891363534567a29 100644
+index e5a93f7256d904a3401a68ca8ad5962d92ed67f3..751c8c17c3c2968fad358ae8807eaca54de82a34 100644
 --- a/net/minecraft/world/entity/Mob.java
 +++ b/net/minecraft/world/entity/Mob.java
-@@ -211,6 +211,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -210,6 +210,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
      @Override
      public void inactiveTick() {
          super.inactiveTick();
@@ -20,9 +20,9 @@ index ec50760ec81728a0b8ab8d691ed65ba6d25d32f9..b22960f06f92ef4d9d12ab5b38913635
 +            return;
 +        }
 +        // Paper PR end - Skip AI during inactive ticks for non-aware mobs
-         boolean isThrottled = org.dreeam.leaf.config.modules.opt.ThrottleInactiveGoalSelectorTick.enabled && _pufferfish_inactiveTickDisableCounter++ % 20 != 0; // Pufferfish - throttle inactive goal selector ticking
-         if (this.goalSelector.inactiveTick(this.activatedPriority, true) && !isThrottled) { // Pufferfish - pass activated priroity // Pufferfish - throttle inactive goal selector ticking
+         if (this.goalSelector.inactiveTick()) {
              this.goalSelector.tick();
+         }
 diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
 index 014bb5b6e82bb11b756430999522f4b8f9356d9f..e6a750ab472eba53de1e5f9e2f507f3a0a9d94d4 100644
 --- a/net/minecraft/world/entity/npc/Villager.java

leaf-server/minecraft-patches/features/0173-Optimize-Entity-distanceToSqr.patch

@@ -8,7 +8,7 @@ avoids multiple casting in Entity#distanceTo, using Math#sqrt directly instead o
 these methods more able to be inlined by the JIT compiler.
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index c44cc7107ff6cf1fd72e222773847deddf05e61c..beb84756c7f875e24ae1561a75db88c001595e58 100644
+index d544d66542d53db1a847a6b1ab8cf5ee848f31de..e563b636a05a299d860a334987594dbd5c7d3511 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -394,6 +394,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess