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

98 lines
5.2 KiB
Diff
Raw Normal View History

2021-06-12 20:04:04 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2023-02-23 17:13:45 +01:00
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Thu, 23 Feb 2023 07:56:29 -0800
2021-06-12 20:04:04 +02:00
Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
2023-02-23 17:13:45 +01:00
index 781609605d25283009e5f3e61649ecde9ea9a4cb..0a389871b8bd66252455773a6d735576a1bfcd77 100644
2021-06-12 20:04:04 +02:00
--- a/build.gradle.kts
+++ b/build.gradle.kts
2022-12-13 22:27:38 +01:00
@@ -7,8 +7,12 @@ plugins {
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"))
2023-02-23 17:13:45 +01:00
+ // Folia start
+ implementation(project(":Folia-API"))
2022-12-13 22:27:38 +01:00
+ implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") {
+ exclude("io.papermc.paper", "paper-api")
+ }
2023-02-23 17:13:45 +01:00
+ // Folia end
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")
2022-12-13 22:27:38 +01:00
@@ -61,7 +65,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",
2023-02-23 17:13:45 +01:00
+ "Implementation-Version" to "git-Folia-$implementationVersion", // Folia
2021-08-25 06:06:30 +02:00
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
2022-12-13 22:27:38 +01:00
@@ -133,7 +137,7 @@ fun TaskContainer.registerRunTask(
2021-12-02 09:00:38 +01:00
name: String,
block: JavaExec.() -> Unit
2021-06-16 08:28:10 +02:00
): TaskProvider<JavaExec> = register<JavaExec>(name) {
- group = "paper"
2023-02-23 17:13:45 +01:00
+ group = "paperweight" // Folia
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
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
index bf42969859545a8a520923ef1836ffa4a5cc24a0..719b0e318a85d4a1fb8f616deeb31193495b462e 100644
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -31,8 +31,8 @@ public class PaperVersionFetcher implements VersionFetcher {
@Nonnull
@Override
public Component getVersionMessage(@Nonnull String serverVersion) {
- String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]");
- final Component updateMessage = getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
+ String[] parts = serverVersion.substring("git-Folia-".length()).split("[-\\s]"); // Folia
+ final Component updateMessage = getUpdateStatusMessage("PaperMC/Folia", GITHUB_BRANCH_NAME, parts[0]); // Folia
final Component history = getHistory();
return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
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
2023-02-23 17:13:45 +01:00
index 710ca7d3a5659953f64bc6dccdd93b43300961cc..2ee4e5e8d17a3a1e6a342c74b13135df030ffef6 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
2022-12-13 22:27:38 +01:00
@@ -1654,7 +1654,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!
2023-02-23 17:13:45 +01:00
+ return "Folia"; // Folia - Folia > // 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
2023-02-23 17:13:45 +01:00
index bfc4ee36befb925ab4eb6b96f5c1aa6c76bf711f..2ea3778ee1348e5d06b15a2c5dc5d9bd4136dbe3 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
2022-12-13 22:27:38 +01:00
@@ -261,7 +261,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
2023-02-23 17:13:45 +01:00
+ private final String serverName = "Folia"; // Folia // 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
2023-02-23 17:13:45 +01:00
index 774556a62eb240da42e84db4502e2ed43495be17..e9b6ca3aa25e140467ae866d572483050ea3fa0e 100644
2021-08-25 06:06:30 +02:00
--- 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");
2023-02-23 17:13:45 +01:00
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/dev.folia/folia-api/pom.properties"); // Folia
2021-08-25 06:06:30 +02:00
Properties properties = new Properties();
if (stream != null) {