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

Update upstream

Browse Source
This commit is contained in:
Pugabyte
2021-07-21 23:06:32 -05:00
parent 13c0523e51
commit d1e4cd0ccf
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -3,4 +3,4 @@ version = 1.17.1-R0.1-SNAPSHOT
mcVersion = 1.17.1 mcVersion = 1.17.1
packageVersion = 1_17_R1 packageVersion = 1_17_R1
paperRef = fc478727d5722e97d0e1516c535cbb8554de1a18 paperRef = 2961b2adab4944d5eb36c4c0cdb950dcd4db9b81

12
patches/api/0001-Build-changes.patch
View File

@@ -5,14 +5,14 @@ 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 7ad3e5153718f6d4ce8293a9790bc3c1158aeb8e..14caef3d68aab390de482e9ea33a91641492279b 100644 index 15b8f4708887535383bb74bd922f893231737599..feeb5a5808d8a97408b0295078fb3b8d7e922573 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -29,6 +29,7 @@ dependencies { @@ -27,6 +27,7 @@ dependencies {
api("org.ow2.asm:asm:9.0") api("net.kyori:adventure-text-serializer-legacy")
api("org.ow2.asm:asm-commons:9.0") api("net.kyori:adventure-text-serializer-plain")
api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
+ api(project(":Parchment-Common")) // Parchment + api(project(":Parchment-Common")) // Parchment
compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") implementation("org.ow2.asm:asm:9.1")
compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0") implementation("org.ow2.asm:asm-commons:9.1")

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

@@ -5,10 +5,10 @@ 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 682935762008602ca214f68147766792cbedeea9..cfa159079bb693cba59ce6e6212f8fe88627a763 100644 index b50463c2356301a1b47a0bf4f50dc1f121d363a1..de932184e6bfe6e620ad7f3e43b22ae8bd5a0f48 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -30,8 +30,8 @@ repositories { @@ -28,8 +28,8 @@ repositories {
} }
dependencies { dependencies {
@@ -19,7 +19,7 @@ index 682935762008602ca214f68147766792cbedeea9..cfa159079bb693cba59ce6e6212f8fe8
// Paper start // Paper start
implementation("org.jline:jline-terminal-jansi:3.12.1") implementation("org.jline:jline-terminal-jansi:3.12.1")
implementation("net.minecrell:terminalconsoleappender:1.2.0") implementation("net.minecrell:terminalconsoleappender:1.2.0")
@@ -81,7 +81,7 @@ tasks.jar { @@ -80,7 +80,7 @@ tasks.jar {
attributes( attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main", "Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit", "Implementation-Title" to "CraftBukkit",
@@ -28,7 +28,7 @@ index 682935762008602ca214f68147766792cbedeea9..cfa159079bb693cba59ce6e6212f8fe8
"Implementation-Vendor" to date, // Paper "Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit", "Specification-Title" to "Bukkit",
"Specification-Version" to project.version, "Specification-Version" to project.version,
@@ -103,6 +103,26 @@ publishing { @@ -102,6 +102,26 @@ publishing {
classifier = null classifier = null
} }
artifact(tasks.shadowJar) artifact(tasks.shadowJar)
@@ -55,7 +55,7 @@ index 682935762008602ca214f68147766792cbedeea9..cfa159079bb693cba59ce6e6212f8fe8
} }
} }
@@ -113,7 +133,7 @@ tasks.shadowJar { @@ -112,7 +132,7 @@ tasks.shadowJar {
// Needed for Paperclip's install to maven local feature // Needed for Paperclip's install to maven local feature
from(generatePom) { from(generatePom) {
@@ -64,7 +64,7 @@ index 682935762008602ca214f68147766792cbedeea9..cfa159079bb693cba59ce6e6212f8fe8
rename { "pom.xml" } rename { "pom.xml" }
} }
@@ -177,7 +197,7 @@ tasks.test { @@ -176,7 +196,7 @@ tasks.test {
fun TaskContainer.registerRunTask( fun TaskContainer.registerRunTask(
name: String, block: JavaExec.() -> Unit name: String, block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) { ): TaskProvider<JavaExec> = register<JavaExec>(name) {