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-11-17 05:27:00 +00:00
|
|
|
index e067c69fea1dec79ef8e97cad1c74020b6a3a235..1e697c30a9e9db2739ce1386bd1e8aad127cba77 100644
|
2021-06-12 18:04:04 +00:00
|
|
|
--- a/build.gradle.kts
|
|
|
|
+++ b/build.gradle.kts
|
2021-11-17 05:27:00 +00:00
|
|
|
@@ -22,8 +22,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
|
2021-08-25 04:06:30 +00:00
|
|
|
+ implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // ForkTest
|
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")
|
2021-11-17 05:27:00 +00:00
|
|
|
@@ -74,7 +74,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,
|
2021-11-17 05:27:00 +00:00
|
|
|
@@ -201,7 +201,7 @@ tasks.test {
|
2021-06-16 06:28:10 +00:00
|
|
|
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-11-17 05:27:00 +00:00
|
|
|
index 5a4172faaf960d48939d6a485719041987df9242..57c67adb8e12e41fa06198c40e4f50c0df048c02 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-11-17 05:27:00 +00:00
|
|
|
@@ -1729,7 +1729,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
|
2021-11-17 05:27:00 +00:00
|
|
|
index 99a94898316b0601f55b333c15a9926eae24f8a2..97264879ab916f2d457544b7a45b46725df785f1 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
|
2021-10-09 05:39:53 +00:00
|
|
|
@@ -251,7 +251,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) {
|