mirror of
https://github.com/AtlasMediaGroup/Scissors.git
synced 2025-07-04 19:06:41 +00:00
Update Paper
This commit is contained in:
@ -5,13 +5,13 @@ Subject: [PATCH] Build changes
|
||||
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..85907e6e85bd6b84d17496a2f631206afb318504 100644
|
||||
index 58da26ad2f128ba0b66f86820f60853f4be352f0..94a75d6ff937f178711bff7ca32d96506d4e0673 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -27,8 +27,12 @@ repositories {
|
||||
@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
|
||||
val alsoShade: Configuration by configurations.creating
|
||||
|
||||
dependencies {
|
||||
extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT"))
|
||||
- implementation(project(":paper-api"))
|
||||
- implementation(project(":paper-mojangapi"))
|
||||
+ // Scissors start
|
||||
@ -23,7 +23,7 @@ index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..85907e6e85bd6b84d17496a2f631206a
|
||||
// Paper start
|
||||
implementation("org.jline:jline-terminal-jansi:3.21.0")
|
||||
implementation("net.minecrell:terminalconsoleappender:1.3.0")
|
||||
@@ -80,11 +84,19 @@ tasks.jar {
|
||||
@@ -66,11 +70,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 b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..85907e6e85bd6b84d17496a2f631206a
|
||||
"Implementation-Vendor" to date, // Paper
|
||||
"Specification-Title" to "Bukkit",
|
||||
"Specification-Version" to project.version,
|
||||
@@ -168,7 +180,7 @@ fun TaskContainer.registerRunTask(
|
||||
@@ -154,7 +166,7 @@ fun TaskContainer.registerRunTask(
|
||||
name: String,
|
||||
block: JavaExec.() -> Unit
|
||||
): TaskProvider<JavaExec> = register<JavaExec>(name) {
|
||||
@ -108,7 +108,7 @@ index 34f19ac897a30c0c4e3ab406013fcca1c8b7db93..6f284b7cd52ea47bd96ecd3b7a21d68a
|
||||
|
||||
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
|
||||
index e011cfcdda2e0a609d4158b0454bdf046b04c9d9..856ebd326f9c91591fe293aefb4d1dc93af52ea0 100644
|
||||
index 142d2c48239d4ebe3896218536656d116cd24d7c..c97079981e19ebd3e47e650e5e04f2c213bbff41 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
|
||||
|
Reference in New Issue
Block a user