From 4f644dfdb49b65d00d56355567d2c08602539321 Mon Sep 17 00:00:00 2001 From: granny Date: Tue, 3 Dec 2024 20:28:19 -0800 Subject: [PATCH] apply generated api patches --- .../0001-Ridables.patch | 2 +- ...2-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch | 2 +- ...3-Add-option-to-disable-zombie-aggressiveness-towards-.patch | 2 +- .../0004-Rabid-Wolf-API.patch | 2 +- .../0005-Iron-golem-poppy-calms-anger.patch | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename patches/{unapplied-generated-api => generated-api}/0001-Ridables.patch (92%) rename patches/{unapplied-generated-api => generated-api}/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch (92%) rename patches/{unapplied-generated-api => generated-api}/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch (92%) rename patches/{unapplied-generated-api => generated-api}/0004-Rabid-Wolf-API.patch (91%) rename patches/{unapplied-generated-api => generated-api}/0005-Iron-golem-poppy-calms-anger.patch (92%) diff --git a/patches/unapplied-generated-api/0001-Ridables.patch b/patches/generated-api/0001-Ridables.patch similarity index 92% rename from patches/unapplied-generated-api/0001-Ridables.patch rename to patches/generated-api/0001-Ridables.patch index 1f5c1512d..4552c2066 100644 --- a/patches/unapplied-generated-api/0001-Ridables.patch +++ b/patches/generated-api/0001-Ridables.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ridables diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java -index 35dfd25f21ca67b7f4d69326500980f4a021ef49..cd76656694067b333152ac46bc6a40ad8d28d2ac 100644 +index f15a7b4471cd31a487467ec7ecf7a186fa887a51..9b9eb256c4f17693e717e87e62a2e61b928f073a 100644 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java @@ -441,6 +441,12 @@ public interface VanillaGoal extends Goal { 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 92% 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 0bcffe627..61152fef7 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,7 +5,7 @@ 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 cd76656694067b333152ac46bc6a40ad8d28d2ac..d3b12268a01b0181b340175757c8b7f657540e94 100644 +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 extends Goal { 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 92% 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 dd360f3a2..b77789f97 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,7 +6,7 @@ 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 d3b12268a01b0181b340175757c8b7f657540e94..79de9f1ab1e709d1402d3a8017cc729b7fffc961 100644 +index 33eed1c791eeaeb4eba538d32ce8516c5d5fc6c0..9ef2111b60ace1a088c8c3d4707b26c06f14037c 100644 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java @@ -447,6 +447,8 @@ public interface VanillaGoal extends Goal { diff --git a/patches/unapplied-generated-api/0004-Rabid-Wolf-API.patch b/patches/generated-api/0004-Rabid-Wolf-API.patch similarity index 91% rename from patches/unapplied-generated-api/0004-Rabid-Wolf-API.patch rename to patches/generated-api/0004-Rabid-Wolf-API.patch index 616e58886..5096e181a 100644 --- a/patches/unapplied-generated-api/0004-Rabid-Wolf-API.patch +++ b/patches/generated-api/0004-Rabid-Wolf-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Rabid Wolf API diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java -index 79de9f1ab1e709d1402d3a8017cc729b7fffc961..e8b22b5ea11671d847a2e243ce570afd4ecb8aca 100644 +index 9ef2111b60ace1a088c8c3d4707b26c06f14037c..6eea8fbe575c4570c2b760c9828f8ec5b81c7202 100644 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java @@ -449,6 +449,7 @@ public interface VanillaGoal extends Goal { 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 92% 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 72f6aef36..bae54e389 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,7 +5,7 @@ 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 e8b22b5ea11671d847a2e243ce570afd4ecb8aca..a9816fbfa466b3fe3f82c19aeeeb564c660e4b6a 100644 +index 6eea8fbe575c4570c2b760c9828f8ec5b81c7202..e7795889133063ac165d5b4783ddcbcbb442f189 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 {