AtlasMediaGroup/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2025-06-12 17:53:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update upstream & paperweight to 1.1.13

Browse Source
This commit is contained in:
Jason Penilla
2021-11-03 19:59:43 -07:00
parent 1a5f02ce1b
commit ec10cc7b81
3 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
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
index cb1a931417073908be5c7aa1af710477775b3dbd..93675c95d0a798988652b4c6e8010ebad28e12c7 100644
index d78267e02a705ffa9083815da0df042d3a184837..317e01839efed7631a46f6ee51e3dc44f56d69f1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -28,8 +28,8 @@ repositories {
@@ -25,8 +25,8 @@ repositories {
}
dependencies {
@ -17,9 +17,9 @@ index cb1a931417073908be5c7aa1af710477775b3dbd..93675c95d0a798988652b4c6e8010eba
+ implementation(project(":ForkTest-API")) // ForkTest
+ implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // ForkTest
// Paper start
implementation("org.jline:jline-terminal-jansi:3.12.1")
implementation("net.minecrell:terminalconsoleappender:1.2.0")
@@ -81,7 +81,7 @@ tasks.jar {
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -77,7 +77,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@ -28,7 +28,7 @@ index cb1a931417073908be5c7aa1af710477775b3dbd..93675c95d0a798988652b4c6e8010eba
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -206,7 +206,7 @@ tasks.test {
@@ -203,7 +203,7 @@ tasks.test {
fun TaskContainer.registerRunTask(
name: String, block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@ -38,10 +38,10 @@ index cb1a931417073908be5c7aa1af710477775b3dbd..93675c95d0a798988652b4c6e8010eba
workingDir = rootProject.layout.projectDirectory.dir(
providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run")
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c8876b000a03f18e7a140167ed4505a9843a8d14..45157114dcfa2da5c379d1593d0a54e1a370b288 100644
index 7636b0ae9031e06fd8b4a0c359a45a17e6e075de..8e953a0d275e7a0e8ddacc0baef4acff8272bb90 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1726,7 +1726,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@ -51,7 +51,7 @@ index c8876b000a03f18e7a140167ed4505a9843a8d14..45157114dcfa2da5c379d1593d0a54e1
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 0adb686d690e1be0c5540625efbecc46bac5d045..c409d5c2fc45786e8629df608feff444dcfaa265 100644
index cfbde4c1220b0d6081a3e4ad2375e0d7bfb2ef40..3b0271b3d81812b678ad9e3388fba4b43146978d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -251,7 +251,7 @@ import javax.annotation.Nullable; // Paper