diff --git a/patches/server/0005-Rebrand.patch b/patches/server/0005-Rebrand.patch index 537346b..ee99905 100644 --- a/patches/server/0005-Rebrand.patch +++ b/patches/server/0005-Rebrand.patch @@ -49,10 +49,10 @@ index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..0b3d87d2d43148e6370e7a03e0bb6074 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..b698ce7d9fcccf535398aec731f8dba27f1ffa9b 100644 +index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b04d3eea789f77b2435cb0192635f1be1bab597d 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; +@@ -20,10 +20,11 @@ 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 // Purpur start @@ -61,18 +61,22 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b698ce7d9fcccf535398aec731f8dba2 private static int distance = -2; public int distance() { return distance; } // Purpur end private static @Nullable String mcVer; -@@ -33,8 +33,8 @@ public class PaperVersionFetcher implements VersionFetcher { ++ private static final boolean DEVELOPMENT = false; // Plazma + + @Override + public long getCacheTime() { +@@ -33,8 +34,8 @@ public class PaperVersionFetcher implements VersionFetcher { @Nonnull @Override 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/Plazma", "ver/" + getMinecraftVersion(), parts[0]); // Purpur // Plazma // Plazma - Branding ++ final Component updateMessage = getUpdateStatusMessage("PlazmaMC/PlazmaBukkit", (DEVELOPMENT ? "dev/" : "ver/") + getMinecraftVersion(), parts[0]); // Purpur // Plazma // Plazma - Branding final Component history = getHistory(); return history != null ? Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()), history, updateMessage) : updateMessage; // Purpur -@@ -47,7 +47,7 @@ public class PaperVersionFetcher implements VersionFetcher { +@@ -47,7 +48,7 @@ public class PaperVersionFetcher implements VersionFetcher { String result = matcher.group(); mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-' } else { @@ -81,7 +85,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b698ce7d9fcccf535398aec731f8dba2 org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString()); org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion()); } -@@ -57,6 +57,7 @@ public class PaperVersionFetcher implements VersionFetcher { +@@ -57,6 +58,7 @@ public class PaperVersionFetcher implements VersionFetcher { } private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) { @@ -89,7 +93,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b698ce7d9fcccf535398aec731f8dba2 //int distance; // Purpur - use field try { int jenkinsBuild = Integer.parseInt(versionInfo); -@@ -65,6 +66,11 @@ public class PaperVersionFetcher implements VersionFetcher { +@@ -65,6 +67,11 @@ public class PaperVersionFetcher implements VersionFetcher { versionInfo = versionInfo.replace("\"", ""); distance = fetchDistanceFromGitHub(repo, branch, versionInfo); } @@ -101,7 +105,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b698ce7d9fcccf535398aec731f8dba2 switch (distance) { case -1: -@@ -83,6 +89,7 @@ public class PaperVersionFetcher implements VersionFetcher { +@@ -83,6 +90,7 @@ public class PaperVersionFetcher implements VersionFetcher { } } @@ -109,7 +113,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b698ce7d9fcccf535398aec731f8dba2 private static int fetchDistanceFromSiteApi(int jenkinsBuild, @Nullable String siteApiVersion) { if (siteApiVersion == null) { return -1; } try { -@@ -102,6 +109,7 @@ public class PaperVersionFetcher implements VersionFetcher { +@@ -102,6 +110,7 @@ public class PaperVersionFetcher implements VersionFetcher { return -1; } } diff --git a/patches/server/0007-Development-Build.patch b/patches/server/0007-Development-Build.patch new file mode 100644 index 0000000..6049047 --- /dev/null +++ b/patches/server/0007-Development-Build.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: AlphaKR93 +Date: Fri, 26 Jan 2024 15:34:53 +0900 +Subject: [PATCH] Development Build + + +diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +index b04d3eea789f77b2435cb0192635f1be1bab597d..a58ce2c893d8c755ab3027207d512542d2d57c36 100644 +--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java ++++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +@@ -24,7 +24,7 @@ public class PaperVersionFetcher implements VersionFetcher { + private static int distance = -2; public int distance() { return distance; } + // Purpur end + private static @Nullable String mcVer; +- private static final boolean DEVELOPMENT = false; // Plazma ++ private static final boolean DEVELOPMENT = true; // Plazma + + @Override + public long getCacheTime() { diff --git a/patches/server/0007-Plazma-Configurations.patch b/patches/server/0008-Plazma-Configurations.patch similarity index 100% rename from patches/server/0007-Plazma-Configurations.patch rename to patches/server/0008-Plazma-Configurations.patch diff --git a/patches/server/0008-Setup-basic-configuration-sections.patch b/patches/server/0009-Setup-basic-configuration-sections.patch similarity index 100% rename from patches/server/0008-Setup-basic-configuration-sections.patch rename to patches/server/0009-Setup-basic-configuration-sections.patch diff --git a/patches/server/0009-Port-SparklyPaper-patches.patch b/patches/server/0010-Port-SparklyPaper-patches.patch similarity index 100% rename from patches/server/0009-Port-SparklyPaper-patches.patch rename to patches/server/0010-Port-SparklyPaper-patches.patch diff --git a/patches/server/0010-Always-agree-EULA-on-development-mode.patch b/patches/server/0011-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/server/0011-Always-agree-EULA-on-development-mode.patch diff --git a/patches/server/0011-Add-more-metrics.patch b/patches/server/0012-Add-more-metrics.patch similarity index 100% rename from patches/server/0011-Add-more-metrics.patch rename to patches/server/0012-Add-more-metrics.patch diff --git a/patches/server/0012-Optimize-default-configurations.patch b/patches/server/0013-Optimize-default-configurations.patch similarity index 100% rename from patches/server/0012-Optimize-default-configurations.patch rename to patches/server/0013-Optimize-default-configurations.patch diff --git a/patches/server/0013-Tweak-console-logging.patch b/patches/server/0014-Tweak-console-logging.patch similarity index 98% rename from patches/server/0013-Tweak-console-logging.patch rename to patches/server/0014-Tweak-console-logging.patch index 4e1eff5..17828fb 100644 --- a/patches/server/0013-Tweak-console-logging.patch +++ b/patches/server/0014-Tweak-console-logging.patch @@ -61,7 +61,7 @@ index d2ea4c6470706138a1e6cebb8c591abb14c96a18..84cf2b2e289af0a43c9cc64a9c7e045f diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index c103f734ac8f4a58990a33cfefd8066b798a603e..ada7af155d02b580b8262ff4ca37b44d79792cec 100644 +index b230739cf929c8f2b51a812fffe54be343ce3e05..75866d30b82dbe931de3a1990fe1fe0a40426574 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1467,6 +1467,7 @@ public abstract class PlayerList { diff --git a/patches/server/0014-Add-missing-purpur-configuration-options.patch b/patches/server/0015-Add-missing-purpur-configuration-options.patch similarity index 100% rename from patches/server/0014-Add-missing-purpur-configuration-options.patch rename to patches/server/0015-Add-missing-purpur-configuration-options.patch diff --git a/patches/server/0015-Add-some-missing-Pufferfish-configurations.patch b/patches/server/0016-Add-some-missing-Pufferfish-configurations.patch similarity index 100% rename from patches/server/0015-Add-some-missing-Pufferfish-configurations.patch rename to patches/server/0016-Add-some-missing-Pufferfish-configurations.patch diff --git a/patches/server/0016-Completely-remove-Mojang-Profiler.patch b/patches/server/0017-Completely-remove-Mojang-Profiler.patch similarity index 100% rename from patches/server/0016-Completely-remove-Mojang-Profiler.patch rename to patches/server/0017-Completely-remove-Mojang-Profiler.patch diff --git a/patches/server/0017-Add-option-to-change-nether-portal-size.patch b/patches/server/0018-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/server/0018-Add-option-to-change-nether-portal-size.patch diff --git a/patches/server/0018-Reduce-create-random-instance.patch b/patches/server/0019-Reduce-create-random-instance.patch similarity index 99% rename from patches/server/0018-Reduce-create-random-instance.patch rename to patches/server/0019-Reduce-create-random-instance.patch index 75dc70e..ab3d7ce 100644 --- a/patches/server/0018-Reduce-create-random-instance.patch +++ b/patches/server/0019-Reduce-create-random-instance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reduce create random instance diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 91264d763a28f5ddeb2096be7a73ed091dcc6def..f5c5a6d32074bf737dc4876afb6ba13b3fb03a7d 100644 +index a801db24aaa6b16e16831147129dc7020127794d..2ab66feae898d7316e8a5d0a3103d462e93c81b6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -236,6 +236,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop