Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
5059ada Move log message for named entity deaths into correct location (#6105)
b5be382 Add methods to ProtoWorld for working with BlockStates (#5929)
144e5f7 Add option for logging named entity deaths (#6107)
4aef035 [ci skip] Use Java toolchain for run tasks (#6108)
dafc064 Fix MobEffectArgument#getEffect reobf
648f607 Route sign run_command click events through normal chat logic (#6109)
351a2c3 Drop no longer needed patch (#6115)
bb44da8 Fix cancelling EntityPickupItemEvent for villagers (#6091)
This commit is contained in:
William Blake Galbreath
2021-07-07 14:50:53 -05:00
parent afab9a73ef
commit 444413bba6
15 changed files with 38 additions and 38 deletions

View File

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/build.gradle.kts b/build.gradle.kts
index 5540da58e66f83b283863d3158a9b4ab5ba636db..ab8de6c4e3c0bea2b9f498da00adf88e987d2364 100644
index 4605634d1e0d2c6592d4152e697680e078380868..bc85e4da98322426f3f4a784fafe1c96eaea00f5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,10 +1,16 @@
@@ -48,7 +48,7 @@ index 5540da58e66f83b283863d3158a9b4ab5ba636db..ab8de6c4e3c0bea2b9f498da00adf88e
// Paper start
implementation("org.jline:jline-terminal-jansi:3.12.1")
implementation("net.minecrell:terminalconsoleappender:1.2.0")
@@ -82,7 +88,7 @@ tasks.jar {
@@ -80,7 +86,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -57,7 +57,7 @@ index 5540da58e66f83b283863d3158a9b4ab5ba636db..ab8de6c4e3c0bea2b9f498da00adf88e
"Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -107,6 +113,22 @@ publishing {
@@ -105,6 +111,22 @@ publishing {
}
}
@@ -80,7 +80,7 @@ index 5540da58e66f83b283863d3158a9b4ab5ba636db..ab8de6c4e3c0bea2b9f498da00adf88e
val generatePom = tasks.named<GenerateMavenPom>("generatePomFileForMavenPublication")
tasks.shadowJar {
@@ -178,7 +200,7 @@ tasks.test {
@@ -176,7 +198,7 @@ tasks.test {
fun TaskContainer.registerRunTask(
name: String, block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {