From 8673e6ef53274e5d52c90cd186ff99ab0713f207 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Mon, 20 Jan 2025 23:36:14 -0500 Subject: [PATCH] [ci skip] cleanup --- leaf-api/paper-patches/features/0001-Rebrand.patch | 10 +++++----- .../features/0002-Leaf-config-files.patch | 6 +++--- .../features/0004-Purpur-API-Changes.patch | 8 ++++---- .../paper-patches/features/0005-Remove-Timings.patch | 12 ++++++------ .../features/0006-KeYi-Player-Skull-API.patch | 4 ++-- ...0008-Configurable-LibraryLoader-maven-repos.patch | 10 +++++----- leaf-server/build.gradle.kts.patch | 9 ++++++--- todos.md | 1 - 8 files changed, 31 insertions(+), 29 deletions(-) diff --git a/leaf-api/paper-patches/features/0001-Rebrand.patch b/leaf-api/paper-patches/features/0001-Rebrand.patch index a74b4259..bf6afbfb 100644 --- a/leaf-api/paper-patches/features/0001-Rebrand.patch +++ b/leaf-api/paper-patches/features/0001-Rebrand.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Rebrand diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java -index b68770f6992b044d13e67d9affa6933c90ca8fb8..184ed5a41a138d14757f12acd4ec3113cb165b72 100644 +index b68770f6992b044d13e67d9affa6933c90ca8fb8..6b2f6ab137ae37ff0db4827886614436b7ed5dcb 100644 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java @@ -26,6 +26,17 @@ public interface ServerBuildInfo { Key BRAND_GALE_ID = Key.key("galemc", "gale"); // Gale end - branding changes -+ // Leaf start ++ // Leaf start - Rebrand + /** + * The brand id for Pufferfish. + */ @@ -21,13 +21,13 @@ index b68770f6992b044d13e67d9affa6933c90ca8fb8..184ed5a41a138d14757f12acd4ec3113 + * The brand id for Leaf. + */ + Key BRAND_LEAF_ID = Key.key("winds-studio", "leaf"); -+ // Leaf end ++ // Leaf end - Rebrand + /** * Gets the {@code ServerBuildInfo}. * diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -index e64bb57f74e6d6f78927be228825b3e0bdf41f48..5bccca7740dbec750960d96d4d951cff5da688da 100644 +index e64bb57f74e6d6f78927be228825b3e0bdf41f48..2b544b03c16075123831de6997414507c38e8f66 100644 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java @@ -215,7 +215,7 @@ public class VersionCommand extends BukkitCommand { @@ -35,7 +35,7 @@ index e64bb57f74e6d6f78927be228825b3e0bdf41f48..5bccca7740dbec750960d96d4d951cff // Paper start if (version.startsWith("null")) { // running from ide? - setVersionMessage(Component.text("Unknown version, custom build?", NamedTextColor.YELLOW)); -+ setVersionMessage(Component.text("* Unknown version, custom build?", NamedTextColor.RED)); // Leaf - Purpur - Clean up version command output ++ setVersionMessage(Component.text("* Unknown version, custom build?", NamedTextColor.RED)); // Leaf - Rebrand - Purpur - Clean up version command output return; } setVersionMessage(getVersionFetcher().getVersionMessage(version)); diff --git a/leaf-api/paper-patches/features/0002-Leaf-config-files.patch b/leaf-api/paper-patches/features/0002-Leaf-config-files.patch index f8311314..2a68f024 100644 --- a/leaf-api/paper-patches/features/0002-Leaf-config-files.patch +++ b/leaf-api/paper-patches/features/0002-Leaf-config-files.patch @@ -5,20 +5,20 @@ Subject: [PATCH] Leaf config files diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 2dccd3f72e188a34c9cdf80816aadb0c79351279..331006b854dfe785c567baf8489afaac01a99cd0 100644 +index 2dccd3f72e188a34c9cdf80816aadb0c79351279..5e1cc13695ce58aadb882c03ed4259f8ad843730 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -2383,6 +2383,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi // Paper end -+ // Leaf start ++ // Leaf start - Leaf config - API + @NotNull + public org.bukkit.configuration.file.YamlConfiguration getLeafConfig() + { + throw new UnsupportedOperationException("Not supported yet."); + } -+ // Leaf end ++ // Leaf end - Leaf config - API + /** * Sends the component to the player diff --git a/leaf-api/paper-patches/features/0004-Purpur-API-Changes.patch b/leaf-api/paper-patches/features/0004-Purpur-API-Changes.patch index 64c2f118..015a2a4a 100644 --- a/leaf-api/paper-patches/features/0004-Purpur-API-Changes.patch +++ b/leaf-api/paper-patches/features/0004-Purpur-API-Changes.patch @@ -52,7 +52,7 @@ index f15a7b4471cd31a487467ec7ecf7a186fa887a51..f09fefe6821d8b2b8c8f055985bacc2e return GoalKey.of(type, NamespacedKey.minecraft(key)); } diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java -index 184ed5a41a138d14757f12acd4ec3113cb165b72..2240bb704dd9fa62836efa1b3d6ec4d7744d9b1d 100644 +index 6b2f6ab137ae37ff0db4827886614436b7ed5dcb..66a9fc729182476c4f601cdb32bcb10970a9498c 100644 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java @@ -26,6 +26,13 @@ public interface ServerBuildInfo { @@ -66,7 +66,7 @@ index 184ed5a41a138d14757f12acd4ec3113cb165b72..2240bb704dd9fa62836efa1b3d6ec4d7 + Key BRAND_PURPUR_ID = Key.key("purpurmc", "purpur"); + // Purpur end + - // Leaf start + // Leaf start - Rebrand /** * The brand id for Pufferfish. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java @@ -446,7 +446,7 @@ index 5622fe3165baad8138c22cfc016ed6c3834cf702..6d31b561d915180fcd473b317721064f + // Purpur end - OfflinePlayer API } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 331006b854dfe785c567baf8489afaac01a99cd0..335db5f0893df51c65c5aab7f11fd6aef59a191d 100644 +index 5e1cc13695ce58aadb882c03ed4259f8ad843730..02fb928e8c44bdbfc948079ccc2eba40c4621ae6 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -2383,6 +2383,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -465,7 +465,7 @@ index 331006b854dfe785c567baf8489afaac01a99cd0..335db5f0893df51c65c5aab7f11fd6ae + } + // Purpur end + - // Leaf start + // Leaf start - Leaf config - API @NotNull public org.bukkit.configuration.file.YamlConfiguration getLeafConfig() @@ -2740,4 +2752,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/leaf-api/paper-patches/features/0005-Remove-Timings.patch b/leaf-api/paper-patches/features/0005-Remove-Timings.patch index 5b65fc1a..37c32b8a 100644 --- a/leaf-api/paper-patches/features/0005-Remove-Timings.patch +++ b/leaf-api/paper-patches/features/0005-Remove-Timings.patch @@ -2954,7 +2954,7 @@ index 32c81559507a8e5085c91d466cda69d0dc11327e..7e9f1237f197094318fc41df2e2fa58f server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper throw new CommandException(msg, ex); diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 2e6d62c4f3687e299c34e876c503b400e13be05a..c3e239f70200aa89835f2bbbc7e4c61764ce8aed 100644 +index 2e6d62c4f3687e299c34e876c503b400e13be05a..e7f1a35610d53891d346a3284cca1bca8e53761d 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -61,7 +61,6 @@ public final class SimplePluginManager implements PluginManager { @@ -2975,7 +2975,7 @@ index 2e6d62c4f3687e299c34e876c503b400e13be05a..c3e239f70200aa89835f2bbbc7e4c617 - } else { - getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled)); - } -+ getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled)); ++ getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled)); // Leaf - Remove Timings } @NotNull @@ -2998,7 +2998,7 @@ index 2e6d62c4f3687e299c34e876c503b400e13be05a..c3e239f70200aa89835f2bbbc7e4c617 // Paper start diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 2fae50a9d1f0d9ecd91036697dedd64bc56f7d3b..2daf3d072e4441778ca566387d6a80d67e774a8b 100644 +index 2fae50a9d1f0d9ecd91036697dedd64bc56f7d3b..bf299cfe88c383d489de0c36fd9a4922cfeab572 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -39,11 +39,9 @@ import org.bukkit.plugin.PluginDescriptionFile; @@ -3026,7 +3026,7 @@ index 2fae50a9d1f0d9ecd91036697dedd64bc56f7d3b..2daf3d072e4441778ca566387d6a80d6 } - EventExecutor executor = new co.aikar.timings.TimedEventExecutor(new EventExecutor() { // Paper -+ EventExecutor executor = new EventExecutor() { ++ EventExecutor executor = new EventExecutor() { // Paper // Leaf - Remove Timings @Override public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException { // Paper try { @@ -3040,8 +3040,8 @@ index 2fae50a9d1f0d9ecd91036697dedd64bc56f7d3b..2daf3d072e4441778ca566387d6a80d6 - } else { - eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); - } -+ }; -+ eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); ++ }; // Paper // Leaf - Remove Timings ++ eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); // Leaf - Remove Timings } return ret; } diff --git a/leaf-api/paper-patches/features/0006-KeYi-Player-Skull-API.patch b/leaf-api/paper-patches/features/0006-KeYi-Player-Skull-API.patch index 807d30af..99ca4443 100644 --- a/leaf-api/paper-patches/features/0006-KeYi-Player-Skull-API.patch +++ b/leaf-api/paper-patches/features/0006-KeYi-Player-Skull-API.patch @@ -7,7 +7,7 @@ Original license: MIT Original project: https://github.com/KeYiMC/KeYi diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 886a954b1a12e895f5d54fd35a9acb36673e3733..02cf7995d15487a4958ba5a5a19018d24d707b80 100644 +index 886a954b1a12e895f5d54fd35a9acb36673e3733..1df8a2ceb4df1ea14d9d936a9389d9d44fd91b55 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -4021,4 +4021,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -32,5 +32,5 @@ index 886a954b1a12e895f5d54fd35a9acb36673e3733..02cf7995d15487a4958ba5a5a19018d2 + */ + @Deprecated(forRemoval = true) + CompletableFuture getSkullAsynchronously(); -+ // Leaf end - KeYi ++ // Leaf end - KeYi - Player Skull API } diff --git a/leaf-api/paper-patches/features/0008-Configurable-LibraryLoader-maven-repos.patch b/leaf-api/paper-patches/features/0008-Configurable-LibraryLoader-maven-repos.patch index 0cd3a7a5..2568be33 100644 --- a/leaf-api/paper-patches/features/0008-Configurable-LibraryLoader-maven-repos.patch +++ b/leaf-api/paper-patches/features/0008-Configurable-LibraryLoader-maven-repos.patch @@ -9,7 +9,7 @@ Add JVM flag `-DLeaf.library-download-repo=link` to choose library download repo e.g. `-DLeaf.library-download-repo=https://maven.aliyun.com/repository/public` diff --git a/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java b/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java -index 107705db2d82b7c191e5e625ec888e0bc3b03831..81d7b0d1a9f5e1f6e55e0d6a61ce1433825ef414 100644 +index 107705db2d82b7c191e5e625ec888e0bc3b03831..77a58fc7c173b1724d44b0eeaf23b4a1b22b5fcb 100644 --- a/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java +++ b/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java @@ -105,7 +105,7 @@ public class MavenLibraryResolver implements ClassPathLibrary { @@ -17,12 +17,12 @@ index 107705db2d82b7c191e5e625ec888e0bc3b03831..81d7b0d1a9f5e1f6e55e0d6a61ce1433 */ public void addRepository(final RemoteRepository remoteRepository) { - this.repositories.add(remoteRepository); -+ this.repositories.add(org.dreeam.leaf.plugin.loader.MavenCentralMirror.getCentralRepo(remoteRepository)); // Leaf - Configurable maven repos ++ this.repositories.add(org.dreeam.leaf.plugin.loader.MavenCentralMirror.getCentralRepo(remoteRepository)); // Leaf - Configurable LibraryLoader maven repos } /** diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java -index 211c093ce2253e918cd40725ebf1ef172d1b9bdf..5acd7cd09e9bdc26de443d166b193e163aae0188 100644 +index 211c093ce2253e918cd40725ebf1ef172d1b9bdf..096140a91f19eb31a10631b949f4402e37e1c601 100644 --- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java +++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java @@ -79,7 +79,19 @@ public class LibraryLoader @@ -30,7 +30,7 @@ index 211c093ce2253e918cd40725ebf1ef172d1b9bdf..5acd7cd09e9bdc26de443d166b193e16 session.setReadOnly(); - this.repositories = repository.newResolutionRepositories( session, Arrays.asList( new RemoteRepository.Builder( "central", "default", "https://repo.maven.apache.org/maven2" ).build() ) ); -+ // Leaf start - Configurable maven repos ++ // Leaf start - Configurable LibraryLoader maven repos + this.repositories = repository.newResolutionRepositories( + session, + List.of(org.dreeam.leaf.plugin.loader.MavenCentralMirror.getCentralRepo("https://repo.maven.apache.org/maven2")) @@ -42,7 +42,7 @@ index 211c093ce2253e918cd40725ebf1ef172d1b9bdf..5acd7cd09e9bdc26de443d166b193e16 + new RemoteRepository.Builder("tencentclound", "default", "https://mirrors.cloud.tencent.com/nexus/repository/maven-public/").build(), + new RemoteRepository.Builder("huaweicloud", "default", "https://repo.huaweicloud.com/repository/maven/").build() + ));*/ -+ // Leaf end - Configurable maven repos ++ // Leaf end - Configurable LibraryLoader maven repos } @Nullable diff --git a/leaf-server/build.gradle.kts.patch b/leaf-server/build.gradle.kts.patch index 1a57ec90..7791b7d4 100644 --- a/leaf-server/build.gradle.kts.patch +++ b/leaf-server/build.gradle.kts.patch @@ -68,7 +68,7 @@ } } -@@ -147,10 +_,19 @@ +@@ -147,10 +_,20 @@ } dependencies { @@ -83,6 +83,7 @@ + implementation("org.lz4:lz4-java:1.8.0") // LinearPaper + implementation("com.github.ben-manes.caffeine:caffeine:3.1.8") + // Leaf end - Libraries ++ implementation("ca.spottedleaf:concurrentutil:0.0.3") - implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ - implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 @@ -91,7 +92,7 @@ implementation("net.minecrell:terminalconsoleappender:1.3.0") implementation("net.kyori:adventure-text-serializer-ansi:4.18.0") // Keep in sync with adventureVersion from Paper-API build file -@@ -160,35 +_,47 @@ +@@ -160,35 +_,49 @@ all its classes to check if they are plugins. Scanning takes about 1-2 seconds so adding this speeds up the server start. */ @@ -100,6 +101,7 @@ + // Leaf start - Bump Dependencies + implementation("org.apache.logging.log4j:log4j-core:2.24.3") + log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.24.3") // Needed to generate meta for our Log4j plugins ++ // Leaf end - Bump Dependencies runtimeOnly(log4jPlugins.output) alsoShade(log4jPlugins.output) @@ -108,6 +110,7 @@ } - implementation("io.netty:netty-codec-haproxy:4.1.115.Final") // Add support for proxy protocol - implementation("org.apache.logging.log4j:log4j-iostreams:2.24.1") ++ // Leaf start - Bump Dependencies + implementation("io.netty:netty-codec-haproxy:4.1.116.Final") // Add support for proxy protocol + implementation("org.apache.logging.log4j:log4j-iostreams:2.24.3") + // Leaf end - Bump Dependencies @@ -129,9 +132,9 @@ - testImplementation("org.hamcrest:hamcrest:2.2") - testImplementation("org.mockito:mockito-core:5.14.1") - mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Configure mockito agent that is needed in newer java versions ++ // Leaf start - Bump Dependencies + runtimeOnly("com.lmax:disruptor:3.4.4") // Dreeam TODO - Waiting Log4j 3.x to support disruptor 4.0.0 + -+ // Leaf start - Bump Dependencies + runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.9") + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.22") // Dreeam TODO - Update to 2.0.1 + runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.22") // Dreeam TODO - Update to 2.0.1 diff --git a/todos.md b/todos.md index cdfb32b8..8f6be409 100644 --- a/todos.md +++ b/todos.md @@ -5,7 +5,6 @@ - [ ] check reduce array allocation, whether need do clone for some reference, to prevent potential issues.. or add debug command for debugging?. # Leaf TODOs -- [ ] Check Fix MC-65198 fix - [ ] refactor leaves protocol manager opt and pr it. - [ ] check multithreaded tracker, that moonrise change - [ ] Check and apply work patches