From a235c77ce7a535f9ef16c44758f43b58c2547f55 Mon Sep 17 00:00:00 2001 From: Riley Park Date: Mon, 22 Feb 2021 02:52:30 -0800 Subject: [PATCH] Adventure 4.5.0 --- Spigot-API-Patches/0005-Adventure.patch | 23 ++++++++++++++----- .../0023-Use-ASM-for-event-executors.patch | 4 ++-- ...low-plugins-to-use-SLF4J-for-logging.patch | 4 ++-- .../0258-Better-AnnotationTest-printout.patch | 4 ++-- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/Spigot-API-Patches/0005-Adventure.patch b/Spigot-API-Patches/0005-Adventure.patch index 83772f2ecd..7526de36cf 100644 --- a/Spigot-API-Patches/0005-Adventure.patch +++ b/Spigot-API-Patches/0005-Adventure.patch @@ -7,33 +7,44 @@ Co-authored-by: zml Co-authored-by: Jake Potrebic diff --git a/pom.xml b/pom.xml -index 58fc279186e01a4703102227f387e96272fcf0a7..a6565a93848213a39694dc84be75aebcc327b1b8 100644 +index 58fc279186e01a4703102227f387e96272fcf0a7..2a73ac313919c671dd6b6eafd3caa5d44ac14dc1 100644 --- a/pom.xml +++ b/pom.xml -@@ -49,6 +49,28 @@ +@@ -48,7 +48,39 @@ + ++ ++ ++ ++ ++ net.kyori ++ adventure-bom ++ 4.5.0 ++ pom ++ import ++ ++ ++ ++ ++ + + + net.kyori + adventure-api -+ 4.4.0 + + + net.kyori + adventure-text-serializer-gson -+ 4.4.0 + + + net.kyori + adventure-text-serializer-legacy -+ 4.4.0 + + + net.kyori + adventure-text-serializer-plain -+ 4.4.0 + + diff --git a/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch index a90d0d9977..faf6580968 100644 --- a/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index a6565a93848213a39694dc84be75aebcc327b1b8..aa893ec821f7c54ecf430b4b95aa52ccbfebf898 100644 +index 2a73ac313919c671dd6b6eafd3caa5d44ac14dc1..c43d7d6ef8f8e60e027cde33efceeca6ce98d233 100644 --- a/pom.xml +++ b/pom.xml -@@ -150,6 +150,17 @@ +@@ -160,6 +160,17 @@ 9.0 test diff --git a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch index efe476bac5..1b7c7bc74b 100644 --- a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/pom.xml b/pom.xml -index aa893ec821f7c54ecf430b4b95aa52ccbfebf898..78d13b0487ea6876b19e07d186f273dedefda9bf 100644 +index c43d7d6ef8f8e60e027cde33efceeca6ce98d233..1b9b4349e303a17e96ce0a09e8776b6635092e57 100644 --- a/pom.xml +++ b/pom.xml -@@ -131,6 +131,13 @@ +@@ -141,6 +141,13 @@ 20.1.0 provided diff --git a/Spigot-API-Patches/0258-Better-AnnotationTest-printout.patch b/Spigot-API-Patches/0258-Better-AnnotationTest-printout.patch index 6e7648174c..1c2414d763 100644 --- a/Spigot-API-Patches/0258-Better-AnnotationTest-printout.patch +++ b/Spigot-API-Patches/0258-Better-AnnotationTest-printout.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Better AnnotationTest printout diff --git a/pom.xml b/pom.xml -index 78d13b0487ea6876b19e07d186f273dedefda9bf..5bc8dd2489d34c598f8079d13058eeb0a9b79713 100644 +index 1b9b4349e303a17e96ce0a09e8776b6635092e57..0d922ea17c675d6e3a7106937918d2a818814fba 100644 --- a/pom.xml +++ b/pom.xml -@@ -245,6 +245,19 @@ +@@ -255,6 +255,19 @@ true