Temp adventure update

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "work/Spigot"]
 	path = work/Spigot
 	url = https://hub.spigotmc.org/stash/scm/spigot/spigot.git
+[submodule "adventure-temp"]
+	path = adventure-temp
+	url = https://github.com/KyoriPowered/adventure.git

adventure-temp

@@ -0,0 +1 @@
+Subproject commit 6feacda2eedef5edfb20e280540d00933861886e

gradle.properties

@@ -5,6 +5,9 @@ mcVersion=1.20.3
 # Set to true while updating Minecraft version
 updatingMinecraft=false
 
+# TODO remove with adventure included build
+org.gradle.jvmargs=-Xmx1G
+
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=false

patches/api/0451-Temp-adventure-update.patch

@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
+Date: Wed, 6 Dec 2023 13:38:10 -0700
+Subject: [PATCH] Temp adventure update
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index e827ee211e3c65dc68ac5867fd8476639df63645..84cf134115ffce4ada686e8f742fc02a52e0be0e 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -25,6 +25,10 @@ val apiAndDocs: Configuration by configurations.creating {
+ configurations.api {
+     extendsFrom(apiAndDocs)
+ }
++val extraRuntime: Configuration by configurations.creating
++configurations.runtimeClasspath {
++    extendsFrom(extraRuntime)
++}
+ 
+ dependencies {
+     // api dependencies are listed transitively to API consumers
+@@ -39,6 +43,7 @@ dependencies {
+     }
+     api("it.unimi.dsi:fastutil:8.5.6")
+     apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
++    extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT"))
+     apiAndDocs("net.kyori:adventure-api")
+     apiAndDocs("net.kyori:adventure-text-minimessage")
+     apiAndDocs("net.kyori:adventure-text-serializer-gson")

patches/server/1052-HACK-id-string-codec-in-hover-event.patch

@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Wed, 6 Dec 2023 21:24:54 +0100
-Subject: [PATCH] HACK id string codec in hover event
-
-Temporary hack to remove serialization to the int array, since adventure has not been updated to deserialize this format
-
-
-diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java
-index 7fd85ae2ebd7225f06d874aa7e37fbdb89e3ea92..7ff694a3dd492224dedfa00b4ff0ff3015b50d1c 100644
---- a/src/main/java/net/minecraft/network/chat/HoverEvent.java
-+++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java
-@@ -134,7 +134,7 @@ public class HoverEvent {
-         public static final Codec<HoverEvent.EntityTooltipInfo> CODEC = RecordCodecBuilder.create((instance) -> {
-             return instance.group(BuiltInRegistries.ENTITY_TYPE.byNameCodec().fieldOf("type").forGetter((content) -> {
-                 return content.type;
--            }), UUIDUtil.LENIENT_CODEC.fieldOf("id").forGetter((content) -> {
-+            }), UUIDUtil.STRING_CODEC.fieldOf("id").forGetter((content) -> {
-                 return content.id;
-             }), ExtraCodecs.strictOptionalField(ComponentSerialization.CODEC, "name").forGetter((content) -> {
-                 return content.name;

settings.gradle.kts

@@ -7,6 +7,11 @@ pluginManagement {
     }
 }
 
+// todo 1.20.3
+if (file("adventure-temp").exists()) {
+    includeBuild("adventure-temp")
+}
+
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
 }