From 8bb5b4c152a9726d0ccefbf95771734fe40149e0 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sun, 2 Jul 2023 23:31:14 -0500 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- patches/server/0001-Build-changes.patch | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0289eb8..e8268d5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.20.1-R0.1-SNAPSHOT mcVersion=1.20.1 -paperRef=2c9c5e466293280fddb49d295ed212b051987dc3 +paperRef=4356758b645f3d4d91268ac40cd3b682eb3faecf org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 0cc9d56..b2178bc 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,11 +5,11 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..0ea1fe86fcd9d9c06648593332be3b4286af81bd 100644 +index 57f2c414dbfe127c193002fbc8eeb22e94e9cb55..ee62a53db6b16a5845c315b6de842cfbd96f584a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -7,8 +7,12 @@ plugins { - } +@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { + val alsoShade: Configuration by configurations.creating dependencies { - implementation(project(":paper-api")) @@ -23,7 +23,7 @@ index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..0ea1fe86fcd9d9c06648593332be3b42 // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -60,11 +64,19 @@ tasks.jar { +@@ -68,11 +72,19 @@ tasks.jar { val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper @@ -45,7 +45,7 @@ index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..0ea1fe86fcd9d9c06648593332be3b42 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -136,7 +148,7 @@ fun TaskContainer.registerRunTask( +@@ -149,7 +161,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) {