Update adventure

7 files changed, 33 insertions, 40 deletions

diff --git a/.gitmodules b/.gitmodules
index 629d414712..7280fb743d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,6 +10,3 @@
 [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
diff --git a/adventure-temp b/adventure-temp
deleted file mode 160000
-Subproject 6feacda2eedef5edfb20e280540d00933861886
diff --git a/build.gradle.kts b/build.gradle.kts
index 5d4dae473e..9a598c0648 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -113,6 +113,7 @@ tasks.generateDevelopmentBundle {
     libraryRepositories.addAll(
         "https://repo.maven.apache.org/maven2/",
         paperMavenPublicUrl,
+        "https://s01.oss.sonatype.org/content/repositories/snapshots/", // todo Remove when updating adventure to release
     )
 }
 
diff --git a/gradle.properties b/gradle.properties
index 656dad40e6..2b02b49f36 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,9 +5,6 @@ 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
diff --git a/patches/api/0451-Temp-adventure-update.patch b/patches/api/0451-Temp-adventure-update.patch
deleted file mode 100644
index 33aefe890e..0000000000
--- a/patches/api/0451-Temp-adventure-update.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <[email protected]>
-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")
diff --git a/patches/server/1053-Temp-adventure-update.patch b/patches/server/1053-Temp-adventure-update.patch
new file mode 100644
index 0000000000..ad2dfe8fde
--- /dev/null
+++ b/patches/server/1053-Temp-adventure-update.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jason Penilla <[email protected]>
+Date: Wed, 6 Dec 2023 21:21:46 -0700
+Subject: [PATCH] Temp adventure update
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 6cfc43610940d3ab7c867352b27980a207ce3045..170a915098f09ace226648da342a04c5c7583d11 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -12,7 +12,21 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
+ }
+ val alsoShade: Configuration by configurations.creating
+ 
++val extraRuntime: Configuration by configurations.creating
++configurations.runtimeClasspath {
++    extendsFrom(extraRuntime)
++}
++repositories {
++    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
++        mavenContent {
++            snapshotsOnly()
++            includeGroup("net.kyori")
++        }
++    }
++}
++
+ dependencies {
++    extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT"))
+     implementation(project(":paper-api"))
+     implementation(project(":paper-mojangapi"))
+     // Paper start
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f3117284e8..5dabeac5af 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,11 +7,6 @@ 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"
 }