diff --git a/build.gradle.kts b/build.gradle.kts index 7c8db39..4454c96 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java `maven-publish` - id("io.papermc.paperweight.patcher") version "1.6.3" + id("io.papermc.paperweight.patcher") version "1.7.1" } val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" @@ -56,17 +56,6 @@ subprojects { } -tasks.generateDevelopmentBundle { - apiCoordinates.set("me.earthme.luminol:luminol-api") - mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi") - libraryRepositories.set( - listOf( - "https://repo.maven.apache.org/maven2/", - "https://maven.pkg.github.com/LuminolMC/Luminol", - ) - ) -} - paperweight { serverProject.set(project(":luminol-server")) @@ -100,9 +89,9 @@ paperweight { tasks.generateDevelopmentBundle { apiCoordinates.set("me.earthme.luminol:luminol-api") - mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi") libraryRepositories.addAll( "https://repo.maven.apache.org/maven2/", + "https://maven.pkg.github.com/LuminolMC/Luminol", paperMavenPublicUrl, ) } diff --git a/gradle.properties b/gradle.properties index 3329d4f..bc027d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = me.earthme.luminol version = 1.20.6-R0.1-SNAPSHOT -foliaCommit = b1bfe7b55f33db5a9d68169f7e0a3503cad066ff +foliaCommit = 78f49e0ce3b65afb8b5c949f55c3a2ffa669dfad org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Fix-build.patch b/patches/server/0001-Fix-build.patch index 9925338..36fa491 100644 --- a/patches/server/0001-Fix-build.patch +++ b/patches/server/0001-Fix-build.patch @@ -5,24 +5,15 @@ Subject: [PATCH] Fix build diff --git a/build.gradle.kts b/build.gradle.kts -index b1d621ed91c74790fd5b66339c044ec444de62ef..fee54ed7abfc93f8fd911aea6831988e3699f762 100644 +index eb2f9941b24af591f1e56339b97f5284a765cf81..32bfe781e5298e5ad1bd2ed4471fb824c49f0ab4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -13,7 +13,7 @@ val alsoShade: Configuration by configurations.creating +@@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { + val alsoShade: Configuration by configurations.creating dependencies { - // Folia start -- implementation(project(":folia-api")) -+ implementation(project(":luminol-api"))//Luminol - implementation("io.papermc.paper:paper-mojangapi:${project.version}") { - exclude("io.papermc.paper", "paper-api") - } -@@ -83,7 +83,7 @@ tasks.jar { - attributes( - "Main-Class" to "org.bukkit.craftbukkit.Main", - "Implementation-Title" to "CraftBukkit", -- "Implementation-Version" to "git-Folia-$implementationVersion", // Folia -+ "Implementation-Version" to "git-Luminol-$implementationVersion", // Folia //Luminol - "Implementation-Vendor" to date, // Paper - "Specification-Title" to "Bukkit", - "Specification-Version" to project.version, +- implementation(project(":folia-api")) // Folia ++ implementation(project(":luminol-api")) // Folia // Luminol + // Paper start + implementation("org.jline:jline-terminal-jansi:3.21.0") + implementation("net.minecrell:terminalconsoleappender:1.3.0") diff --git a/patches/server/0002-Rebrand-to-Luminol.patch b/patches/server/0002-Rebrand-to-Luminol.patch index 3885d54..ce430eb 100644 --- a/patches/server/0002-Rebrand-to-Luminol.patch +++ b/patches/server/0002-Rebrand-to-Luminol.patch @@ -4,6 +4,30 @@ Date: Tue, 6 Feb 2024 01:35:36 +0000 Subject: [PATCH] Rebrand to Luminol +diff --git a/build.gradle.kts b/build.gradle.kts +index 32bfe781e5298e5ad1bd2ed4471fb824c49f0ab4..f9919b9da90317bd615d7e57607df73ebcc1d077 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -80,14 +80,14 @@ tasks.jar { + val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper + attributes( + "Main-Class" to "org.bukkit.craftbukkit.Main", +- "Implementation-Title" to "Folia", // Folia ++ "Implementation-Title" to "Luminol", // Folia // Luminol + "Implementation-Version" to implementationVersion, + "Implementation-Vendor" to date, // Paper +- "Specification-Title" to "Folia", // Folia ++ "Specification-Title" to "Luminol", // Folia // Luminol + "Specification-Version" to project.version, +- "Specification-Vendor" to "Paper Team", +- "Brand-Id" to "papermc:folia", // Folia +- "Brand-Name" to "Folia", // Folia ++ "Specification-Vendor" to "LuminolMC Team", // Luminol ++ "Brand-Id" to "luminolmc:luminol", // Folia // Luminol ++ "Brand-Name" to "Luminol", // Folia // Luminol + "Build-Number" to (build ?: ""), + "Build-Time" to Instant.now().toString(), + "Git-Branch" to gitBranch, // Paper diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java index cb60d58d4a7556dd896f31d0cd249f860bb3ef84..b52a805150e95d7d27403d3c18088b335a355011 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java @@ -27,55 +51,43 @@ index cb60d58d4a7556dd896f31d0cd249f860bb3ef84..b52a805150e95d7d27403d3c18088b33 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index e2f704c115fd6e00960bb56bb0779f1100c89c17..7707908064a75ecf02677a0110207e194c3eefd1 100644 +index 29bd788ae8bc61c1e62a4f84b9e259931a7041ce..2f37873738ab542980d13f36356b04b4904e625b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -@@ -20,7 +20,7 @@ import java.util.stream.StreamSupport; - public class PaperVersionFetcher implements VersionFetcher { - private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end - private static final String GITHUB_BRANCH_NAME = "master"; +@@ -35,7 +35,7 @@ public class PaperVersionFetcher implements VersionFetcher { + private static final Logger LOGGER = LogUtils.getClassLogger(); + private static final int DISTANCE_ERROR = -1; + private static final int DISTANCE_UNKNOWN = -2; - private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper"; + private static final String DOWNLOAD_PAGE = "https://github.com/LuminolMC/Luminol"; //Luminol - private static @Nullable String mcVer; @Override -@@ -31,8 +31,8 @@ public class PaperVersionFetcher implements VersionFetcher { - @Nonnull - @Override - public Component getVersionMessage(@Nonnull String serverVersion) { -- String[] parts = serverVersion.substring("git-Folia-".length()).split("[-\\s]"); // Folia -- final Component updateMessage = getUpdateStatusMessage("PaperMC/Folia", GITHUB_BRANCH_NAME, parts[0]); // Folia -+ String[] parts = serverVersion.substring("git-Luminol-".length()).split("[-\\s]"); // Folia //Luminol -+ final Component updateMessage = getUpdateStatusMessage("LuminolMC/Luminol", GITHUB_BRANCH_NAME, parts[0]); // Folia //Luminol - final Component history = getHistory(); + public long getCacheTime() { +@@ -49,7 +49,7 @@ public class PaperVersionFetcher implements VersionFetcher { + if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) { + updateMessage = text("You are running a development version without access to version information", color(0xFF5300)); + } else { +- updateMessage = getUpdateStatusMessage("PaperMC/Folia", build); // Folia ++ updateMessage = getUpdateStatusMessage("LuminolMC/Luminol", build); // Folia // Luminol + } + final @Nullable Component history = this.getHistory(); - return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage; -diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 49a121862fbb823a00753d99d24d04c87479fcd1..f5ea50264613e7f739bbcf53c3be0d0305fd337e 100644 ---- a/src/main/java/net/minecraft/server/MinecraftServer.java -+++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2020,7 +2020,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop= KEEPALIVE_LIMIT) { // Paper - check keepalive limit, don't fire if already disconnected - if (this.keepAlivePending && !this.processedDisconnect) { // Paper + if (!this.isSingleplayerOwner() && elapsedTime >= 15000L) { // Paper - use vanilla's 15000L between keep alive packets + if (this.keepAlivePending && !this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // Paper - check keepalive limit, don't fire if already disconnected this.disconnect(ServerCommonPacketListenerImpl.TIMEOUT_DISCONNECTION_MESSAGE, org.bukkit.event.player.PlayerKickEvent.Cause.TIMEOUT); // Paper - kick event cause @@ -275,6 +300,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack } diff --git a/patches/server/0051-KioCG-Chunk-API.patch b/patches/server/0051-KioCG-Chunk-API.patch index a2f3278..3e6005d 100644 --- a/patches/server/0051-KioCG-Chunk-API.patch +++ b/patches/server/0051-KioCG-Chunk-API.patch @@ -102,10 +102,10 @@ index 0000000000000000000000000000000000000000..53b4397997bc9b9b9d88e48304b37a25 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b4b7f58d6780277c0dfaee22136885fa32e67761..5c3dd60a4921f6cba5061118794124318fa17c5b 100644 +index 97016c309d0a0fc13d733269f7dfb81ca0d8c574..e169a9d4c2e633fdba3fe425e2f3f766d2200af5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1700,6 +1700,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop