Skip to content

Commit 81b91aa

Browse files
committed
they apply
1 parent 4df26a8 commit 81b91aa

File tree

92 files changed

+256
-864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+256
-864
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
33

44
plugins {
55
java // TODO java launcher tasks
6-
id("io.papermc.paperweight.patcher") version "2.0.0-beta.14"
6+
id("io.papermc.paperweight.patcher") version "2.0.0-beta.18"
77
}
88

99
paperweight {

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
group=gg.projecteden.parchment
2-
version=1.21.4-R0.1-SNAPSHOT
3-
mcVersion=1.21.4
4-
paperRef=6cfa2f7f315cbad23d7b12984b751f2721b496b6
2+
version=1.21.8-R0.1-SNAPSHOT
3+
mcVersion=1.21.8
4+
paperRef=103187750e29fd982b84b2bab114fe5af98a82e5
55

66
org.gradle.configuration-cache=true
77
org.gradle.caching=true
88
org.gradle.parallel=true
99
org.gradle.vfs.watch=false
1010

11-
edenVersion = 2.3.0-SNAPSHOT
11+
edenVersion = 2.3.7-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

parchment-api/build.gradle.kts.patch

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,25 @@
11
--- a/paper-api/build.gradle.kts
22
+++ b/paper-api/build.gradle.kts
3-
@@ -15,6 +_,8 @@
4-
val slf4jVersion = "2.0.9"
5-
val log4jVersion = "2.17.1"
6-
3+
@@ -15,6 +_,7 @@
4+
val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21"
5+
val slf4jVersion = "2.0.16"
6+
val log4jVersion = "2.24.1"
77
+val edenVersion: String by project // Parchment
8-
+
8+
99
val apiAndDocs: Configuration by configurations.creating {
1010
attributes {
11-
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
12-
@@ -39,6 +_,7 @@
11+
@@ -40,6 +_,7 @@
1312
}
1413

1514
dependencies {
16-
+ api("gg.projecteden:eden-interfaces:$edenVersion") // Parchment
17-
15+
+ api("gg.projecteden:eden-interfaces:${edenVersion}") // Parchment
1816
// api dependencies are listed transitively to API consumers
1917
api("com.google.guava:guava:33.3.1-jre")
20-
@@ -93,7 +_,7 @@
21-
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
22-
}
23-
24-
-val generatedApiPath: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
25-
+val generatedApiPath: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
26-
idea {
27-
module {
28-
generatedSourceDirs.add(generatedApiPath.toFile())
29-
@@ -103,6 +_,18 @@
18+
api("com.google.code.gson:gson:2.11.0")
19+
@@ -100,6 +_,18 @@
3020
main {
3121
java {
32-
srcDir(generatedApiPath)
22+
srcDir(generatedDir)
3323
+ srcDir(file("../paper-api/src/main/java"))
3424
+ }
3525
+ resources {
@@ -45,16 +35,16 @@
4535
}
4636
}
4737
}
48-
@@ -169,7 +_,7 @@
38+
@@ -166,7 +_,7 @@
4939

50-
tasks.withType<Javadoc> {
40+
tasks.withType<Javadoc>().configureEach {
5141
val options = options as StandardJavadocDocletOptions
5242
- options.overview = "src/main/javadoc/overview.html"
5343
+ options.overview = "../paper-api/src/main/javadoc/overview.html"
5444
options.use()
5545
options.isDocFilesSubDirs = true
5646
options.links(
57-
@@ -202,11 +_,11 @@
47+
@@ -199,11 +_,11 @@
5848
}
5949

6050
// workaround for https://github.com/gradle/gradle/issues/4046

parchment-api/paper-patches/files/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

parchment-api/paper-patches/files/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

parchment-api/paper-patches/files/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

parchment-api/paper-patches/files/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

parchment-api/paper-patches/files/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

parchment-api/paper-patches/files/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)