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
|
2021-06-16 06:28:10 +00:00
|
|
|
index f111042223f0d7974785c37245bb60b75388163e..043e5f4a0914fab856f98d39262a7c28c327460f 100644
|
2021-06-12 18:04:04 +00:00
|
|
|
--- a/build.gradle.kts
|
|
|
|
+++ b/build.gradle.kts
|
2021-06-16 06:28:10 +00:00
|
|
|
@@ -19,8 +19,8 @@ repositories {
|
2021-06-12 18:04:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
dependencies {
|
|
|
|
- implementation(project(":Paper-API"))
|
2021-06-16 06:28:10 +00:00
|
|
|
- implementation(project(":Paper-MojangAPI"))
|
|
|
|
+ implementation(project(":ForkTest-API")) // ForkTest
|
|
|
|
+ implementation("com.destroystokyo.paper:paper-mojangapi:1.16.5-R0.1-SNAPSHOT") // ForkTest
|
2021-06-12 18:04:04 +00:00
|
|
|
// Paper start
|
|
|
|
implementation("org.jline:jline-terminal-jansi:3.12.1")
|
|
|
|
implementation("net.minecrell:terminalconsoleappender:1.2.0")
|
2021-06-16 06:28:10 +00:00
|
|
|
@@ -119,7 +119,7 @@ tasks.test {
|
|
|
|
fun TaskContainer.registerRunTask(
|
|
|
|
name: String, block: JavaExec.() -> Unit
|
|
|
|
): TaskProvider<JavaExec> = register<JavaExec>(name) {
|
|
|
|
- group = "paper"
|
|
|
|
+ group = "paperweight"
|
|
|
|
standardInput = System.`in`
|
|
|
|
workingDir = rootProject.layout.projectDirectory.dir(
|
|
|
|
providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run")
|
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
|
2021-06-16 06:28:10 +00:00
|
|
|
index c6747f49ae8ddc9fc1bad82ab480f85d0883da5d..804eb17da12b816438a4d4c39fc330c4869cea1d 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
|
2021-06-16 06:28:10 +00:00
|
|
|
@@ -1649,7 +1649,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
2021-06-12 18:04:04 +00:00
|
|
|
|
|
|
|
@DontObfuscate
|
|
|
|
public String getServerModName() {
|
|
|
|
- return "Paper"; //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
|
2021-06-16 06:28:10 +00:00
|
|
|
+ return "ForkTest"; //ForkTest - ForkTest > //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
|
2021-06-12 18:04:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
public SystemReport fillSystemReport(SystemReport systemreport) {
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2021-06-16 06:28:10 +00:00
|
|
|
index 8a98bd1018afd934696fedbed24e271ab6b75f51..84c456ef6a375d84ab52e11a58a4e6fe602733c0 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
|
|
|
|
@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
|
|
|
|
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");
|