Folia/patches/server/0001-Build-changes.patch

79 lines
4.1 KiB
Diff
Raw Normal View History

2021-06-12 20:04:04 +02: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-12-02 09:00:38 +01:00
index cd74406039704e5a880f00b9b60bb7b1dedc5398..f11c3e2eb81181075c51c624e00c466de50d3a18 100644
2021-06-12 20:04:04 +02:00
--- a/build.gradle.kts
+++ b/build.gradle.kts
2021-12-02 09:00:38 +01:00
@@ -18,8 +18,8 @@ repositories {
2021-06-12 20:04:04 +02:00
}
dependencies {
2021-12-02 09:00:38 +01:00
- implementation(project(":paper-api"))
- implementation(project(":paper-mojangapi"))
2021-06-16 08:28:10 +02:00
+ implementation(project(":ForkTest-API")) // ForkTest
2021-12-02 09:00:38 +01:00
+ implementation("io.papermc.paper:paper-mojangapi:1.18-R0.1-SNAPSHOT") // ForkTest
2021-06-12 20:04:04 +02:00
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
2021-12-02 09:00:38 +01:00
@@ -67,7 +67,7 @@ tasks.jar {
2021-08-25 06:06:30 +02: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-12-02 09:00:38 +01:00
@@ -158,7 +158,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
2021-06-16 08:28:10 +02:00
): TaskProvider<JavaExec> = register<JavaExec>(name) {
- group = "paper"
+ group = "paperweight"
2021-12-02 09:00:38 +01:00
mainClass.set("org.bukkit.craftbukkit.Main")
2021-06-16 08:28:10 +02:00
standardInput = System.`in`
2021-12-02 09:00:38 +01:00
workingDir = rootProject.layout.projectDirectory
2021-06-12 20:04:04 +02:00
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
2021-12-02 09:00:38 +01:00
index 893badbe321fa974cb82f5f11ab590bb3827f8b8..4aba540f4bc8014548cc10818472431dfa6b2ede 100644
2021-06-12 20:04:04 +02:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2021-12-02 09:00:38 +01:00
@@ -1708,7 +1708,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2021-06-12 20:04:04 +02:00
@DontObfuscate
public String getServerModName() {
2021-09-25 04:10:14 +02:00
- return "Paper"; // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+ return "ForkTest"; // ForkTest - ForkTest > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
2021-06-12 20:04:04 +02:00
}
2021-08-25 06:06:30 +02:00
public SystemReport fillSystemReport(SystemReport details) {
2021-06-12 20:04:04 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2021-12-02 09:00:38 +01:00
index d938dc26886aa8a64c11db5e49fe5639bc27e1fb..d941957dee45911626f62e55f598490a60d6c818 100644
2021-06-12 20:04:04 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2021-12-02 09:00:38 +01:00
@@ -255,7 +255,7 @@ import javax.annotation.Nullable; // Paper
2021-06-12 20:04:04 +02:00
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
- private final String serverName = "Paper"; // Paper
2021-06-16 08:28:10 +02:00
+ private final String serverName = "ForkTest"; // ForkTest // Paper
2021-06-12 20:04:04 +02:00
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
2021-08-25 06:06:30 +02: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) {