This commit is contained in:
2022-07-27 22:11:41 -05:00
parent 1306a6c873
commit 95d23dbac5
39 changed files with 9 additions and 2879 deletions

View File

@ -1,11 +1,11 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Fri, 10 Jun 2022 22:10:10 -0500
Date: Wed, 27 Jul 2022 22:09:00 -0500
Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..fc08b27f5c8a8e2ec96cb8b28e5e2c7981293332 100644
index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..ba15c2caa525bb56397be65e4393c9135b9caf6f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,8 +9,8 @@ plugins {
@ -15,7 +15,7 @@ index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..fc08b27f5c8a8e2ec96cb8b28e5e2c79
- implementation(project(":paper-api"))
- implementation(project(":paper-mojangapi"))
+ implementation(project(":Scissors-API"))
+ implementation("io.papermc.paper:paper-mojangapi:1.19-R0.1-SNAPSHOT")
+ implementation("io.papermc.paper:paper-mojangapi:1.19.1-R0.1-SNAPSHOT")
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@ -49,7 +49,7 @@ index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..fc08b27f5c8a8e2ec96cb8b28e5e2c79
standardInput = System.`in`
workingDir = rootProject.layout.projectDirectory
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 35a5cc8ed861401d3dd28b08ebc5d40aad82b0df..7e6be11d7ec1f3d52dcc632dc8c16ee023682278 100644
index 46fcecbfb3f866ba89036a11113c8ad0989b04bc..0c6c6f611c3376b938baa22c196c5b44cdeb1b21 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1655,7 +1655,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@ -62,7 +62,7 @@ index 35a5cc8ed861401d3dd28b08ebc5d40aad82b0df..7e6be11d7ec1f3d52dcc632dc8c16ee0
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bfde5bbcccfaa754ec6bdf4f3817981a93e465bd..10eecebce5eb8f9f062a10e9cbfbadbc54aec9b7 100644
index bfde5bbcccfaa754ec6bdf4f3817981a93e465bd..f4dd0ddd29fbc4fcb31ff775d3c4424d85209a21 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
@ -70,7 +70,7 @@ index bfde5bbcccfaa754ec6bdf4f3817981a93e465bd..10eecebce5eb8f9f062a10e9cbfbadbc
public final class CraftServer implements Server {
- private final String serverName = "Paper"; // Paper
+ private final String serverName = "Scissors"; // Scissors // Paper
+ private final String serverName = "Scissors"; // Scissors > // Paper
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");