Update to 1.18.2

patches/api/0001-Pufferfish-API-Changes.patch

@@ -3,27 +3,12 @@ From: Kevin Raneri <kevin.raneri@gmail.com>
 Date: Tue, 9 Nov 2021 14:01:56 -0500
 Subject: [PATCH] Pufferfish API Changes
 
-Pufferfish
-Copyright (C) 2022 Pufferfish Studios LLC
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 001c2b963205012f340db0d539e4033c748124ce..93390eaead78d229902df0f7c8f9b30cb6174de7 100644
+index b71c38473c3a9fddbb26dcc06df0c1adcdc871f6..20df1ad509f2b5d6204d3ff550af0078a7268537 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -40,6 +40,7 @@ dependencies {
+@@ -41,6 +41,7 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-serializer-plain")
      api("org.apache.logging.log4j:log4j-api:2.17.1")
      api("org.slf4j:slf4j-api:1.8.0-beta4")
@@ -31,7 +16,7 @@ index 001c2b963205012f340db0d539e4033c748124ce..93390eaead78d229902df0f7c8f9b30c
  
      implementation("org.ow2.asm:asm:9.2")
      implementation("org.ow2.asm:asm-commons:9.2")
-@@ -81,6 +82,13 @@ val generateApiVersioningFile by tasks.registering {
+@@ -82,6 +83,13 @@ val generateApiVersioningFile by tasks.registering {
      }
  }
  

patches/api/0003-Build-System-Changes.patch

@@ -6,14 +6,14 @@ Subject: [PATCH] Build System Changes
 todo: merge with rebrand patch
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 554f5e35954f35aecaf454853a0a2999f15d19bc..9203d7aa155319abfab0a65d4ef6804cb7e48769 100644
+index 20df1ad509f2b5d6204d3ff550af0078a7268537..3004506c52b8869dd87bd722065d7d19a1c6c274 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -41,6 +41,7 @@ dependencies {
-     api("org.apache.logging.log4j:log4j-api:2.17.1")
-     api("org.slf4j:slf4j-api:1.8.0-beta4")
-     api("io.sentry:sentry:5.4.0") // Pufferfish
-+    api("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") // Purpur
+@@ -102,6 +102,7 @@ tasks.jar {
+ }
  
-     implementation("org.ow2.asm:asm:9.2")
-     implementation("org.ow2.asm:asm-commons:9.2")
+ tasks.withType<Javadoc> {
++    (options as StandardJavadocDocletOptions).addStringOption("-add-modules", "jdk.incubator.vector") // Purpur - our javadocs need this for pufferfish's SIMD patch
+     val options = options as StandardJavadocDocletOptions
+     options.overview = "src/main/javadoc/overview.html"
+     options.isDocFilesSubDirs = true

patches/api/0007-Ridables.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Ridables
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 2405254739a83b2fb517da7fa4ea0721c68f9f6d..dc0535d5ea5b2f4002a428ec64ea52fefbace7c4 100644
+index 8fd399f791b45eb7fc62693ca954eea0c68e2881..22705359d5b3b1af522ff5575c07ca5e20fac255 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -197,6 +197,12 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
-     GoalKey<Raider> RAIDER_MOVE_THROUGH_VILLAGE = GoalKey.of(Raider.class, NamespacedKey.minecraft("raider_move_through_village"));
-     GoalKey<Creature> PARROT_WANDER = GoalKey.of(Creature.class, NamespacedKey.minecraft("parrot_wander"));
+@@ -199,6 +199,12 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+     GoalKey<Mob> CLIMB_ON_TOP_OF_POWDER_SNOW = GoalKey.of(Mob.class, NamespacedKey.minecraft("climb_on_top_of_powder_snow"));
+     GoalKey<Wolf> WOLF_PANIC = GoalKey.of(Wolf.class, NamespacedKey.minecraft("wolf_panic"));
  
 +    // Purpur start
 +    GoalKey<Mob> MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider"));

patches/api/0020-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/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index dc0535d5ea5b2f4002a428ec64ea52fefbace7c4..25a45c8462e3b3accca81ed8d92c1072e3589368 100644
+index 22705359d5b3b1af522ff5575c07ca5e20fac255..ba4587a434d40fae7aeff655c1cd4cd3346d496a 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -201,6 +201,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+@@ -203,6 +203,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"));

patches/api/0021-ChatColor-conveniences.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] ChatColor conveniences
 
 
 diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
-index 4594701d77c5d0f744bece871b98d9f6f73eb5a7..a991bfe33f695a6166be6937039098ddea892f7b 100644
+index 4594701d77c5d0f744bece871b98d9f6f73eb5a7..924af5982b1990492cafe6ef8d9f284f7933e7c4 100644
 --- a/src/main/java/org/bukkit/ChatColor.java
 +++ b/src/main/java/org/bukkit/ChatColor.java
 @@ -2,6 +2,7 @@ package org.bukkit;
@@ -62,7 +62,7 @@ index 4594701d77c5d0f744bece871b98d9f6f73eb5a7..a991bfe33f695a6166be6937039098dd
 +
 +    @NotNull
 +    public static net.kyori.adventure.text.Component parseMM(@NotNull String string, @Nullable Object... args) {
-+        return net.kyori.adventure.text.minimessage.MiniMessage.get().parse(String.format(string, args));
++        return net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(String.format(string, args));
 +    }
 +
 +    @Deprecated

patches/api/0025-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/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 25a45c8462e3b3accca81ed8d92c1072e3589368..246e89e2d23cb049254611db223f34bde970d84b 100644
+index ba4587a434d40fae7aeff655c1cd4cd3346d496a..2a8c6da0f9ffa1f94cfd37d1068511c8941d27ce 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -203,6 +203,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+@@ -205,6 +205,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
      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"));

patches/api/0028-Rabid-Wolf-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Rabid Wolf API
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 246e89e2d23cb049254611db223f34bde970d84b..06dfb076431aff4d87dd4f587d42087e54b2382b 100644
+index 2a8c6da0f9ffa1f94cfd37d1068511c8941d27ce..aa0a081819672c14d9f04c07f4685768cbe8d914 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -205,6 +205,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+@@ -207,6 +207,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
      GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
      GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
      GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));

patches/api/0035-Iron-golem-poppy-calms-anger.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Iron golem poppy calms anger
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 06dfb076431aff4d87dd4f587d42087e54b2382b..b3e4d10e54952be23ba3f4bcc374c24cff8b0ce2 100644
+index aa0a081819672c14d9f04c07f4685768cbe8d914..c18940f5c3b3436c19ca6ea466bc8a78579c795f 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -206,6 +206,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+@@ -208,6 +208,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
      GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
      GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
      GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));

patches/api/0048-Add-jdk-modules-for-javadocs-fixes-build.patch

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@Gmail.com>
-Date: Sat, 12 Feb 2022 06:33:47 -0600
-Subject: [PATCH] Add jdk modules for javadocs (fixes build)
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 9719d5af48dac1f75f72bfd34a6fe146bb4011bc..bac527acaa1826486a8183bcccb4d64654a0efed 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -102,6 +102,7 @@ tasks.jar {
- }
- 
- tasks.withType<Javadoc> {
-+    (options as StandardJavadocDocletOptions).addStringOption("-add-modules", "jdk.incubator.vector") // Purpur - our javadocs need this for pufferfish's SIMD patch
-     inputs.files(apiAndDocs)
-         .ignoreEmptyDirectories()
-         .withPropertyName(apiAndDocs.name + "-configuration")