From 62d07882c69072bcbfa91c0ab2f27d061c5d6ecd Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Thu, 9 Jan 2025 23:58:08 -0800
Subject: [PATCH] port missing phantom crystal goals for generated api

---
 ...ed-to-crystals-and-crystals-shoot-ph.patch | 19 -------------------
 .../paper/entity/ai/VanillaGoal.java.patch    |  6 +++++-
 2 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 patches/generated-api/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

diff --git a/patches/generated-api/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/generated-api/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
deleted file mode 100644
index 61152fef7..000000000
--- a/patches/generated-api/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sun, 28 Jun 2020 21:50:55 -0500
-Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
-
-
-diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 9b9eb256c4f17693e717e87e62a2e61b928f073a..33eed1c791eeaeb4eba538d32ce8516c5d5fc6c0 100644
---- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-+++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -445,6 +445,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
-     GoalKey<Mob> MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider"));
-     GoalKey<AbstractHorse> HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider"));
-     GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
-+    GoalKey<Phantom> FIND_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("find_crystal"));
-+    GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
-     // Purpur end
- 
-     private static <T extends Mob> GoalKey<T> create(final String key, final Class<T> type) {
diff --git a/purpur-api-generator/paper-patches/files/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java.patch b/purpur-api-generator/paper-patches/files/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java.patch
index 3cdd63c72..b8521196f 100644
--- a/purpur-api-generator/paper-patches/files/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java.patch
+++ b/purpur-api-generator/paper-patches/files/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java.patch
@@ -1,6 +1,6 @@
 --- a/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -441,6 +_,12 @@
+@@ -441,6 +_,16 @@
  
      GoalKey<Zombie> ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class);
  
@@ -9,6 +9,10 @@
 +    GoalKey<AbstractHorse> HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider"));
 +    GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
 +    // Purpur end - Ridables
++    // Purpur start - Phantoms attracted to crystals and crystals shoot phantoms
++    GoalKey<Phantom> FIND_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("find_crystal"));
++    GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
++    // Purpur end - Phantoms attracted to crystals and crystals shoot phantoms
 +
      private static <T extends Mob> GoalKey<T> create(final String key, final Class<T> type) {
          return GoalKey.of(type, NamespacedKey.minecraft(key));