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

78 lines
4.0 KiB
Diff
Raw Normal View History

2021-06-12 18:04:04 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2022-04-19 23:21:18 +00:00
From: Telesphoreo <me@telesphoreo.me>
Date: Tue, 19 Apr 2022 18:17:43 -0500
2021-06-12 18:04:04 +00:00
Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
2022-04-19 23:21:18 +00:00
index dd8f449dddbe0838835ae8f8d5033aa422db403d..bcada100f0938cfae54734582a86f4c1787e91b5 100644
2021-06-12 18:04:04 +00:00
--- a/build.gradle.kts
+++ b/build.gradle.kts
2022-04-19 23:21:18 +00:00
@@ -9,8 +9,7 @@ plugins {
2021-06-12 18:04:04 +00:00
}
dependencies {
2022-04-19 23:21:18 +00:00
- implementation(project(":paper-api"))
- implementation(project(":paper-mojangapi"))
+ implementation("io.papermc.paper:paper-mojangapi:1.18.2-R0.1-SNAPSHOT") // Scissors
2021-06-12 18:04:04 +00:00
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
2022-04-19 23:21:18 +00:00
@@ -59,7 +58,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",
2022-04-19 23:21:18 +00:00
+ "Implementation-Version" to "git-Scissors-$implementationVersion",
2021-08-25 04:06:30 +00:00
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
2022-04-19 23:21:18 +00:00
@@ -147,7 +146,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
2021-06-16 06:28:10 +00:00
): TaskProvider<JavaExec> = register<JavaExec>(name) {
- group = "paper"
+ group = "paperweight"
2022-04-19 23:21:18 +00:00
mainClass.set("org.bukkit.craftbukkit.Main")
2021-06-16 06:28:10 +00:00
standardInput = System.`in`
2022-04-19 23:21:18 +00:00
workingDir = rootProject.layout.projectDirectory
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
2022-04-19 23:21:18 +00:00
index c8d56947305c981a3268ce4ae3e975db350ceff2..f0ed55e2d9e1c1e3ba27bf675490c57d961ff7f5 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
2022-04-19 23:21:18 +00:00
@@ -1693,7 +1693,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!
2022-03-13 01:39:38 +00:00
+ return "Scissors"; // Scissors - Scissors > // 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
2022-04-19 23:21:18 +00:00
index 16d3f2dce44fc374ec3ab5882135d06113681fb6..1eaa831eb543bd5230dbdb59007d7d54ccb3e2b1 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
2022-04-19 23:21:18 +00:00
@@ -249,7 +249,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
2022-03-13 01:39:38 +00:00
+ private final String serverName = "Scissors"; // Scissors // 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
2022-03-13 01:39:38 +00:00
index 774556a62eb240da42e84db4502e2ed43495be17..becf61c0adde1c27f3e462a1b8248544ab181797 100644
2021-08-25 04:06:30 +00: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");
2022-03-13 01:39:38 +00:00
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/me.totalfreedom.scissors/scissors-api/pom.properties");
2021-08-25 04:06:30 +00:00
Properties properties = new Properties();
if (stream != null) {