-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Doesn't build properly but maybe someone else can fix it
- Loading branch information
1 parent
5190079
commit d04e640
Showing
8 changed files
with
86 additions
and
223 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: SugarcaneMC <sugarcanemcorg@gmail.com> | ||
Date: Sat, 12 Jun 2021 16:40:34 +0200 | ||
Subject: [PATCH] Build changes | ||
|
||
|
||
diff --git a/build.gradle.kts b/build.gradle.kts | ||
index f111042223f0d7974785c37245bb60b75388163e..043e5f4a0914fab856f98d39262a7c28c327460f 100644 | ||
--- a/build.gradle.kts | ||
+++ b/build.gradle.kts | ||
@@ -19,8 +19,8 @@ repositories { | ||
} | ||
|
||
dependencies { | ||
- implementation(project(":Paper-API")) | ||
- implementation(project(":Paper-MojangAPI")) | ||
+ implementation(project(":Sugarcane-API")) // ForkTest | ||
+ implementation("com.destroystokyo.paper:paper-mojangapi:1.17-R0.1-SNAPSHOT") // Sugarcane | ||
// Paper start | ||
implementation("org.jline:jline-terminal-jansi:3.12.1") | ||
implementation("net.minecrell:terminalconsoleappender:1.2.0") | ||
@@ -119,7 +119,7 @@ tasks.test { | ||
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") | ||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java | ||
index c6747f49ae8ddc9fc1bad82ab480f85d0883da5d..804eb17da12b816438a4d4c39fc330c4869cea1d 100644 | ||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java | ||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java | ||
@@ -1649,7 +1649,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa | ||
|
||
@DontObfuscate | ||
public String getServerModName() { | ||
- return "Paper"; //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! | ||
+ return "Sugarcane"; //Sugarcane > //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! | ||
} | ||
|
||
public SystemReport fillSystemReport(SystemReport systemreport) { | ||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java | ||
index 8a98bd1018afd934696fedbed24e271ab6b75f51..84c456ef6a375d84ab52e11a58a4e6fe602733c0 100644 | ||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java | ||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java | ||
@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper | ||
import javax.annotation.Nonnull; // Paper | ||
|
||
public final class CraftServer implements Server { | ||
- private final String serverName = "Paper"; // Paper | ||
+ private final String serverName = "Sugarcane"; // Sugarcane // Paper | ||
private final String serverVersion; | ||
private final String bukkitVersion = Versioning.getBukkitVersion(); | ||
private final Logger logger = Logger.getLogger("Minecraft"); |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.