Skip to content

Commit 5d5df93

Browse files
committed
this applies?
1 parent 690c12e commit 5d5df93

39 files changed

+183
-463
lines changed

build.gradle.kts

Lines changed: 3 additions & 3 deletions
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.18"
6+
id("io.papermc.paperweight.patcher") version "2.0.0-beta.19"
77
}
88

99
paperweight {
@@ -44,7 +44,7 @@ subprojects {
4444
repositories {
4545
mavenCentral()
4646
maven(paperMavenPublicUrl)
47-
maven("https://sonatype.projecteden.gg/repository/maven-public/")
47+
maven("https://maven.projecteden.gg/snapshots")
4848
}
4949

5050
dependencies {
@@ -78,7 +78,7 @@ subprojects {
7878
repositories {
7979
maven {
8080
name = "edenSnapshots"
81-
url = uri("https://sonatype.projecteden.gg/repository/maven-snapshots/")
81+
url = uri("https://maven.projecteden.gg/repository/maven-snapshots/")
8282
credentials(PasswordCredentials::class)
8383
}
8484
}

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.8-R0.1-SNAPSHOT
3-
mcVersion=1.21.8
4-
paperRef=614e9acfca696b98b810c65e3582993fcefc321e
2+
version=1.21.11-R0.1-SNAPSHOT
3+
mcVersion=1.21.11
4+
paperRef=4446f17f652d3ce56860f8c06d6746fa3c1853fc
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.7-SNAPSHOT
11+
edenVersion = 2.3.13-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.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

parchment-api/build.gradle.kts.patch

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
--- a/paper-api/build.gradle.kts
22
+++ b/paper-api/build.gradle.kts
3-
@@ -15,6 +_,7 @@
3+
@@ -16,6 +_,7 @@
44
val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21"
55
val slf4jVersion = "2.0.16"
66
val log4jVersion = "2.24.1"
77
+val edenVersion: String by project // Parchment
88

99
val apiAndDocs: Configuration by configurations.creating {
1010
attributes {
11-
@@ -40,6 +_,7 @@
11+
@@ -41,6 +_,7 @@
1212
}
1313

1414
dependencies {
1515
+ api("gg.projecteden:eden-interfaces:${edenVersion}") // Parchment
1616
// api dependencies are listed transitively to API consumers
1717
api("com.google.guava:guava:33.3.1-jre")
1818
api("com.google.code.gson:gson:2.11.0")
19-
@@ -90,7 +_,7 @@
19+
@@ -91,7 +_,7 @@
2020
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
2121
}
2222

@@ -25,10 +25,11 @@
2525
idea {
2626
module {
2727
generatedSourceDirs.add(generatedDir.toFile())
28-
@@ -100,6 +_,18 @@
28+
@@ -100,7 +_,18 @@
29+
sourceSets {
2930
main {
3031
java {
31-
srcDir(generatedDir)
32+
- srcDir(generatedDir)
3233
+ srcDir(file("../paper-api/src/main/java"))
3334
+ }
3435
+ resources {
@@ -44,7 +45,7 @@
4445
}
4546
}
4647
}
47-
@@ -166,7 +_,7 @@
48+
@@ -183,7 +_,7 @@
4849

4950
tasks.withType<Javadoc>().configureEach {
5051
val options = options as StandardJavadocDocletOptions
@@ -53,7 +54,7 @@
5354
options.use()
5455
options.isDocFilesSubDirs = true
5556
options.links(
56-
@@ -199,11 +_,11 @@
57+
@@ -216,11 +_,11 @@
5758
}
5859

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

parchment-api/paper-patches/files/src/main/java/org/bukkit/OfflinePlayer.java.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
--- a/src/main/java/org/bukkit/OfflinePlayer.java
22
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
3-
@@ -20,7 +_,14 @@
3+
@@ -22,7 +_,14 @@
44
* player needing to be online.
55
*/
66
@NullMarked
7-
-public interface OfflinePlayer extends ServerOperator, AnimalTamer, ConfigurationSerializable, io.papermc.paper.persistence.PersistentDataViewHolder { // Paper - Add Offline PDC API
8-
+public interface OfflinePlayer extends ServerOperator, AnimalTamer, ConfigurationSerializable, io.papermc.paper.persistence.PersistentDataViewHolder, gg.projecteden.parchment.HasOfflinePlayer, gg.projecteden.parchment.OptionalPlayer, gg.projecteden.api.interfaces.HasUniqueId { // Parchment
7+
-public interface OfflinePlayer extends ServerOperator, AnimalTamer, ConfigurationSerializable, io.papermc.paper.persistence.PersistentDataViewHolder, PlayerHeadObjectContents.SkinSource { // Paper - Add Offline PDC API
8+
+public interface OfflinePlayer extends ServerOperator, AnimalTamer, ConfigurationSerializable, io.papermc.paper.persistence.PersistentDataViewHolder, PlayerHeadObjectContents.SkinSource, gg.projecteden.parchment.HasOfflinePlayer, gg.projecteden.parchment.OptionalPlayer, gg.projecteden.api.interfaces.HasUniqueId { // Paper - Add Offline PDC API
99
+
1010
+ // Parchment start
1111
+ @Override

parchment-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/org/bukkit/World.java
22
+++ b/src/main/java/org/bukkit/World.java
3-
@@ -52,6 +_,36 @@
3+
@@ -53,6 +_,36 @@
44
*/
55
public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient, Metadatable, PersistentDataHolder, Keyed, net.kyori.adventure.audience.ForwardingAudience { // Paper
66

parchment-api/paper-patches/files/src/main/java/org/bukkit/block/Block.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
/**
1111
* Gets the metadata for this block
12-
@@ -836,4 +_,19 @@
12+
@@ -834,4 +_,19 @@
1313
* @return {@code true} if the block can suffocate
1414
*/
1515
boolean isSuffocating();

parchment-api/paper-patches/files/src/main/java/org/bukkit/entity/Entity.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
/**
1111
* Gets the entity's current position
12-
@@ -1261,4 +_,7 @@
12+
@@ -1322,4 +_,7 @@
1313
*/
1414
void broadcastHurtAnimation(@NotNull java.util.Collection<Player> players);
1515
// Paper end - broadcast hurt animation

parchment-api/paper-patches/files/src/main/java/org/bukkit/entity/EntityType.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/org/bukkit/entity/EntityType.java
22
+++ b/src/main/java/org/bukkit/entity/EntityType.java
3-
@@ -202,6 +_,7 @@
3+
@@ -207,6 +_,7 @@
44
/**
55
* An unknown entity without an Entity Class
66
*/

parchment-api/paper-patches/files/src/main/java/org/bukkit/entity/HumanEntity.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
22
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
3-
@@ -27,7 +_,14 @@
3+
@@ -29,7 +_,14 @@
44
* Represents a human entity, such as an NPC or a player
55
*/
66
@NullMarked

0 commit comments

Comments
 (0)