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

79 lines
4.1 KiB
Diff
Raw Normal View History

2021-06-12 14:04:04 -04: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
index d80cfcb94db51440b5d0aa589a9a3d8a4189a9aa..ed6139b1a8d8c814fde6c1b2fd7db425720908b6 100644
2021-06-12 14:04:04 -04:00
--- a/build.gradle.kts
+++ b/build.gradle.kts
2021-09-24 22:10:14 -04:00
@@ -29,8 +29,8 @@ repositories {
2021-06-12 14:04:04 -04:00
}
dependencies {
- implementation(project(":Paper-API"))
2021-06-16 02:28:10 -04:00
- implementation(project(":Paper-MojangAPI"))
+ implementation(project(":ForkTest-API")) // ForkTest
2021-08-25 00:06:30 -04:00
+ implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // ForkTest
2021-06-12 14:04:04 -04:00
// Paper start
implementation("org.jline:jline-terminal-jansi:3.12.1")
implementation("net.minecrell:terminalconsoleappender:1.2.0")
2021-09-24 22:10:14 -04:00
@@ -82,7 +82,7 @@ tasks.jar {
2021-08-25 00:06:30 -04: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-09-24 22:10:14 -04:00
@@ -207,7 +207,7 @@ tasks.test {
2021-06-16 02:28:10 -04: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 14:04:04 -04:00
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index fe6d5051b139cd6079e288ffdf20e30fdd46fdda..c0712fde9b41a24166224c188b82d022de56a24a 100644
2021-06-12 14:04:04 -04:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2021-09-24 22:10:14 -04:00
@@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2021-06-12 14:04:04 -04:00
@DontObfuscate
public String getServerModName() {
2021-09-24 22:10:14 -04:00
- return "Paper"; // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+ return "ForkTest"; // ForkTest - ForkTest > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
2021-06-12 14:04:04 -04:00
}
2021-08-25 00:06:30 -04:00
public SystemReport fillSystemReport(SystemReport details) {
2021-06-12 14:04:04 -04:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f925130552cb4ff2f813b1ddae9ac2f915e17bd5..33f99ff667b60b98502d073f5a224e38d81d74c2 100644
2021-06-12 14:04:04 -04:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper
2021-06-12 14:04:04 -04:00
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
- private final String serverName = "Paper"; // Paper
2021-06-16 02:28:10 -04:00
+ private final String serverName = "ForkTest"; // ForkTest // Paper
2021-06-12 14:04:04 -04:00
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
2021-08-25 00:06:30 -04: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) {