Skip to content

Commit 6c4c13d

Browse files
committed
Update adventure
1 parent 9227a96 commit 6c4c13d

7 files changed

+33
-41
lines changed

Diff for: .gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,3 @@
1010
[submodule "work/Spigot"]
1111
path = work/Spigot
1212
url = https://hub.spigotmc.org/stash/scm/spigot/spigot.git
13-
[submodule "adventure-temp"]
14-
path = adventure-temp
15-
url = https://github.com/KyoriPowered/adventure.git

Diff for: adventure-temp

-1
This file was deleted.

Diff for: build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ tasks.generateDevelopmentBundle {
113113
libraryRepositories.addAll(
114114
"https://repo.maven.apache.org/maven2/",
115115
paperMavenPublicUrl,
116+
"https://s01.oss.sonatype.org/content/repositories/snapshots/", // todo Remove when updating adventure to release
116117
)
117118
}
118119

Diff for: gradle.properties

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ mcVersion=1.20.3
55
# Set to true while updating Minecraft version
66
updatingMinecraft=false
77

8-
# TODO remove with adventure included build
9-
org.gradle.jvmargs=-Xmx1G
10-
118
org.gradle.caching=true
129
org.gradle.parallel=true
1310
org.gradle.vfs.watch=false

Diff for: patches/api/0451-Temp-adventure-update.patch

-29
This file was deleted.

Diff for: patches/server/1053-Temp-adventure-update.patch

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Jason Penilla <[email protected]>
3+
Date: Wed, 6 Dec 2023 21:21:46 -0700
4+
Subject: [PATCH] Temp adventure update
5+
6+
7+
diff --git a/build.gradle.kts b/build.gradle.kts
8+
index 6cfc43610940d3ab7c867352b27980a207ce3045..170a915098f09ace226648da342a04c5c7583d11 100644
9+
--- a/build.gradle.kts
10+
+++ b/build.gradle.kts
11+
@@ -12,7 +12,21 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
12+
}
13+
val alsoShade: Configuration by configurations.creating
14+
15+
+val extraRuntime: Configuration by configurations.creating
16+
+configurations.runtimeClasspath {
17+
+ extendsFrom(extraRuntime)
18+
+}
19+
+repositories {
20+
+ maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
21+
+ mavenContent {
22+
+ snapshotsOnly()
23+
+ includeGroup("net.kyori")
24+
+ }
25+
+ }
26+
+}
27+
+
28+
dependencies {
29+
+ extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT"))
30+
implementation(project(":paper-api"))
31+
implementation(project(":paper-mojangapi"))
32+
// Paper start

Diff for: settings.gradle.kts

-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ pluginManagement {
77
}
88
}
99

10-
// todo 1.20.3
11-
if (file("adventure-temp").exists()) {
12-
includeBuild("adventure-temp")
13-
}
14-
1510
plugins {
1611
id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
1712
}

0 commit comments

Comments
 (0)