2021-06-12 18:04:04 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: MiniDigger <admin@minidigger.me>
|
|
|
|
Date: Sat, 12 Jun 2021 16:40:34 +0200
|
|
|
|
Subject: [PATCH] Build changes
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
2022-04-22 03:21:55 +00:00
|
|
|
index dd8f449dddbe0838835ae8f8d5033aa422db403d..49f130227abc0c13a2b2e2c250c62e435ed15704 100644
|
2021-06-12 18:04:04 +00:00
|
|
|
--- a/build.gradle.kts
|
|
|
|
+++ b/build.gradle.kts
|
2022-04-22 03:21:55 +00:00
|
|
|
@@ -9,8 +9,12 @@ plugins {
|
2021-06-12 18:04:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
dependencies {
|
2021-12-02 08:00:38 +00:00
|
|
|
- implementation(project(":paper-api"))
|
|
|
|
- implementation(project(":paper-mojangapi"))
|
2021-12-03 04:58:35 +00:00
|
|
|
+ // ForkTest start
|
|
|
|
+ implementation(project(":forktest-api"))
|
2022-04-22 03:21:55 +00:00
|
|
|
+ implementation("io.papermc.paper:paper-mojangapi:1.18.2-R0.1-SNAPSHOT") {
|
2021-12-03 04:58:35 +00:00
|
|
|
+ exclude("io.papermc.paper", "paper-api")
|
|
|
|
+ }
|
|
|
|
+ // ForkTest end
|
2021-06-12 18:04:04 +00:00
|
|
|
// Paper start
|
2021-11-04 02:59:43 +00:00
|
|
|
implementation("org.jline:jline-terminal-jansi:3.21.0")
|
|
|
|
implementation("net.minecrell:terminalconsoleappender:1.3.0")
|
2022-04-22 03:21:55 +00:00
|
|
|
@@ -59,7 +63,7 @@ tasks.jar {
|
2021-08-25 04:06:30 +00:00
|
|
|
attributes(
|
|
|
|
"Main-Class" to "org.bukkit.craftbukkit.Main",
|
|
|
|
"Implementation-Title" to "CraftBukkit",
|
|
|
|
- "Implementation-Version" to "git-Paper-$implementationVersion",
|
|
|
|
+ "Implementation-Version" to "git-ForkTest-$implementationVersion", // ForkTest
|
|
|
|
"Implementation-Vendor" to date, // Paper
|
|
|
|
"Specification-Title" to "Bukkit",
|
|
|
|
"Specification-Version" to project.version,
|
2022-04-22 03:21:55 +00:00
|
|
|
@@ -147,7 +151,7 @@ fun TaskContainer.registerRunTask(
|
2021-12-02 08:00:38 +00:00
|
|
|
name: String,
|
|
|
|
block: JavaExec.() -> Unit
|
2021-06-16 06:28:10 +00:00
|
|
|
): TaskProvider<JavaExec> = register<JavaExec>(name) {
|
|
|
|
- group = "paper"
|
2022-04-22 03:21:55 +00:00
|
|
|
+ group = "paperweight" // ForkTest
|
2021-12-02 08:00:38 +00:00
|
|
|
mainClass.set("org.bukkit.craftbukkit.Main")
|
2021-06-16 06:28:10 +00:00
|
|
|
standardInput = System.`in`
|
2021-12-02 08:00:38 +00:00
|
|
|
workingDir = rootProject.layout.projectDirectory
|
2021-06-12 18:04:04 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2022-04-22 03:21:55 +00:00
|
|
|
index c8d56947305c981a3268ce4ae3e975db350ceff2..467d8411a6894492d5188e27aa9b852d6cdb61d3 100644
|
2021-06-12 18:04:04 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2022-04-22 03:21:55 +00:00
|
|
|
@@ -1693,7 +1693,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
2021-06-12 18:04:04 +00:00
|
|
|
|
|
|
|
@DontObfuscate
|
|
|
|
public String getServerModName() {
|
2021-09-25 02:10:14 +00:00
|
|
|
- return "Paper"; // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
|
|
|
|
+ return "ForkTest"; // ForkTest - ForkTest > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
|
2021-06-12 18:04:04 +00:00
|
|
|
}
|
|
|
|
|
2021-08-25 04:06:30 +00:00
|
|
|
public SystemReport fillSystemReport(SystemReport details) {
|
2021-06-12 18:04:04 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2022-04-22 03:21:55 +00:00
|
|
|
index ba4578fb4a2d861a6ffbb0ec022db31d9d7cc2be..188e78b2106cb1f6302e2677dc9104b0897ac8da 100644
|
2021-06-12 18:04:04 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2022-04-22 03:21:55 +00:00
|
|
|
@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper
|
2021-06-12 18:04:04 +00:00
|
|
|
import javax.annotation.Nonnull; // Paper
|
|
|
|
|
|
|
|
public final class CraftServer implements Server {
|
|
|
|
- private final String serverName = "Paper"; // Paper
|
2021-06-16 06:28:10 +00:00
|
|
|
+ private final String serverName = "ForkTest"; // ForkTest // Paper
|
2021-06-12 18:04:04 +00:00
|
|
|
private final String serverVersion;
|
|
|
|
private final String bukkitVersion = Versioning.getBukkitVersion();
|
|
|
|
private final Logger logger = Logger.getLogger("Minecraft");
|
2021-08-25 04:06:30 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
|
|
|
index 774556a62eb240da42e84db4502e2ed43495be17..21f39bd0c33ef2635249298e6a247afba8b05742 100644
|
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
|
|
|
@@ -11,7 +11,7 @@ public final class Versioning {
|
|
|
|
public static String getBukkitVersion() {
|
|
|
|
String result = "Unknown-Version";
|
|
|
|
|
|
|
|
- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
|
|
|
|
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.example.paperfork/forktest-api/pom.properties"); // ForkTest
|
|
|
|
Properties properties = new Properties();
|
|
|
|
|
|
|
|
if (stream != null) {
|