Update adventure

This commit is contained in:
Jason Penilla 2023-12-06 21:04:46 -07:00
parent 9227a9648c
commit 6c4c13df44
No known key found for this signature in database
GPG Key ID: 0E75A301420E48F8
7 changed files with 33 additions and 41 deletions

3
.gitmodules vendored
View File

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

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

View File

@ -113,6 +113,7 @@ tasks.generateDevelopmentBundle {
libraryRepositories.addAll( libraryRepositories.addAll(
"https://repo.maven.apache.org/maven2/", "https://repo.maven.apache.org/maven2/",
paperMavenPublicUrl, paperMavenPublicUrl,
"https://s01.oss.sonatype.org/content/repositories/snapshots/", // todo Remove when updating adventure to release
) )
} }

View File

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

View File

@ -1,29 +0,0 @@
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")

View File

@ -0,0 +1,32 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
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

View File

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