From 4ef78b53da98a6606162dce0d20951d6eadca4af Mon Sep 17 00:00:00 2001 From: TheMeinerLP Date: Sun, 17 Mar 2024 19:47:07 +0100 Subject: [PATCH] Update paper ref --- gradle.properties | 2 +- patches/server/0001-Build-changes.patch | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index a4d0b8ad2..f5ab8c77b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=net.onelitefeather.onelitepaper version=1.20.4-R0.1-SNAPSHOT mcVersion=1.20.4 -paperRef=07b956e3a30d9cd192111829b59bdf4372f128b1 +paperRef=99a641690abd3d3669249ce10243e0739a13af33 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index b5da1a994..552c13570 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 58da26ad2f128ba0b66f86820f60853f4be352f0..ca7122d119d5e1ab39198b1df646037b6270d424 100644 +index 241808d8619e17c0681f79acbbc98af5bf52dd89..ff08c83ec5d614f93e53d31278a342e317e0270b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,8 +13,14 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { @@ -25,7 +25,7 @@ index 58da26ad2f128ba0b66f86820f60853f4be352f0..ca7122d119d5e1ab39198b1df646037b // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -70,7 +76,7 @@ tasks.jar { +@@ -71,7 +77,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -34,7 +34,7 @@ index 58da26ad2f128ba0b66f86820f60853f4be352f0..ca7122d119d5e1ab39198b1df646037b "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -154,7 +160,7 @@ fun TaskContainer.registerRunTask( +@@ -155,7 +161,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -44,23 +44,23 @@ index 58da26ad2f128ba0b66f86820f60853f4be352f0..ca7122d119d5e1ab39198b1df646037b 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 34f19ac897a30c0c4e3ab406013fcca1c8b7db93..4a0291aa52bf3e07aa4e6a7423917112257264bf 100644 +index 93b661e9cb7743aeff7da3972942cb73049a5e4c..5579fcac510f8ac0e09bce548ed6ea58c8f61d57 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1866,7 +1866,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop // Spigot - Spigot > // CraftBukkit - cb > vanilla! +- return "Paper"; // Paper + return "OneLitePaper"; // OneLitePaper - OneLitePaper > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! } 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 142d2c48239d4ebe3896218536656d116cd24d7c..4534df461217fe60895fc937aad79cb59462713c 100644 +index c490a29bcf7410bc54959ee71375605964379ed5..00e9bcd25ef13778509b909a4034fdd04559501d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper +@@ -266,7 +266,7 @@ import javax.annotation.Nullable; // Paper import javax.annotation.Nonnull; // Paper public final class CraftServer implements Server {