chipmunkmc/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2024-11-14 19:34:54 -05:00
Code Issues 10 Projects Releases Packages Wiki Activity

Update Paper

Browse source
This commit is contained in:
Telesphoreo 2023-06-15 14:01:42 -05:00
parent 70c16f6ffa
commit ca518d0329
No known key found for this signature in database
GPG key ID: 68B745F7F8C2FADA
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
version=1.20.1-R0.1-SNAPSHOT version=1.20.1-R0.1-SNAPSHOT
mcVersion=1.20.1 mcVersion=1.20.1
paperRef=2e363c73ba3c0a7b3d5138ec55a6e93c7befb5bb paperRef=f7b386ddc77e5ed2ebed044cc7c8ad0bcd842b55
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 a0c5592530d2a59bfde87d1e9eb3752e7d4694da..fb4ab6c631c3a149178db0aa08f55fc5f7b7067d 100644 index 19186e436cd6a5f00f0b42ac11f8050ad2ef6713..33234e6d52e12a33b9f55f18a2c3c5de5c408158 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -7,8 +7,10 @@ plugins { @@ -7,8 +7,10 @@ plugins {
@ -21,7 +21,7 @@ index a0c5592530d2a59bfde87d1e9eb3752e7d4694da..fb4ab6c631c3a149178db0aa08f55fc5
// Paper start // Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0") implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -59,11 +61,17 @@ tasks.jar { @@ -60,11 +62,17 @@ tasks.jar {
val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
@ -41,7 +41,7 @@ index a0c5592530d2a59bfde87d1e9eb3752e7d4694da..fb4ab6c631c3a149178db0aa08f55fc5
"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,
@@ -135,7 +143,7 @@ fun TaskContainer.registerRunTask( @@ -136,7 +144,7 @@ fun TaskContainer.registerRunTask(
name: String, name: String,
block: JavaExec.() -> Unit block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) { ): TaskProvider<JavaExec> = register<JavaExec>(name) {