From dedcdd053ddc1d62a170e32651bdd8181d7cda16 Mon Sep 17 00:00:00 2001 From: granny Date: Sun, 16 Jun 2024 00:15:43 -0700 Subject: [PATCH] re-add generated api patches --- .../0001-Ridables.patch | 10 +++++----- ...s-attracted-to-crystals-and-crystals-shoot-ph.patch | 6 +++--- ...ion-to-disable-zombie-aggressiveness-towards-.patch | 6 +++--- .../0004-Rabid-Wolf-API.patch | 6 +++--- .../0005-Iron-golem-poppy-calms-anger.patch | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) rename patches/{unapplied-generated-api => generated-api}/0001-Ridables.patch (71%) rename patches/{unapplied-generated-api => generated-api}/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch (80%) rename patches/{unapplied-generated-api => generated-api}/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch (81%) rename patches/{unapplied-generated-api => generated-api}/0004-Rabid-Wolf-API.patch (78%) rename patches/{unapplied-generated-api => generated-api}/0005-Iron-golem-poppy-calms-anger.patch (79%) diff --git a/patches/unapplied-generated-api/0001-Ridables.patch b/patches/generated-api/0001-Ridables.patch similarity index 71% rename from patches/unapplied-generated-api/0001-Ridables.patch rename to patches/generated-api/0001-Ridables.patch index 4a9d76ce8..30f2e6399 100644 --- a/patches/unapplied-generated-api/0001-Ridables.patch +++ b/patches/generated-api/0001-Ridables.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Ridables diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java -index 069f2668f5229b0368b796e65eef1648fba0a097..50dc058cd8ecade74be30c75907d07f349c4df87 100644 +index 3add91218dd3f07052aa932f0503d1f10ac3799b..fa119ead66390aaed9436fbbaf2abdcef71c4c64 100644 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java -@@ -442,6 +442,12 @@ public interface VanillaGoal extends Goal { +@@ -436,6 +436,12 @@ public interface VanillaGoal extends Goal { GoalKey ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class); @@ -18,6 +18,6 @@ index 069f2668f5229b0368b796e65eef1648fba0a097..50dc058cd8ecade74be30c75907d07f3 + GoalKey LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider")); + // Purpur end + - /** - * Removed in 1.20.2 - */ + private static @NotNull GoalKey create(final @NotNull String key, + final @NotNull Class type) { + return GoalKey.of(type, NamespacedKey.minecraft(key)); diff --git a/patches/unapplied-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 similarity index 80% rename from patches/unapplied-generated-api/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/generated-api/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index ddfb8fbce..66c56e9a2 100644 --- a/patches/unapplied-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 @@ -5,10 +5,10 @@ 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 50dc058cd8ecade74be30c75907d07f349c4df87..b3a1325786fffb1a585b3911c75c03d184e8a848 100644 +index fa119ead66390aaed9436fbbaf2abdcef71c4c64..596308b83ef30471d8ab60fdc6065480909d6271 100644 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java -@@ -446,6 +446,8 @@ public interface VanillaGoal extends Goal { +@@ -440,6 +440,8 @@ public interface VanillaGoal extends Goal { GoalKey MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider")); GoalKey HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider")); GoalKey LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider")); @@ -16,4 +16,4 @@ index 50dc058cd8ecade74be30c75907d07f349c4df87..b3a1325786fffb1a585b3911c75c03d1 + GoalKey ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal")); // Purpur end - /** + private static @NotNull GoalKey create(final @NotNull String key, diff --git a/patches/unapplied-generated-api/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/generated-api/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch similarity index 81% rename from patches/unapplied-generated-api/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch rename to patches/generated-api/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch index fef774bc6..7bc257362 100644 --- a/patches/unapplied-generated-api/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch +++ b/patches/generated-api/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java -index b3a1325786fffb1a585b3911c75c03d184e8a848..31c4d5da936f88e68c67c6e464b94563a47a0f34 100644 +index 596308b83ef30471d8ab60fdc6065480909d6271..3672800b18e0b54b32c1b691c59dc4d127213e48 100644 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java -@@ -448,6 +448,8 @@ public interface VanillaGoal extends Goal { +@@ -442,6 +442,8 @@ public interface VanillaGoal extends Goal { GoalKey LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider")); GoalKey FIND_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("find_crystal")); GoalKey ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal")); @@ -17,4 +17,4 @@ index b3a1325786fffb1a585b3911c75c03d184e8a848..31c4d5da936f88e68c67c6e464b94563 + GoalKey ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager")); // Purpur end - /** + private static @NotNull GoalKey create(final @NotNull String key, diff --git a/patches/unapplied-generated-api/0004-Rabid-Wolf-API.patch b/patches/generated-api/0004-Rabid-Wolf-API.patch similarity index 78% rename from patches/unapplied-generated-api/0004-Rabid-Wolf-API.patch rename to patches/generated-api/0004-Rabid-Wolf-API.patch index 82e3b3a72..88541f216 100644 --- a/patches/unapplied-generated-api/0004-Rabid-Wolf-API.patch +++ b/patches/generated-api/0004-Rabid-Wolf-API.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Rabid Wolf API diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java -index 31c4d5da936f88e68c67c6e464b94563a47a0f34..a41aa6c187d60373630eb803cb69d58b85eacc98 100644 +index 3672800b18e0b54b32c1b691c59dc4d127213e48..37da5e3ae1349c5406e7c700d9f6174657a807d5 100644 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java -@@ -450,6 +450,7 @@ public interface VanillaGoal extends Goal { +@@ -444,6 +444,7 @@ public interface VanillaGoal extends Goal { GoalKey ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal")); GoalKey DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager")); GoalKey ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager")); + GoalKey AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf")); // Purpur end - /** + private static @NotNull GoalKey create(final @NotNull String key, diff --git a/patches/unapplied-generated-api/0005-Iron-golem-poppy-calms-anger.patch b/patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch similarity index 79% rename from patches/unapplied-generated-api/0005-Iron-golem-poppy-calms-anger.patch rename to patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch index d85e4e893..4e024b250 100644 --- a/patches/unapplied-generated-api/0005-Iron-golem-poppy-calms-anger.patch +++ b/patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Iron golem poppy calms anger diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java -index a41aa6c187d60373630eb803cb69d58b85eacc98..9b991201a2f6cc9feccccf7f4e7bcded64117764 100644 +index 37da5e3ae1349c5406e7c700d9f6174657a807d5..3e41a4141095bce989c75e989293deb3f47e8e6d 100644 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java -@@ -451,6 +451,7 @@ public interface VanillaGoal extends Goal { +@@ -445,6 +445,7 @@ public interface VanillaGoal extends Goal { GoalKey DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager")); GoalKey ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager")); GoalKey AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf")); + GoalKey RECEIVE_FLOWER = GoalKey.of(IronGolem.class, NamespacedKey.minecraft("receive_flower")); // Purpur end - /** + private static @NotNull GoalKey create(final @NotNull String key,