Repo-Mirror/ParchmentMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@bdb6816 Update Alternate Current to v1.4.0 (#8028)
PaperMC/Paper@5593f4e Cleanup LivingEntity Hand Raised/Item Use API (#7995)
PaperMC/Paper@04d080e Fix tiny mistake in adventure javadocs (#8046)
PaperMC/Paper@e7036bb Updated Upstream (Bukkit/CraftBukkit) (#8042)
PaperMC/Paper@11bd74b Use safe method for handling Files#createDirectories (#7997)
PaperMC/Paper@37afe98 Fix CCE for SplashPotion and LingeringPotion spawning (#7758)
PaperMC/Paper@0d79b86 Update paperweight to 1.3.8
PaperMC/Paper@1bd678c Scan built jars for bad method usages (#8051)
This commit is contained in:
Lexi
2022-06-28 14:44:00 -04:00
parent 28f111ddaa
commit 4dcb0d4060
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -4,7 +4,7 @@ plugins {
java java
`maven-publish` `maven-publish`
id("com.github.johnrengelman.shadow") version "7.1.2" apply false id("com.github.johnrengelman.shadow") version "7.1.2" apply false
id("io.papermc.paperweight.patcher") version "1.3.7" id("io.papermc.paperweight.patcher") version "1.3.8"
} }
repositories { repositories {

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = gg.projecteden.parchment
version = 1.19-R0.1-SNAPSHOT version = 1.19-R0.1-SNAPSHOT
mcVersion = 1.19 mcVersion = 1.19
paperRef = e52499e41d3a035d852e566288c31c7113160bb9 paperRef = 1bd678c494009f2707b3cdf48ed10cd95b7e3fd5
org.gradle.caching=true org.gradle.caching=true
org.gradle.parallel=true org.gradle.parallel=true

6
patches/server/0001-Build-changes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 68b8f275f9c9e77a949ca29749a05b469bcdb910..82d6922ca22eee74de2140789787e6e5da51378c 100644 index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..2d10b9122ab07ab4ab72d2f33aeb12fc599e54d5 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -9,8 +9,8 @@ plugins { @@ -9,8 +9,8 @@ plugins {
@@ -57,7 +57,7 @@ index 68b8f275f9c9e77a949ca29749a05b469bcdb910..82d6922ca22eee74de2140789787e6e5
} }
} }
@@ -152,7 +172,7 @@ fun TaskContainer.registerRunTask( @@ -163,7 +183,7 @@ fun TaskContainer.registerRunTask(
name: String, name: String,
block: JavaExec.() -> Unit block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) { ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -117,7 +117,7 @@ index 77cd45f616e2ff38ad6a648b8b865a99e544f3ec..518b6dfd4dd083e23ae519061664e74c
public SystemReport fillSystemReport(SystemReport details) { public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 61c2f864bb23e75f6c377f7ccbf2ec44a670348c..a50a6f14e03f2b709b36126af263b29c56fd9f51 100644 index 947bf593325cc00d9dc53ab0bf2b1b3ee578aef3..4ce20de3ef07f2cbd49ecebff0463269719178e4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -245,7 +245,7 @@ import javax.annotation.Nullable; // Paper @@ -245,7 +245,7 @@ import javax.annotation.Nullable; // Paper