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

Update upstream

Browse Source
This commit is contained in:
lexikiq
2021-07-13 17:45:25 -04:00
parent 72462aa1e6
commit 31173eb72c
3 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,18 +5,10 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 4605634d1e0d2c6592d4152e697680e078380868..b0c652f2cb1b9f860a685a126864d72e44856654 100644
index 682935762008602ca214f68147766792cbedeea9..cfa159079bb693cba59ce6e6212f8fe88627a763 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,6 +10,7 @@ import java.nio.file.Files
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
+import java.net.URI // Parchment
plugins {
java
@@ -30,8 +31,8 @@ repositories {
@@ -30,8 +30,8 @@ repositories {
}
dependencies {
@@ -27,16 +19,16 @@ index 4605634d1e0d2c6592d4152e697680e078380868..b0c652f2cb1b9f860a685a126864d72e
// Paper start
implementation("org.jline:jline-terminal-jansi:3.12.1")
implementation("net.minecrell:terminalconsoleappender:1.2.0")
@@ -80,7 +81,7 @@ tasks.jar {
@@ -81,7 +81,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
- "Implementation-Version" to "git-Paper-$implementationVersion",
+ "Implementation-Version" to "git-Parchment-$implementationVersion", // Parchment
"Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -102,6 +103,26 @@ publishing {
@@ -103,6 +103,26 @@ publishing {
classifier = null
}
artifact(tasks.shadowJar)
@@ -57,13 +49,13 @@ index 4605634d1e0d2c6592d4152e697680e078380868..b0c652f2cb1b9f860a685a126864d72e
+ username = properties["edenusr"] as String?
+ password = properties["edenpwd"] as String?
+ }
+ url = URI.create("https://sonatype.projecteden.gg/repository/maven-snapshots/")
+ url = uri("https://sonatype.projecteden.gg/repository/maven-snapshots/")
+ }
+ // Parchment end
}
}
@@ -112,7 +133,7 @@ tasks.shadowJar {
@@ -113,7 +133,7 @@ tasks.shadowJar {
// Needed for Paperclip's install to maven local feature
from(generatePom) {
@@ -72,7 +64,7 @@ index 4605634d1e0d2c6592d4152e697680e078380868..b0c652f2cb1b9f860a685a126864d72e
rename { "pom.xml" }
}
@@ -176,7 +197,7 @@ tasks.test {
@@ -177,7 +197,7 @@ tasks.test {
fun TaskContainer.registerRunTask(
name: String, block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -132,7 +124,7 @@ index 3dded5c491ace6b073a7bc3178976bd70f0b9393..2373f056cbe868491bafa02e3b711a63
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 c79b193ad822b8c246f24a87cd418892bc18ff5a..190d673c65aad82c044a4291a637af723e08267e 100644
index dd435909ad16a7f732fd0a2056f986dd9b24c0d5..a5301e96cd62d9d8e8c743ba8af97fb99b699af4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
@@ -145,7 +137,7 @@ index c79b193ad822b8c246f24a87cd418892bc18ff5a..190d673c65aad82c044a4291a637af72
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index c3c7b34ceb1b8f0ed042b29924c633fa7519dc30..31b56b031e57684d9f0849390badf9057fbf4ffa 100644
index ea7df53656766a8dc4ab5fe66de894301db634e1..6de638292a6126460c8b0e0a5d3ab6e4d28c2892 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -269,7 +269,7 @@ public class Main {