diff --git a/build.gradle.kts b/build.gradle.kts index 0af5900bf..d7b336e45 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,7 +54,7 @@ subprojects { } paperweight { - serverProject = project(":forktest-server") + serverProject = project(":onelitepaper-server") remapRepo = paperMavenPublicUrl decompileRepo = paperMavenPublicUrl @@ -62,10 +62,10 @@ paperweight { usePaperUpstream(providers.gradleProperty("paperRef")) { withPaperPatcher { apiPatchDir = layout.projectDirectory.dir("patches/api") - apiOutputDir = layout.projectDirectory.dir("forktest-api") + apiOutputDir = layout.projectDirectory.dir("onelitepaper-api") serverPatchDir = layout.projectDirectory.dir("patches/server") - serverOutputDir = layout.projectDirectory.dir("forktest-server") + serverOutputDir = layout.projectDirectory.dir("onelitepaper-server") } patchTasks.register("generatedApi") { @@ -82,7 +82,7 @@ paperweight { // tasks.generateDevelopmentBundle { - apiCoordinates = "com.example.paperfork:forktest-api" + apiCoordinates = "net.onelitefeather.onelitepaper:onelitepaper-api" mojangApiCoordinates = "io.papermc.paper:paper-mojangapi" libraryRepositories = listOf( "https://repo.maven.apache.org/maven2/", diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index c801e6052..15c5eec10 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,34 +5,36 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 58da26ad2f128ba0b66f86820f60853f4be352f0..c23e342dcb54d51bd4460a89cb315856b73b63b3 100644 +index 58da26ad2f128ba0b66f86820f60853f4be352f0..a75ef4232a52fc0384e3e24e294e53f21d8488a9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { +@@ -13,8 +13,14 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { val alsoShade: Configuration by configurations.creating dependencies { - implementation(project(":paper-api")) - implementation(project(":paper-mojangapi")) -+ // ForkTest start -+ implementation(project(":forktest-api")) ++ // OneLitePaper start ++ implementation(project(":onelitepaper-api")) + implementation("io.papermc.paper:paper-mojangapi:1.20.2-R0.1-SNAPSHOT") { + exclude("io.papermc.paper", "paper-api") + } -+ // ForkTest end ++ implementation("com.fasterxml.jackson.core:jackson-core:2.22.1") ++ implementation("com.fasterxml.jackson.core:jackson-databind:2.22.1") ++ // OneLitePaper end // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -70,7 +74,7 @@ tasks.jar { +@@ -70,7 +76,7 @@ tasks.jar { 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-Version" to "git-OneLitePaper-$implementationVersion", // OneLitePaper "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -154,7 +158,7 @@ fun TaskContainer.registerRunTask( +@@ -154,7 +160,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -42,7 +44,7 @@ index 58da26ad2f128ba0b66f86820f60853f4be352f0..c23e342dcb54d51bd4460a89cb315856 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..eb6b51d5799c677e00ec132078c9305fbc6cccb6 100644 +index 34f19ac897a30c0c4e3ab406013fcca1c8b7db93..4a0291aa52bf3e07aa4e6a7423917112257264bf 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 "ForkTest"; // ForkTest - ForkTest > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! ++ 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..2005d2b42e390e0bf6928285b393ea47d0c6e333 100644 +index 142d2c48239d4ebe3896218536656d116cd24d7c..4534df461217fe60895fc937aad79cb59462713c 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 @@ -63,12 +65,12 @@ index 142d2c48239d4ebe3896218536656d116cd24d7c..2005d2b42e390e0bf6928285b393ea47 public final class CraftServer implements Server { - private final String serverName = "Paper"; // Paper -+ private final String serverName = "ForkTest"; // ForkTest // Paper ++ private final String serverName = "OneLitePaper"; // OneLitePaper // Paper private final String serverVersion; private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); 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 +index 774556a62eb240da42e84db4502e2ed43495be17..cd6a4b0d320420162e1f6cba428bbd6f8ab88e7f 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 { @@ -76,7 +78,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..21f39bd0c33ef2635249298e6a247afb 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 ++ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/net.onelitefeather.onelitepaper/onelitefeather-api/pom.properties"); // OneLitePaper Properties properties = new Properties(); if (stream != null) { diff --git a/settings.gradle.kts b/settings.gradle.kts index e117e1279..d99102445 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,6 +9,6 @@ plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" } -rootProject.name = "forktest" +rootProject.name = "OneLitePaper" -include("forktest-api", "forktest-server") +include("onelitepaper-api", "onelitepaper-server")