diff --git a/patches/server/0002-Use-Gradle-Version-Catalogs.patch b/patches/server/0002-Use-Gradle-Version-Catalogs.patch new file mode 100644 index 0000000..4f1b09e --- /dev/null +++ b/patches/server/0002-Use-Gradle-Version-Catalogs.patch @@ -0,0 +1,89 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: AlphaKR93 +Date: Sun, 14 Jan 2024 19:51:19 +0900 +Subject: [PATCH] Use Gradle Version Catalogs + + +diff --git a/build.gradle.kts b/build.gradle.kts +index 81996f00384674b29368e8bea944bdd14d631da3..176f07b1ce1d037880ea7b56d354281d3f89b11a 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -18,57 +18,29 @@ dependencies { + exclude("io.papermc.paper", "paper-api") + } + // Purpur end +- // Paper start +- implementation("org.jline:jline-terminal-jansi:3.21.0") +- implementation("net.minecrell:terminalconsoleappender:1.3.0") +- implementation("net.kyori:adventure-text-serializer-ansi:4.16.0") // Keep in sync with adventureVersion from Paper-API build file +- /* +- Required to add the missing Log4j2Plugins.dat file from log4j-core +- which has been removed by Mojang. Without it, log4j has to classload +- all its classes to check if they are plugins. +- Scanning takes about 1-2 seconds so adding this speeds up the server start. +- */ +- implementation("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - implementation +- log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins ++ ++ // Plazma start - Use Gradle Version Catalogs ++ implementation(project(":plazma-api")) ++ implementation(project(":plazma-mojangapi")) ++ implementation(server.bundles.implementation) ++ implementation(common.asm.commons) ++ implementation(common.log4j.iostreams) ++ implementation(common.commons.lang2) ++ implementation(server.velocity) { isTransitive = false } ++ ++ runtimeOnly(common.maven.provider) ++ runtimeOnly(common.bundles.maven) ++ runtimeOnly(server.bundles.runtime) ++ ++ implementation(common.log4j.core) // Paper - implementation ++ log4jPlugins.annotationProcessorConfigurationName(common.log4j.core) // Paper - Needed to generate meta for our Log4j plugins + runtimeOnly(log4jPlugins.output) + alsoShade(log4jPlugins.output) +- implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol +- // Paper end +- implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion +- implementation("org.ow2.asm:asm-commons:9.7") +- implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files +- implementation("commons-lang:commons-lang:2.6") +- runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0") +- runtimeOnly("com.mysql:mysql-connector-j:8.3.0") +- runtimeOnly("com.lmax:disruptor:3.4.4") // Paper +- // Paper start - Use Velocity cipher +- implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") { +- isTransitive = false +- } +- // Paper end - Use Velocity cipher +- +- runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6") +- runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") +- runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") +- +- implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur +- implementation("org.mozilla:rhino-engine:1.7.14") // Purpur +- implementation("dev.omega24:upnp4j:1.0") // Purpur +- +- testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test +- testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") +- testImplementation("org.hamcrest:hamcrest:2.2") +- testImplementation("org.mockito:mockito-core:5.11.0") +- testImplementation("org.ow2.asm:asm-tree:9.7") +- testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest +- implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling +- implementation("net.neoforged:AutoRenamingTool:2.0.3") // Paper - remap plugins +- // Paper start - Remap reflection +- val reflectionRewriterVersion = "0.0.1" +- implementation("io.papermc:reflection-rewriter:$reflectionRewriterVersion") +- implementation("io.papermc:reflection-rewriter-runtime:$reflectionRewriterVersion") +- implementation("io.papermc:reflection-rewriter-proxy-generator:$reflectionRewriterVersion") +- // Paper end - Remap reflection ++ ++ testImplementation(server.bundles.test) ++ testImplementation(common.bundles.test) ++ // Plazma end - Use Gradle Version Catalogs ++ + } + + paperweight { diff --git a/patches/server/0004-Rebrand.patch b/patches/server/0003-Rebrand.patch similarity index 86% rename from patches/server/0004-Rebrand.patch rename to patches/server/0003-Rebrand.patch index ce1423a..4537509 100644 --- a/patches/server/0004-Rebrand.patch +++ b/patches/server/0003-Rebrand.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand diff --git a/build.gradle.kts b/build.gradle.kts -index b97182b806fddf53ddcdbe57a43500d36e97e2a4..055627fc478a3e64b0e0644cbd9ef4cf5438c696 100644 +index 176f07b1ce1d037880ea7b56d354281d3f89b11a..e2c178e4136fa99427f4e394da363caf7872edcd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -13,12 +13,10 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { +@@ -12,12 +12,6 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { val alsoShade: Configuration by configurations.creating dependencies { @@ -18,24 +18,20 @@ index b97182b806fddf53ddcdbe57a43500d36e97e2a4..055627fc478a3e64b0e0644cbd9ef4cf - exclude("io.papermc.paper", "paper-api") - } - // Purpur end -+ // Plazma start - Branding -+ implementation(project(":plazma-api")) -+ implementation(project(":plazma-mojangapi")) -+ // Plazma end - Branding - // Plazma start - Use Gradle version catalogs - /* - // Paper start -@@ -118,7 +116,7 @@ tasks.jar { + + // Plazma start - Use Gradle Version Catalogs + implementation(project(":plazma-api")) +@@ -59,7 +53,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", - "Implementation-Version" to "git-Purpur-$implementationVersion", // Pufferfish // Purpur -+ "Implementation-Version" to "git-Plazma-$implementationVersion", // Pufferfish // Purpur // Plazma - Setup Gradle Project ++ "Implementation-Version" to "git-Plazma-$implementationVersion", // Pufferfish // Purpur // Plazma - Rebrand "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..0b3d87d2d43148e6370e7a03e0bb6074891ac800 100644 +index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..1de03b16c513d83550077bab46b52ae6e40eb98e 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -593,7 +593,7 @@ public class Metrics { @@ -43,7 +39,7 @@ index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..0b3d87d2d43148e6370e7a03e0bb6074 // Only start Metrics, if it's enabled in the config if (config.getBoolean("enabled", true)) { - Metrics metrics = new Metrics("Purpur", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur -+ Metrics metrics = new Metrics("Plazma", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur // Plazma - Branding ++ Metrics metrics = new Metrics("Plazma", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur // Plazma - Rebrand metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { String minecraftVersion = Bukkit.getVersion(); @@ -52,12 +48,12 @@ index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..0b3d87d2d43148e6370e7a03e0bb6074 metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size())); metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() ? "bungee" : "offline"))); // Purpur - metrics.addCustomChart(new Metrics.SimplePie("purpur_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur -+ metrics.addCustomChart(new Metrics.SimplePie("plazma_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur // Plazma // Plazma - Branding ++ metrics.addCustomChart(new Metrics.SimplePie("plazma_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur // Plazma // Plazma - Rebrand 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 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b04d3eea789f77b2435cb0192635f1be1bab597d 100644 +index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..523b87063a5fde4f212222710fbcf14c37abd232 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -20,10 +20,11 @@ import java.util.stream.StreamSupport; @@ -65,7 +61,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b04d3eea789f77b2435cb0192635f1be 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 // Purpur start - private static final String DOWNLOAD_PAGE = "https://purpurmc.org/downloads"; -+ private static final String DOWNLOAD_PAGE = "https://github.com/PlazmaMC/Plazma/releases"; // Plazma // Plazma - Branding ++ private static final String DOWNLOAD_PAGE = "https://github.com/PlazmaMC/Plazma/releases"; // Plazma // Plazma - Rebrand private static int distance = -2; public int distance() { return distance; } // Purpur end private static @Nullable String mcVer; @@ -79,8 +75,8 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b04d3eea789f77b2435cb0192635f1be public Component getVersionMessage(@Nonnull String serverVersion) { - String[] parts = serverVersion.substring("git-Purpur-".length()).split("[-\\s]"); // Purpur - final Component updateMessage = getUpdateStatusMessage("PurpurMC/Purpur", "ver/" + getMinecraftVersion(), parts[0]); // Purpur -+ String[] parts = serverVersion.substring("git-Plazma-".length()).split("[-\\s]"); // Purpur // Plazma // Plazma - Branding -+ final Component updateMessage = getUpdateStatusMessage("PlazmaMC/PlazmaBukkit", (DEVELOPMENT ? "dev/" : "ver/") + getMinecraftVersion(), parts[0]); // Purpur // Plazma // Plazma - Branding ++ String[] parts = serverVersion.substring("git-Plazma-".length()).split("[-\\s]"); // Purpur // Plazma // Plazma - Rebrand ++ final Component updateMessage = getUpdateStatusMessage("PlazmaMC/PlazmaBukkit", (DEVELOPMENT ? "dev/" : "ver/") + getMinecraftVersion(), parts[0]); // Purpur // Plazma // Plazma - Rebrand final Component history = getHistory(); return history != null ? Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()), history, updateMessage) : updateMessage; // Purpur @@ -89,7 +85,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b04d3eea789f77b2435cb0192635f1be mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-' } else { - org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to Purpur!"); // Purpur -+ org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to Plazma!"); // Purpur // Plazma // Plazma - Branding ++ org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to Plazma!"); // Purpur // Plazma // Plazma - Rebrand org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString()); org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion()); } @@ -130,7 +126,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b04d3eea789f77b2435cb0192635f1be // Contributed by Techcable in GH-65 private static int fetchDistanceFromGitHub(@Nonnull String repo, @Nonnull String branch, @Nonnull String hash) { diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -index 3cb56595822799926a8141e60a42f5d1edfc6de5..3e32c28e1d4c157a2f00dbc6d6e9d71cb3b8f6b7 100644 +index 3cb56595822799926a8141e60a42f5d1edfc6de5..aa5f7dbaa62d83168055f2d389ba1ed512d1741b 100644 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole { @@ -138,12 +134,12 @@ index 3cb56595822799926a8141e60a42f5d1edfc6de5..3e32c28e1d4c157a2f00dbc6d6e9d71c protected LineReader buildReader(LineReaderBuilder builder) { builder - .appName("Purpur") // Purpur -+ .appName("Plazma") // Purpur // Plazma - Branding ++ .appName("Plazma") // Purpur // Plazma - Rebrand .variable(LineReader.HISTORY_FILE, java.nio.file.Paths.get(".console_history")) .completer(new ConsoleCommandCompleter(this.server)) .option(LineReader.Option.COMPLETE_IN_WORD, true); diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java -index f91ea723a1c85f6cf8c4f6dd7f182b948c2f2e81..c5a3f9c2daf3da135cccecb757353534e1688821 100644 +index c366d84518979e842a6f10f969a5951539ecac93..570b379596cc3088745d3f42b3d917f94c2d9c29 100644 --- a/src/main/java/net/minecraft/CrashReport.java +++ b/src/main/java/net/minecraft/CrashReport.java @@ -37,7 +37,7 @@ public class CrashReport { @@ -151,7 +147,7 @@ index f91ea723a1c85f6cf8c4f6dd7f182b948c2f2e81..c5a3f9c2daf3da135cccecb757353534 this.title = message; this.exception = cause; - this.systemReport.setDetail("CraftBukkit Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit -+ this.systemReport.setDetail("Plazma Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit // Plazma - Branding ++ this.systemReport.setDetail("Plazma Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit // Plazma - Rebrand } public String getTitle() { @@ -160,19 +156,19 @@ index f91ea723a1c85f6cf8c4f6dd7f182b948c2f2e81..c5a3f9c2daf3da135cccecb757353534 // Purpur start stringbuilder.append("// "); - stringbuilder.append("// DO NOT REPORT THIS TO PAPER! REPORT TO PURPUR INSTEAD!"); -+ stringbuilder.append("// DO NOT REPORT THIS TO PAPER OR PURPUR! REPORT TO PLAZMA INSTEAD!"); // Plazma - Branding ++ stringbuilder.append("// DO NOT REPORT THIS TO PAPER OR PURPUR! REPORT TO PLAZMA INSTEAD!"); // Plazma - Rebrand // Purpur end stringbuilder.append("// "); stringbuilder.append(CrashReport.getErrorComment()); diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 4ef8eaad4485a2ee920f80556f9dda04e59d2b2a..b91c3b8ca8f840335ba6470658d82c5d71bb75e1 100644 +index 411f1f8c6be072cfc5ba88cbec38dbc4300a41d1..d06b81b7c72f4cd7f6212c470fa0e7d620054122 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java -@@ -105,6 +105,18 @@ public class Main { +@@ -107,6 +107,16 @@ public class Main { */ // CraftBukkit end try { -+ // Plazma start - Branding ++ // Plazma start - Rebrand + System.out.println(""" + \033[38;2;236;61;151m┏\033[38;2;236;61;157m━\033[38;2;237;62;163m━\033[38;2;237;62;169m━\033[38;2;238;62;175m━\033[38;2;238;63;181m━\033[38;2;239;63;187m┓\033[38;2;239;63;193m \033[38;2;239;64;200m┏\033[38;2;240;64;206m━\033[38;2;240;64;212m┓\033[38;2;241;65;218m \033[38;2;241;65;224m \033[38;2;242;65;230m \033[38;2;242;66;236m \033[38;2;242;66;242m \033[38;2;237;66;243m \033[38;2;232;67;243m┏\033[38;2;227;67;244m━\033[38;2;221;67;244m━\033[38;2;216;68;244m━\033[38;2;211;68;245m━\033[38;2;205;69;245m┓\033[38;2;200;69;246m \033[38;2;195;69;246m┏\033[38;2;189;70;246m━\033[38;2;184;70;247m━\033[38;2;179;70;247m━\033[38;2;173;71;247m━\033[38;2;168;71;248m━\033[38;2;163;72;248m━\033[38;2;157;72;249m┓\033[38;2;152;72;249m┏\033[38;2;147;73;249m━\033[38;2;141;73;250m━\033[38;2;136;74;250m┓\033[38;2;131;74;250m \033[38;2;125;74;251m \033[38;2;120;75;251m \033[38;2;115;75;251m┏\033[38;2;109;76;252m━\033[38;2;104;76;252m━\033[38;2;99;77;252m┓\033[38;2;94;77;253m \033[38;2;88;77;253m┏\033[38;2;83;78;253m━\033[38;2;78;79;254m━\033[38;2;79;85;254m━\033[38;2;79;91;254m━\033[38;2;80;97;255m┓\033[38;2;80;103;255m\s + \033[38;2;236;61;151m┃\033[38;2;236;61;157m┏\033[38;2;237;62;163m━\033[38;2;237;62;169m━\033[38;2;238;62;175m━\033[38;2;238;63;181m┓\033[38;2;239;63;187m┗\033[38;2;239;63;193m┓\033[38;2;239;64;200m┃\033[38;2;240;64;206m \033[38;2;240;64;212m┃\033[38;2;241;65;218m \033[38;2;241;65;224m \033[38;2;242;65;230m \033[38;2;242;66;236m \033[38;2;242;66;242m \033[38;2;237;66;243m┏\033[38;2;232;67;243m┛\033[38;2;227;67;244m┏\033[38;2;221;67;244m━\033[38;2;216;68;244m━\033[38;2;211;68;245m┓\033[38;2;205;69;245m┗\033[38;2;200;69;246m┓\033[38;2;195;69;246m┗\033[38;2;189;70;246m━\033[38;2;184;70;247m━\033[38;2;179;70;247m┓\033[38;2;173;71;247m \033[38;2;168;71;248m \033[38;2;163;72;248m┏\033[38;2;157;72;249m┛\033[38;2;152;72;249m┃\033[38;2;147;73;249m \033[38;2;141;73;250m \033[38;2;136;74;250m┗\033[38;2;131;74;250m┓\033[38;2;125;74;251m \033[38;2;120;75;251m┏\033[38;2;115;75;251m┛\033[38;2;109;76;252m \033[38;2;104;76;252m \033[38;2;99;77;252m┃\033[38;2;94;77;253m┏\033[38;2;88;77;253m┛\033[38;2;83;78;253m┏\033[38;2;78;79;254m━\033[38;2;79;85;254m━\033[38;2;79;91;254m┓\033[38;2;80;97;255m┗\033[38;2;80;103;255m┓ @@ -181,40 +177,38 @@ index 4ef8eaad4485a2ee920f80556f9dda04e59d2b2a..b91c3b8ca8f840335ba6470658d82c5d + \033[38;2;236;61;151m┃\033[38;2;236;61;157m \033[38;2;237;62;163m┃\033[38;2;237;62;169m \033[38;2;238;62;175m \033[38;2;238;63;181m \033[38;2;239;63;187m \033[38;2;239;63;193m \033[38;2;239;64;200m┃\033[38;2;240;64;206m \033[38;2;240;64;212m┗\033[38;2;241;65;218m━\033[38;2;241;65;224m━\033[38;2;242;65;230m━\033[38;2;242;66;236m━\033[38;2;242;66;242m┓\033[38;2;237;66;243m┃\033[38;2;232;67;243m \033[38;2;227;67;244m┃\033[38;2;221;67;244m \033[38;2;216;68;244m \033[38;2;211;68;245m┃\033[38;2;205;69;245m \033[38;2;200;69;246m┃\033[38;2;195;69;246m┏\033[38;2;189;70;246m┛\033[38;2;184;70;247m \033[38;2;179;70;247m \033[38;2;173;71;247m┗\033[38;2;168;71;248m━\033[38;2;163;72;248m━\033[38;2;157;72;249m┓\033[38;2;152;72;249m┃\033[38;2;147;73;249m \033[38;2;141;73;250m┃\033[38;2;136;74;250m \033[38;2;131;74;250m┗\033[38;2;125;74;251m━\033[38;2;120;75;251m┛\033[38;2;115;75;251m \033[38;2;109;76;252m┃\033[38;2;104;76;252m \033[38;2;99;77;252m┃\033[38;2;94;77;253m┃\033[38;2;88;77;253m \033[38;2;83;78;253m┃\033[38;2;78;79;254m \033[38;2;79;85;254m \033[38;2;79;91;254m┃\033[38;2;80;97;255m \033[38;2;80;103;255m┃ + \033[38;2;236;61;151m┗\033[38;2;236;61;157m━\033[38;2;237;62;163m┛\033[38;2;237;62;169m \033[38;2;238;62;175m \033[38;2;238;63;181m \033[38;2;239;63;187m \033[38;2;239;63;193m \033[38;2;239;64;200m┗\033[38;2;240;64;206m━\033[38;2;240;64;212m━\033[38;2;241;65;218m━\033[38;2;241;65;224m━\033[38;2;242;65;230m━\033[38;2;242;66;236m━\033[38;2;242;66;242m┛\033[38;2;237;66;243m┗\033[38;2;232;67;243m━\033[38;2;227;67;244m┛\033[38;2;221;67;244m \033[38;2;216;68;244m \033[38;2;211;68;245m┗\033[38;2;205;69;245m━\033[38;2;200;69;246m┛\033[38;2;195;69;246m┗\033[38;2;189;70;246m━\033[38;2;184;70;247m━\033[38;2;179;70;247m━\033[38;2;173;71;247m━\033[38;2;168;71;248m━\033[38;2;163;72;248m━\033[38;2;157;72;249m┛\033[38;2;152;72;249m┗\033[38;2;147;73;249m━\033[38;2;141;73;250m┛\033[38;2;136;74;250m \033[38;2;131;74;250m \033[38;2;125;74;251m \033[38;2;120;75;251m \033[38;2;115;75;251m \033[38;2;109;76;252m┗\033[38;2;104;76;252m━\033[38;2;99;77;252m┛\033[38;2;94;77;253m┗\033[38;2;88;77;253m━\033[38;2;83;78;253m┛\033[38;2;78;79;254m \033[38;2;79;85;254m \033[38;2;79;91;254m┗\033[38;2;80;97;255m━\033[38;2;80;103;255m┛\033[0m + """); -+ if (!org.plazmamc.plazma.Options.iKnowWhatIAmDoing) -+ LOGGER.warn("Warning! Plazma may cause unexpected problems, so be sure to test it thoroughly before using it on a public server."); -+ // Plazma end ++ // Plazma end - Rebrand Path path = (Path) optionset.valueOf("pidFile"); // CraftBukkit diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 60b5e0643d933393b5473681ac9261db29fe2416..ac12ccf60b45b150982e79f32d3cdd21c4017cc8 100644 +index dfeae138e830e95ab823b6349a91160b02622208..e121cc57ec5bf6f5b1d81e2fd4f551063ac60d64 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -956,7 +956,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -Date: Sun, 14 Jan 2024 19:51:19 +0900 -Subject: [PATCH] Use Gradle Version Catalogs - - -diff --git a/build.gradle.kts b/build.gradle.kts -index 1cad0728d..b97182b80 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -19,21 +19,38 @@ dependencies { - exclude("io.papermc.paper", "paper-api") - } - // Purpur end -+ // Plazma start - Use Gradle version catalogs -+ /* - // Paper start - implementation("org.jline:jline-terminal-jansi:3.21.0") - implementation("net.minecrell:terminalconsoleappender:1.3.0") - implementation("net.kyori:adventure-text-serializer-ansi:4.14.0") // Keep in sync with adventureVersion from Paper-API build file - implementation("net.kyori:ansi:1.0.3") // Manually bump beyond above transitive dep -- /* -- Required to add the missing Log4j2Plugins.dat file from log4j-core -- which has been removed by Mojang. Without it, log4j has to classload -- all its classes to check if they are plugins. -- Scanning takes about 1-2 seconds so adding this speeds up the server start. -- */ - implementation("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - implementation - log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins -+ */ -+ log4jPlugins.annotationProcessorConfigurationName(common.log4j.core) -+ -+ implementation(common.log4j.core) -+ implementation(common.log4j.iostreams) -+ implementation(common.snakeyaml) -+ implementation(common.bundles.asm) -+ implementation(common.commons.lang2) -+ implementation(common.adventure.serializer.ansi) -+ implementation(server.ansi) -+ implementation(server.bundles.implementation) -+ -+ runtimeOnly(common.bundles.maven) -+ runtimeOnly(common.maven.provider) -+ runtimeOnly(server.bundles.runtime) - runtimeOnly(log4jPlugins.output) -+ - alsoShade(log4jPlugins.output) -+ -+ testImplementation(common.bundles.test) -+ testImplementation(server.bundles.test) -+ -+ /* - implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol - // Paper end - implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion -@@ -46,8 +63,11 @@ dependencies { - runtimeOnly("com.lmax:disruptor:3.4.4") // Paper - // Paper start - Use Velocity cipher - implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") { -+ */ -+ implementation(server.velocity) { - isTransitive = false - } -+ /* - // Paper end - Use Velocity cipher - - runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6") -@@ -57,8 +77,11 @@ dependencies { - // Pufferfish start - implementation("org.yaml:snakeyaml:1.32") - implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") { -+ */ -+ implementation(server.simpleyaml) { - exclude(group="org.yaml", module="snakeyaml") - } -+ /* - // Pufferfish end - - implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur -@@ -71,6 +94,7 @@ dependencies { - testImplementation("org.mockito:mockito-core:5.11.0") - testImplementation("org.ow2.asm:asm-tree:9.7") - testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest -+ */ - } - - val craftbukkitPackageVersion = "1_20_R3" // Paper diff --git a/patches/server/0005-Rebrand-Logo.patch b/patches/server/0004-Rebrand-Logo.patch similarity index 100% rename from patches/server/0005-Rebrand-Logo.patch rename to patches/server/0004-Rebrand-Logo.patch diff --git a/patches/server/0006-Reduce-allocations.patch b/patches/unapplied/server/0006-Reduce-allocations.patch similarity index 100% rename from patches/server/0006-Reduce-allocations.patch rename to patches/unapplied/server/0006-Reduce-allocations.patch diff --git a/patches/server/0007-Plazma-Configurations.patch b/patches/unapplied/server/0007-Plazma-Configurations.patch similarity index 100% rename from patches/server/0007-Plazma-Configurations.patch rename to patches/unapplied/server/0007-Plazma-Configurations.patch diff --git a/patches/server/0008-Setup-basic-configuration-sections.patch b/patches/unapplied/server/0008-Setup-basic-configuration-sections.patch similarity index 100% rename from patches/server/0008-Setup-basic-configuration-sections.patch rename to patches/unapplied/server/0008-Setup-basic-configuration-sections.patch diff --git a/patches/server/0009-Port-SparklyPaper-patches.patch b/patches/unapplied/server/0009-Port-SparklyPaper-patches.patch similarity index 100% rename from patches/server/0009-Port-SparklyPaper-patches.patch rename to patches/unapplied/server/0009-Port-SparklyPaper-patches.patch diff --git a/patches/server/0010-Always-agree-EULA-on-development-mode.patch b/patches/unapplied/server/0010-Always-agree-EULA-on-development-mode.patch similarity index 100% rename from patches/server/0010-Always-agree-EULA-on-development-mode.patch rename to patches/unapplied/server/0010-Always-agree-EULA-on-development-mode.patch diff --git a/patches/server/0011-Add-more-metrics.patch b/patches/unapplied/server/0011-Add-more-metrics.patch similarity index 100% rename from patches/server/0011-Add-more-metrics.patch rename to patches/unapplied/server/0011-Add-more-metrics.patch diff --git a/patches/server/0012-Optimize-default-configurations.patch b/patches/unapplied/server/0012-Optimize-default-configurations.patch similarity index 100% rename from patches/server/0012-Optimize-default-configurations.patch rename to patches/unapplied/server/0012-Optimize-default-configurations.patch diff --git a/patches/server/0013-Tweak-console-logging.patch b/patches/unapplied/server/0013-Tweak-console-logging.patch similarity index 100% rename from patches/server/0013-Tweak-console-logging.patch rename to patches/unapplied/server/0013-Tweak-console-logging.patch diff --git a/patches/server/0014-Add-missing-purpur-configuration-options.patch b/patches/unapplied/server/0014-Add-missing-purpur-configuration-options.patch similarity index 100% rename from patches/server/0014-Add-missing-purpur-configuration-options.patch rename to patches/unapplied/server/0014-Add-missing-purpur-configuration-options.patch diff --git a/patches/server/0015-Add-some-missing-Pufferfish-configurations.patch b/patches/unapplied/server/0015-Add-some-missing-Pufferfish-configurations.patch similarity index 100% rename from patches/server/0015-Add-some-missing-Pufferfish-configurations.patch rename to patches/unapplied/server/0015-Add-some-missing-Pufferfish-configurations.patch diff --git a/patches/server/0016-Completely-remove-Mojang-Profiler.patch b/patches/unapplied/server/0016-Completely-remove-Mojang-Profiler.patch similarity index 100% rename from patches/server/0016-Completely-remove-Mojang-Profiler.patch rename to patches/unapplied/server/0016-Completely-remove-Mojang-Profiler.patch diff --git a/patches/server/0017-Add-option-to-change-nether-portal-size.patch b/patches/unapplied/server/0017-Add-option-to-change-nether-portal-size.patch similarity index 100% rename from patches/server/0017-Add-option-to-change-nether-portal-size.patch rename to patches/unapplied/server/0017-Add-option-to-change-nether-portal-size.patch diff --git a/patches/server/0018-Reduce-create-random-instance.patch b/patches/unapplied/server/0018-Reduce-create-random-instance.patch similarity index 100% rename from patches/server/0018-Reduce-create-random-instance.patch rename to patches/unapplied/server/0018-Reduce-create-random-instance.patch diff --git a/patches/server/0019-Apply-various-optimizations.patch b/patches/unapplied/server/0019-Apply-various-optimizations.patch similarity index 100% rename from patches/server/0019-Apply-various-optimizations.patch rename to patches/unapplied/server/0019-Apply-various-optimizations.patch diff --git a/patches/server/0020-Avoid-double-I-O-operation-on-load-player-file.patch b/patches/unapplied/server/0020-Avoid-double-I-O-operation-on-load-player-file.patch similarity index 100% rename from patches/server/0020-Avoid-double-I-O-operation-on-load-player-file.patch rename to patches/unapplied/server/0020-Avoid-double-I-O-operation-on-load-player-file.patch diff --git a/patches/server/0021-Do-not-refresh-LootTable-for-non-player-interaction.patch b/patches/unapplied/server/0021-Do-not-refresh-LootTable-for-non-player-interaction.patch similarity index 100% rename from patches/server/0021-Do-not-refresh-LootTable-for-non-player-interaction.patch rename to patches/unapplied/server/0021-Do-not-refresh-LootTable-for-non-player-interaction.patch diff --git a/patches/server/0022-Do-not-load-chunks-to-spawn-phantom.patch b/patches/unapplied/server/0022-Do-not-load-chunks-to-spawn-phantom.patch similarity index 100% rename from patches/server/0022-Do-not-load-chunks-to-spawn-phantom.patch rename to patches/unapplied/server/0022-Do-not-load-chunks-to-spawn-phantom.patch diff --git a/patches/server/0023-Add-option-to-disable-moved-to-quickly-check-for-spe.patch b/patches/unapplied/server/0023-Add-option-to-disable-moved-to-quickly-check-for-spe.patch similarity index 100% rename from patches/server/0023-Add-option-to-disable-moved-to-quickly-check-for-spe.patch rename to patches/unapplied/server/0023-Add-option-to-disable-moved-to-quickly-check-for-spe.patch diff --git a/patches/server/0024-Ignore-useless-entity-packets.patch b/patches/unapplied/server/0024-Ignore-useless-entity-packets.patch similarity index 100% rename from patches/server/0024-Ignore-useless-entity-packets.patch rename to patches/unapplied/server/0024-Ignore-useless-entity-packets.patch diff --git a/patches/server/0025-Improve-biome-temperture-cache.patch b/patches/unapplied/server/0025-Improve-biome-temperture-cache.patch similarity index 100% rename from patches/server/0025-Improve-biome-temperture-cache.patch rename to patches/unapplied/server/0025-Improve-biome-temperture-cache.patch diff --git a/patches/server/0026-Configurable-entity-sensor-tick.patch b/patches/unapplied/server/0026-Configurable-entity-sensor-tick.patch similarity index 100% rename from patches/server/0026-Configurable-entity-sensor-tick.patch rename to patches/unapplied/server/0026-Configurable-entity-sensor-tick.patch diff --git a/patches/server/0027-Configurable-cave-lava-sea-level.patch b/patches/unapplied/server/0027-Configurable-cave-lava-sea-level.patch similarity index 100% rename from patches/server/0027-Configurable-cave-lava-sea-level.patch rename to patches/unapplied/server/0027-Configurable-cave-lava-sea-level.patch diff --git a/patches/server/0028-Variable-entity-wakeup-duration.patch b/patches/unapplied/server/0028-Variable-entity-wakeup-duration.patch similarity index 100% rename from patches/server/0028-Variable-entity-wakeup-duration.patch rename to patches/unapplied/server/0028-Variable-entity-wakeup-duration.patch diff --git a/patches/server/0029-Optimise-state-lookup-more.patch b/patches/unapplied/server/0029-Optimise-state-lookup-more.patch similarity index 100% rename from patches/server/0029-Optimise-state-lookup-more.patch rename to patches/unapplied/server/0029-Optimise-state-lookup-more.patch diff --git a/patches/server/0030-Suppress-errors-from-dirty-attributes.patch b/patches/unapplied/server/0030-Suppress-errors-from-dirty-attributes.patch similarity index 100% rename from patches/server/0030-Suppress-errors-from-dirty-attributes.patch rename to patches/unapplied/server/0030-Suppress-errors-from-dirty-attributes.patch diff --git a/patches/server/0031-Skip-event-if-no-listeners.patch b/patches/unapplied/server/0031-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0031-Skip-event-if-no-listeners.patch rename to patches/unapplied/server/0031-Skip-event-if-no-listeners.patch diff --git a/patches/server/0032-Optimize-spigot-event-bus.patch b/patches/unapplied/server/0032-Optimize-spigot-event-bus.patch similarity index 100% rename from patches/server/0032-Optimize-spigot-event-bus.patch rename to patches/unapplied/server/0032-Optimize-spigot-event-bus.patch diff --git a/patches/server/0033-Add-entity-spawn-deadlock-timer.patch b/patches/unapplied/server/0033-Add-entity-spawn-deadlock-timer.patch similarity index 100% rename from patches/server/0033-Add-entity-spawn-deadlock-timer.patch rename to patches/unapplied/server/0033-Add-entity-spawn-deadlock-timer.patch diff --git a/patches/server/0034-Lithium-HashedList.patch b/patches/unapplied/server/0034-Lithium-HashedList.patch similarity index 100% rename from patches/server/0034-Lithium-HashedList.patch rename to patches/unapplied/server/0034-Lithium-HashedList.patch diff --git a/patches/server/0035-Improve-SwingTime-ticking.patch b/patches/unapplied/server/0035-Improve-SwingTime-ticking.patch similarity index 100% rename from patches/server/0035-Improve-SwingTime-ticking.patch rename to patches/unapplied/server/0035-Improve-SwingTime-ticking.patch diff --git a/patches/server/0036-Save-Json-list-asynchronously.patch b/patches/unapplied/server/0036-Save-Json-list-asynchronously.patch similarity index 100% rename from patches/server/0036-Save-Json-list-asynchronously.patch rename to patches/unapplied/server/0036-Save-Json-list-asynchronously.patch diff --git a/patches/server/0037-Implement-FreedomChat.patch b/patches/unapplied/server/0037-Implement-FreedomChat.patch similarity index 100% rename from patches/server/0037-Implement-FreedomChat.patch rename to patches/unapplied/server/0037-Implement-FreedomChat.patch diff --git a/patches/unapplied/server/0016-Completely-remove-Timings.patch b/patches/unapplied/server/dropped/0016-Completely-remove-Timings.patch similarity index 100% rename from patches/unapplied/server/0016-Completely-remove-Timings.patch rename to patches/unapplied/server/dropped/0016-Completely-remove-Timings.patch diff --git a/patches/unapplied/server/0037-Implement-FerriteCore.patch b/patches/unapplied/server/dropped/0037-Implement-FerriteCore.patch similarity index 100% rename from patches/unapplied/server/0037-Implement-FerriteCore.patch rename to patches/unapplied/server/dropped/0037-Implement-FerriteCore.patch diff --git a/patches/unapplied/server/0038-Async-PathProcessing.patch b/patches/unapplied/server/dropped/0038-Async-PathProcessing.patch similarity index 100% rename from patches/unapplied/server/0038-Async-PathProcessing.patch rename to patches/unapplied/server/dropped/0038-Async-PathProcessing.patch diff --git a/patches/unapplied/server/0041-CarpetFixes-Configuration.patch b/patches/unapplied/server/dropped/0041-CarpetFixes-Configuration.patch similarity index 100% rename from patches/unapplied/server/0041-CarpetFixes-Configuration.patch rename to patches/unapplied/server/dropped/0041-CarpetFixes-Configuration.patch diff --git a/patches/unapplied/server/0042-CarpetFixes-Optimizations-BiomeManager.patch b/patches/unapplied/server/dropped/0042-CarpetFixes-Optimizations-BiomeManager.patch similarity index 100% rename from patches/unapplied/server/0042-CarpetFixes-Optimizations-BiomeManager.patch rename to patches/unapplied/server/dropped/0042-CarpetFixes-Optimizations-BiomeManager.patch diff --git a/patches/unapplied/server/0043-CarpetFixes-Optimizations-RecipeManager.patch b/patches/unapplied/server/dropped/0043-CarpetFixes-Optimizations-RecipeManager.patch similarity index 100% rename from patches/unapplied/server/0043-CarpetFixes-Optimizations-RecipeManager.patch rename to patches/unapplied/server/dropped/0043-CarpetFixes-Optimizations-RecipeManager.patch diff --git a/patches/unapplied/server/0044-CarpetFixes-Optimizations-Sheep.patch b/patches/unapplied/server/dropped/0044-CarpetFixes-Optimizations-Sheep.patch similarity index 100% rename from patches/unapplied/server/0044-CarpetFixes-Optimizations-Sheep.patch rename to patches/unapplied/server/dropped/0044-CarpetFixes-Optimizations-Sheep.patch