Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

more easy fork

Browse Source
This commit is contained in:
AlphaKR93
2024-05-09 08:20:40 +09:00
parent f0c635282d
commit 6bb6091980
9 changed files with 141 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

199
patches/server/0003-Rebrand.patch
View File

@@ -35,7 +35,7 @@ index feaff0406fa47ffb265ce316b057fb52aa367870..279e1cfd24f29d3ac55e74759d8b542a
"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..218d3a4147cab29937ad67a963e21ac1730daaa0 100644
index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..5eefe30d47b055fd544caebfb77f6f5a12894fda 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 +43,7 @@ index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..218d3a4147cab29937ad67a963e21ac1
// 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 - Rebrand
+ Metrics metrics = new Metrics(org.bukkit.craftbukkit.util.Versioning.BRANDING, serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur // Plazma - Rebrand
metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
String minecraftVersion = Bukkit.getVersion();
@@ -52,15 +52,15 @@ index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..218d3a4147cab29937ad67a963e21ac1
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(metrics.name.toLowerCase(Locale.ROOT) + "_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.SimplePie(org.bukkit.craftbukkit.util.Versioning.BRAND_L + "_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<String, Map<String, Integer>> 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..0a846802f053c545992763e0447e15565204e764 100644
index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..9404c5fa798b00f5532ed7bda050cf183555709d 100644
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -20,10 +20,15 @@ import java.util.stream.StreamSupport;
@@ -20,7 +20,6 @@ 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
@@ -68,36 +68,27 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..0a846802f053c545992763e0447e1556
private static int distance = -2; public int distance() { return distance; }
// Purpur end
private static @Nullable String mcVer;
+ // Plazma start - Rebranding
+ private static final String PROJECT_NAME = "Plazma";
+ private static final String PROJECT_REPO = "PlazmaMC/PlazmaBukkit";
+ private static final String DOWNLOAD_PAGE = "https://docs.plazmamc.org/plazma/about/downloads";
+ public static final boolean DEVELOPMENT = false;
+ // Plazma end
@Override
public long getCacheTime() {
@@ -33,8 +38,8 @@ public class PaperVersionFetcher implements VersionFetcher {
@@ -33,8 +32,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--".length() + PROJECT_NAME.length()).split("[-\\s]"); // Purpur // Plazma - Rebrand
+ final Component updateMessage = getUpdateStatusMessage(PROJECT_REPO, (DEVELOPMENT ? "dev/" : "ver/") + getMinecraftVersion(), parts[0]); // Purpur // Plazma - Rebrand
+ String[] parts = serverVersion.substring("git--".length() + org.bukkit.craftbukkit.util.Versioning.BRANDING.length()).split("[-\\s]"); // Purpur // Plazma - Rebrand
+ final Component updateMessage = getUpdateStatusMessage(org.bukkit.craftbukkit.util.Versioning.REPOSITORY, (org.bukkit.craftbukkit.util.Versioning.DEVELOPMENT ? "dev/" : "ver/") + getMinecraftVersion(), parts[0]); // Purpur // Plazma - Rebrand
final Component history = getHistory();
return history != null ? Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()), history, updateMessage) : updateMessage; // Purpur
@@ -47,7 +52,7 @@ public class PaperVersionFetcher implements VersionFetcher {
@@ -47,7 +46,7 @@ public class PaperVersionFetcher implements VersionFetcher {
String result = matcher.group();
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 " + PROJECT_NAME + "!"); // Purpur // Plazma // Plazma - Rebrand
+ org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to " + org.bukkit.craftbukkit.util.Versioning.BRANDING + "!"); // Purpur // Plazma // Plazma - Rebrand
org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString());
org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
}
@@ -57,6 +62,7 @@ public class PaperVersionFetcher implements VersionFetcher {
@@ -57,6 +56,7 @@ public class PaperVersionFetcher implements VersionFetcher {
}
private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
@@ -105,7 +96,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..0a846802f053c545992763e0447e1556
//int distance; // Purpur - use field
try {
int jenkinsBuild = Integer.parseInt(versionInfo);
@@ -65,6 +71,11 @@ public class PaperVersionFetcher implements VersionFetcher {
@@ -65,6 +65,11 @@ public class PaperVersionFetcher implements VersionFetcher {
versionInfo = versionInfo.replace("\"", "");
distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
}
@@ -117,7 +108,15 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..0a846802f053c545992763e0447e1556
switch (distance) {
case -1:
@@ -83,6 +94,7 @@ public class PaperVersionFetcher implements VersionFetcher {
@@ -77,12 +82,13 @@ public class PaperVersionFetcher implements VersionFetcher {
return Component.text("* You are " + distance + " version(s) behind", NamedTextColor.YELLOW) // Purpur
.append(Component.newline())
.append(Component.text("Download the new version at: ")
- .append(Component.text(DOWNLOAD_PAGE, NamedTextColor.GOLD)
+ .append(Component.text(org.bukkit.craftbukkit.util.Versioning.DOWNLOAD, NamedTextColor.GOLD) // Plazma - Rebranding
.hoverEvent(Component.text("Click to open", NamedTextColor.WHITE))
- .clickEvent(ClickEvent.openUrl(DOWNLOAD_PAGE))));
+ .clickEvent(ClickEvent.openUrl(org.bukkit.craftbukkit.util.Versioning.DOWNLOAD)))); // Plazma - Rebranding
}
}
@@ -125,7 +124,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..0a846802f053c545992763e0447e1556
private static int fetchDistanceFromSiteApi(int jenkinsBuild, @Nullable String siteApiVersion) {
if (siteApiVersion == null) { return -1; }
try {
@@ -102,6 +114,7 @@ public class PaperVersionFetcher implements VersionFetcher {
@@ -102,6 +108,7 @@ public class PaperVersionFetcher implements VersionFetcher {
return -1;
}
}
@@ -134,7 +133,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..0a846802f053c545992763e0447e1556
// Contributed by Techcable <Techcable@outlook.com> 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..aa5f7dbaa62d83168055f2d389ba1ed512d1741b 100644
index 3cb56595822799926a8141e60a42f5d1edfc6de5..f92edc10fb0f7a00436fd66d1fd1a9a45fb88b95 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 {
@@ -142,12 +141,12 @@ index 3cb56595822799926a8141e60a42f5d1edfc6de5..aa5f7dbaa62d83168055f2d389ba1ed5
protected LineReader buildReader(LineReaderBuilder builder) {
builder
- .appName("Purpur") // Purpur
+ .appName("Plazma") // Purpur // Plazma - Rebrand
+ .appName(org.bukkit.craftbukkit.util.Versioning.BRANDING) // 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/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java
index 96142deb42700f888ea08689ab62c27ef2b881fd..44dda308913d8d25e53d8d0fc7e50c0c678b76d0 100644
index 96142deb42700f888ea08689ab62c27ef2b881fd..f5d725feb6d32f947eed82073c5594e205f31afe 100644
--- a/src/main/java/io/papermc/paper/configuration/Configurations.java
+++ b/src/main/java/io/papermc/paper/configuration/Configurations.java
@@ -114,7 +114,11 @@ public abstract class Configurations<G, W> {
@@ -156,7 +155,7 @@ index 96142deb42700f888ea08689ab62c27ef2b881fd..44dda308913d8d25e53d8d0fc7e50c0c
if (ex.getCause() instanceof AccessDeniedException) {
- LOGGER.warn("Could not save {}: Paper could not persist the full set of configuration settings in the configuration file. Any setting missing from the configuration file will be set with its default value in memory. Admins should make sure to review the configuration documentation at https://docs.papermc.io/paper/configuration for more details.", filename, ex);
+ // Plazma start - Rebrand
+ LOGGER.warn("Could not save {}: Plazma could not persist the full set of configuration settings in the configuration file."
+ LOGGER.warn("Could not save {}: " + org.bukkit.craftbukkit.util.Versioning.DOWNLOAD + " could not persist the full set of configuration settings in the configuration file."
+ + "Any setting missing from the configuration file will be set with its default value in memory."
+ + "Admins should make sure to review the configuration documentation at https://docs.papermc.io/paper/configuration for more details.", filename, ex); // TODO: Change to Plazma document link
+ // Plazma end - Rebrand
@@ -164,32 +163,24 @@ index 96142deb42700f888ea08689ab62c27ef2b881fd..44dda308913d8d25e53d8d0fc7e50c0c
}
}
diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
index c366d84518979e842a6f10f969a5951539ecac93..246c5d1abc797b7679820b54ab0b4bafd858ce42 100644
index c366d84518979e842a6f10f969a5951539ecac93..bc273804a60542efb284409680c6849d165dedaa 100644
--- a/src/main/java/net/minecraft/CrashReport.java
+++ b/src/main/java/net/minecraft/CrashReport.java
@@ -22,6 +22,7 @@ import org.slf4j.Logger;
public class CrashReport {
+ private static final String PROJECT_NAME = "Plazma"; // Plazma - Rebranding
private static final Logger LOGGER = LogUtils.getLogger();
private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss", Locale.ROOT);
private final String title;
@@ -37,7 +38,7 @@ public class CrashReport {
@@ -37,7 +37,7 @@ public class CrashReport {
io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(cause); // Paper
this.title = message;
this.exception = cause;
- this.systemReport.setDetail("CraftBukkit Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit
+ this.systemReport.setDetail(PROJECT_NAME + " Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit // Plazma - Rebranding
+ this.systemReport.setDetail(org.bukkit.craftbukkit.util.Versioning.BRANDING + " Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit // Plazma - Rebranding
}
public String getTitle() {
@@ -127,7 +128,7 @@ public class CrashReport {
@@ -127,7 +127,7 @@ public class CrashReport {
stringbuilder.append("---- Minecraft Crash Report ----\n");
// 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 " + PROJECT_NAME.toUpperCase(Locale.ROOT) + " INSTEAD!"); // Plazma - Rebranding
+ stringbuilder.append("// DO NOT REPORT THIS TO PAPER OR PURPUR! REPORT TO " + org.bukkit.craftbukkit.util.Versioning.BRAND_U + " INSTEAD!"); // Plazma - Rebranding
// Purpur end
stringbuilder.append("// ");
stringbuilder.append(CrashReport.getErrorComment());
@@ -234,49 +225,40 @@ index 411f1f8c6be072cfc5ba88cbec38dbc4300a41d1..0fb3eeab083a0b1e9b495bd2c5c556fc
Main.LOGGER.error(awtException);
return;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index dfeae138e830e95ab823b6349a91160b02622208..b797f719acb2258bee1cc93394561f14a9df5296 100644
index 21327a92b75a460c7beb3aa408502f37a7db31fa..6d549448e67a110a42dde6f8eeaab1f0033f3462 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -198,6 +198,8 @@ import co.aikar.timings.MinecraftTimings; // Paper
public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements ServerInfo, CommandSource, AutoCloseable {
private static MinecraftServer SERVER; // Paper
+ private static final String BRANDING = "Plazma"; // Plazma - Rebranding
+ private static final String GETTING_STARTED = "https://docs.plazmamc.org/plazma/administration/getting-started"; // Plazma - Rebranding
public static final Logger LOGGER = LogUtils.getLogger();
public static final net.kyori.adventure.text.logger.slf4j.ComponentLogger COMPONENT_LOGGER = net.kyori.adventure.text.logger.slf4j.ComponentLogger.logger(LOGGER.getName()); // Paper
public static final String VANILLA_BRAND = "vanilla";
@@ -496,8 +498,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -496,8 +496,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
if (!newWorld.isDirectory() && oldWorld.isDirectory() && oldLevelDat.isFile()) {
MinecraftServer.LOGGER.info("---- Migration of old " + worldType + " folder required ----");
- MinecraftServer.LOGGER.info("Unfortunately due to the way that Minecraft implemented multiworld support in 1.6, Bukkit requires that you move your " + worldType + " folder to a new location in order to operate correctly.");
- MinecraftServer.LOGGER.info("We will move this folder for you, but it will mean that you need to move it back should you wish to stop using Bukkit in the future.");
+ MinecraftServer.LOGGER.info("Unfortunately due to the way that Minecraft implemented multiworld support in 1.6, " + BRANDING + " requires that you move your " + worldType + " folder to a new location in order to operate correctly."); // Plazma - Rebrand
+ MinecraftServer.LOGGER.info("We will move this folder for you, but it will mean that you need to move it back should you wish to stop using " + BRANDING + " in the future."); // Plazma - Rebrand
+ MinecraftServer.LOGGER.info("Unfortunately due to the way that Minecraft implemented multiworld support in 1.6, " + org.bukkit.craftbukkit.util.Versioning.BRANDING + " requires that you move your " + worldType + " folder to a new location in order to operate correctly."); // Plazma - Rebrand
+ MinecraftServer.LOGGER.info("We will move this folder for you, but it will mean that you need to move it back should you wish to stop using " + org.bukkit.craftbukkit.util.Versioning.BRANDING + " in the future."); // Plazma - Rebrand
MinecraftServer.LOGGER.info("Attempting to move " + oldWorld + " to " + newWorld + "...");
if (newWorld.exists()) {
@@ -963,7 +965,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -963,7 +963,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
shutdownThread = Thread.currentThread();
org.spigotmc.WatchdogThread.doStop(); // Paper
if (!isSameThread()) {
- MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PURPUR)"); // Purpur
+ MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO " + BRANDING.toUpperCase(Locale.ROOT) + ")"); // Purpur // Plazma - Rebrand
+ MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO " + org.bukkit.craftbukkit.util.Versioning.BRAND_U + ")"); // Purpur // Plazma - Rebrand
while (this.getRunningThread().isAlive()) {
this.getRunningThread().stop();
try {
@@ -1183,7 +1185,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1183,7 +1183,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
LOGGER.info("*************************************************************************************");
LOGGER.info("This is the first time you're starting this server.");
LOGGER.info("It's recommended you read our 'Getting Started' documentation for guidance.");
- LOGGER.info("View this and more helpful information here: https://docs.papermc.io/paper/next-steps");
+ LOGGER.info("View this and more helpful information here: " + GETTING_STARTED); // Plazma - Rebrand
+ LOGGER.info("View this and more helpful information here: " + org.bukkit.craftbukkit.util.Versioning.DOCUMENT); // Plazma - Rebrand
LOGGER.info("*************************************************************************************");
}
// Paper end - Add onboarding message for initial server start
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 775c5de4f5094260096cef6723dd50dfe2cb0c81..ae0849f190f54afa0bae19877189ec2de7521ae9 100644
index 775c5de4f5094260096cef6723dd50dfe2cb0c81..d606da8627219b5ecf4f1500086905fb4f572ca9 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -793,7 +793,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -284,12 +266,12 @@ index 775c5de4f5094260096cef6723dd50dfe2cb0c81..ae0849f190f54afa0bae19877189ec2d
result.append(this.server.getName());
- result.append(" on Bukkit ");
+ result.append(" on Plazma "); // Plazma - Rebrand
+ result.append(" on " + org.bukkit.craftbukkit.util.Versioning.BRANDING + " "); // Plazma - Rebrand
result.append(this.server.getBukkitVersion());
if (plugins.length > 0 && this.server.getQueryPlugins()) {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
index 842f382de43df5d5c321422372ec30ccdd7859d7..d43ebcf4448240f86eca1a4127b534851e7b9618 100644
index 842f382de43df5d5c321422372ec30ccdd7859d7..55e16ed1151c5d53f492581f66a3406ac418b653 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
@@ -56,12 +56,12 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
@@ -297,35 +279,34 @@ index 842f382de43df5d5c321422372ec30ccdd7859d7..d43ebcf4448240f86eca1a4127b53485
public final boolean preventProxyConnections = this.get("prevent-proxy-connections", false);
public final String serverIp = this.get("server-ip", "");
- public final String serverName = this.get("server-name", "Unknown Server"); // Purpur
+ public final String serverName = this.get("server-name", "A Plazma Server"); // Purpur // Plazma - Rebrand
+ public final String serverName = this.get("server-name", "A " + org.bukkit.craftbukkit.util.Versioning.BRANDING + " Server"); // Purpur // Plazma - Rebrand
public final boolean spawnAnimals = this.get("spawn-animals", true);
public final boolean spawnNpcs = this.get("spawn-npcs", true);
public final boolean pvp = this.get("pvp", true);
public final boolean allowFlight = this.get("allow-flight", false);
- public final String motd = this.get("motd", "A Minecraft Server");
+ public final String motd = this.get("motd", "A Plazma Server"); // Plazma - Rebrand
+ public final String motd = this.get("motd", "A " + org.bukkit.craftbukkit.util.Versioning.BRANDING + " Server"); // Plazma - Rebrand
public final boolean forceGameMode = this.get("force-gamemode", false);
public final boolean enforceWhitelist = this.get("enforce-whitelist", false);
public final Difficulty difficulty;
diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
index 8f74c2ec5252b6265549589310d742337c91cb2c..6a6a772c1d0bc9b4889014407454a89120399351 100644
index 8f74c2ec5252b6265549589310d742337c91cb2c..1b2818a81b6580b89669f12cb23c01b309f27847 100644
--- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
+++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
@@ -37,8 +37,11 @@ public class MinecraftServerGui extends JComponent {
@@ -37,8 +37,10 @@ public class MinecraftServerGui extends JComponent {
private static final Font MONOSPACED = new Font("Monospaced", 0, 12);
private static final Logger LOGGER = LogUtils.getLogger();
- private static final String TITLE = "Minecraft server";
- private static final String SHUTDOWN_TITLE = "Minecraft server - shutting down!";
+ // Plazma start - Rebranding
+ private static final String TITLE = "Plazma Minecraft server";
+ private static final String SHUTDOWN_TITLE = "Plazma Minecraft server - shutting down!";
+ private static final String GETTING_STARTED = "https://docs.plazmamc.org/plazma/administration/getting-started";
+ private static final String TITLE = org.bukkit.craftbukkit.util.Versioning.BRANDING + "Minecraft server";
+ private static final String SHUTDOWN_TITLE = TITLE + " - shutting down!";
+ // Plazma end - Rebranding
private final DedicatedServer server;
private Thread logAppenderThread;
private final Collection<Runnable> finalizers = Lists.newArrayList();
@@ -56,7 +59,7 @@ public class MinecraftServerGui extends JComponent {
@@ -56,7 +58,7 @@ public class MinecraftServerGui extends JComponent {
;
}
@@ -334,7 +315,7 @@ index 8f74c2ec5252b6265549589310d742337c91cb2c..6a6a772c1d0bc9b4889014407454a891
final MinecraftServerGui servergui = new MinecraftServerGui(server);
jframe.setDefaultCloseOperation(2);
@@ -64,7 +67,7 @@ public class MinecraftServerGui extends JComponent {
@@ -64,7 +66,7 @@ public class MinecraftServerGui extends JComponent {
jframe.pack();
jframe.setLocationRelativeTo((Component) null);
jframe.setVisible(true);
@@ -343,7 +324,7 @@ index 8f74c2ec5252b6265549589310d742337c91cb2c..6a6a772c1d0bc9b4889014407454a891
// Paper start - Improve ServerGUI
try {
@@ -76,7 +79,7 @@ public class MinecraftServerGui extends JComponent {
@@ -76,7 +78,7 @@ public class MinecraftServerGui extends JComponent {
jframe.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent windowevent) {
if (!servergui.isClosing.getAndSet(true)) {
@@ -352,17 +333,17 @@ index 8f74c2ec5252b6265549589310d742337c91cb2c..6a6a772c1d0bc9b4889014407454a891
server.halt(true);
servergui.runFinalizers();
}
@@ -123,7 +126,7 @@ public class MinecraftServerGui extends JComponent {
@@ -123,7 +125,7 @@ public class MinecraftServerGui extends JComponent {
// Paper start - Add onboarding message for initial server start
private JComponent buildOnboardingPanel() {
- String onboardingLink = "https://docs.papermc.io/paper/next-steps";
+ String onboardingLink = GETTING_STARTED; // Plazma - Rebranding
+ String onboardingLink = org.bukkit.craftbukkit.util.Versioning.STEPUP; // Plazma - Rebranding
JPanel jPanel = new JPanel();
javax.swing.JLabel jLabel = new javax.swing.JLabel("If you need help setting up your server you can visit:");
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
index f6e3b745fc417354380d4a969f83aee430bad785..ce0686759f0c32e9ffcb26f99503215a49873b91 100644
index f6e3b745fc417354380d4a969f83aee430bad785..d2795cacee1b3dd2d73ec91553bb8aa3206db74a 100644
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
@@ -155,7 +155,7 @@ public class RegionFileStorage implements AutoCloseable {
@@ -370,7 +351,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..ce0686759f0c32e9ffcb26f99503215a
// Paper start
private static void printOversizedLog(String msg, Path file, int x, int z) {
- org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO PAPER - You may ask for help on Discord, but do not file an issue. These error messages can not be removed.");
+ org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO PLAZMA - You may ask for help on Discord, but do not file an issue. These error messages can not be removed."); // Plazma - Rebrand
+ org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO " + org.bukkit.craftbukkit.util.Versioning.BRANDING + " - You may ask for help on Discord, but do not file an issue. These error messages can not be removed."); // Plazma - Rebrand
}
private static CompoundTag readOversizedChunk(RegionFile regionfile, ChunkPos chunkCoordinate) throws IOException {
@@ -388,7 +369,7 @@ index 19937ffa2c93cb75ea8dba58dd5a8214adc035fa..c3805881b675b5c2171a6aadbd2c9057
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index a0a7bfe8f5a40b945b83096de1efd650adeb9ee3..0d31b43cc7d319accaaf5548df8ea88dcd05a903 100644
index a0a7bfe8f5a40b945b83096de1efd650adeb9ee3..369543328531b0bd12c76aa8552e565bc40b51f7 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -142,7 +142,7 @@ public class Main {
@@ -396,7 +377,7 @@ index a0a7bfe8f5a40b945b83096de1efd650adeb9ee3..0d31b43cc7d319accaaf5548df8ea88d
this.acceptsAll(Main.asList("noconsole"), "Disables the console");
- this.acceptsAll(Main.asList("v", "version"), "Show the CraftBukkit Version");
+ this.acceptsAll(Main.asList("v", "version"), "Show the Plazma Version"); // Plazma - Rebrand
+ this.acceptsAll(Main.asList("v", "version"), "Show the " + org.bukkit.craftbukkit.util.Versioning.BRANDING + " Version"); // Plazma - Rebrand
this.acceptsAll(Main.asList("demo"), "Demo mode");
@@ -405,7 +386,7 @@ index a0a7bfe8f5a40b945b83096de1efd650adeb9ee3..0d31b43cc7d319accaaf5548df8ea88d
.withRequiredArg()
.ofType(String.class)
- .defaultsTo("Unknown Server")
+ .defaultsTo("A Plazma Server") // Plazma - Rebrand
+ .defaultsTo("A " + org.bukkit.craftbukkit.util.Versioning.BRANDING + " Server") // Plazma - Rebrand
.describedAs("Name");
// Paper end
}
@@ -427,7 +408,7 @@ index a0a7bfe8f5a40b945b83096de1efd650adeb9ee3..0d31b43cc7d319accaaf5548df8ea88d
}
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index ca8ae8e1c51b937dac916e0b0dc94b5e2e61efeb..2058af0975e510b3f86d7dbb1811062b9b0dc342 100644
index ca8ae8e1c51b937dac916e0b0dc94b5e2e61efeb..324495c8be1a54434e7c73158d7d20dba625b7f7 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -503,7 +503,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -435,15 +416,22 @@ index ca8ae8e1c51b937dac916e0b0dc94b5e2e61efeb..2058af0975e510b3f86d7dbb1811062b
} else {
// this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper
- task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to Purpur"); // Paper // Purpur
+ task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to Plazma"); // Paper // Purpur // Plazma - Rebrand
+ task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to " + org.bukkit.craftbukkit.util.Versioning.BRANDING + "."); // Paper // Purpur // Plazma - Rebrand
// We don't need to parse pending
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..0aa8dfa94368fb119644760e3686a7c01f510456 100644
index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..85265c28d2e5369c812ec856855183a98908680c 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -8,22 +8,25 @@ import java.util.logging.Logger;
@@ -2,28 +2,40 @@ package org.bukkit.craftbukkit.util;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Locale;
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.Bukkit;
public final class Versioning {
@@ -451,8 +439,16 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..0aa8dfa94368fb119644760e3686a7c0
- String result = "Unknown-Version";
-
- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.purpurmc.purpur/purpur-api/pom.properties"); // Pufferfish // Purpur
+ // Plazma start - Rebrand & Improve Versioning
+ public static String version = "Unknown-Version";
+ // Plazma start - Rebrand; Branding utils
+ private static String version = "Unknown-Version";
+ public static final String BRANDING = "Plazma";
+ public static final String BRAND_L = BRANDING.toLowerCase(Locale.ROOT);
+ public static final String BRAND_U = BRANDING.toUpperCase(Locale.ROOT);
+ public static final String DOWNLOAD = "https://plazmamc.org/downloads";
+ public static final String REPOSITORY = "PlazmaMC/PlazmaBukkit";
+ public static final String DOCUMENT = "https://docs.plazmamc.org/plazma/administration/getting-started";
+ public static final String STEPUP = "https://docs.plazmamc.org/plazma/administration/getting-started/next-step";
+ public static final boolean DEVELOPMENT = false;
+ static {
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.plazmamc.plazma/plazma-api/pom.properties");
Properties properties = new Properties();
@@ -474,10 +470,10 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..0aa8dfa94368fb119644760e3686a7c0
+ public static String getBukkitVersion() {
+ return version;
}
+ // Plazma end - Rebrand & Improve Versioning
+ // Plazma end - Rebranding; Branding utils
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index f49108ed94f7787347c5e0a721646083d6dffafc..9311fcb675d20ee77d225e3cffe1d6ce56601963 100644
index de70bfdbdd7740fdf20dd063a7a623a9e96cef98..85f4a9300aebfd4ee64d179dfa1f7ffd314cb3b8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -231,7 +231,7 @@ public class PurpurConfig {
@@ -485,71 +481,62 @@ index f49108ed94f7787347c5e0a721646083d6dffafc..9311fcb675d20ee77d225e3cffe1d6ce
}
- public static String serverModName = "Purpur";
+ public static String serverModName = "Plazma"; // Plazma - Rebrand
+ public static String serverModName = org.bukkit.craftbukkit.util.Versioning.BRANDING; // Plazma - Rebrand
private static void serverModName() {
serverModName = getString("settings.server-mod-name", serverModName);
}
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
index a353eb9f45af7b7f9bfd92a4a89403335b841840..effcdfcc5d817e2c4b77862978ab8545068bc0c8 100644
index a353eb9f45af7b7f9bfd92a4a89403335b841840..e9203846793c3e16099556b10e5cf99376474f13 100644
--- a/src/main/java/org/spigotmc/WatchdogThread.java
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -11,6 +11,8 @@ import org.bukkit.Bukkit;
public final class WatchdogThread extends io.papermc.paper.util.TickThread // Paper - rewrite chunk system
{
+ private static final String BRANDING = "Plazma"; // Plazma - Rebranding
+ private static final String REPOSITORY = "https://git.plazmamc.org/1.20.6"; // Plazma - Rebranding
public static final boolean DISABLE_WATCHDOG = Boolean.getBoolean("disable.watchdog"); // Paper
private static WatchdogThread instance;
private long timeoutTime;
@@ -96,7 +98,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
@@ -96,7 +96,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
private WatchdogThread(long timeoutTime, boolean restart)
{
- super( "Watchdog Thread" ); // Purpur - use a generic name
+ super( BRANDING + " Watchdog Thread" ); // Purpur - use a generic name // Plazma - Rebranding; nah we dont
+ super( org.bukkit.craftbukkit.util.Versioning.BRANDING + " Watchdog Thread" ); // Purpur - use a generic name // Plazma - Rebranding; nah we dont
this.timeoutTime = timeoutTime;
this.restart = restart;
earlyWarningEvery = Math.min(io.papermc.paper.configuration.GlobalConfiguration.get().watchdog.earlyWarningEvery, timeoutTime); // Paper
@@ -155,14 +157,14 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
@@ -155,14 +155,14 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
if (isLongTimeout) {
// Paper end
log.log( Level.SEVERE, "------------------------------" );
- log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Purpur bug." ); // Paper // Purpur
+ log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a " + BRANDING + " bug." ); // Paper // Purpur // Plazma - Rebrand
+ log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a " + org.bukkit.craftbukkit.util.Versioning.BRANDING + " bug." ); // Paper // Purpur // Plazma - Rebrand
log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" );
log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" );
log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
- log.log( Level.SEVERE, "If you are unsure or still think this is a Purpur bug, please report this to https://github.com/PurpurMC/Purpur/issues" ); // Purpur
+ log.log( Level.SEVERE, "If you are unsure or still think this is a " + BRANDING + " bug, please report this to " + REPOSITORY ); // Purpur // Plazma - Rebrand
+ log.log( Level.SEVERE, "If you are unsure or still think this is a " + org.bukkit.craftbukkit.util.Versioning.BRANDING + " bug, please report this to " + org.bukkit.craftbukkit.util.Versioning.REPOSITORY ); // Purpur // Plazma - Rebrand
log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
- log.log( Level.SEVERE, "Purpur version: " + Bukkit.getServer().getVersion() ); // Purpur
+ log.log( Level.SEVERE, "Plazma version: " + Bukkit.getServer().getVersion() ); // Purpur // Plazma - Rebrand
//
if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
{
@@ -184,12 +186,12 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
@@ -184,12 +184,12 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
// Paper end
} else
{
- log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH - " + Bukkit.getServer().getVersion() + " ---"); // Purpur
+ log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO " + BRANDING.toUpperCase() + " - THIS IS NOT A BUG OR A CRASH - " + Bukkit.getServer().getVersion() + " ---"); // Purpur // Plazma - Rebrand
+ log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO " + org.bukkit.craftbukkit.util.Versioning.BRAND_U + " - THIS IS NOT A BUG OR A CRASH - " + Bukkit.getServer().getVersion() + " ---"); // Purpur // Plazma - Rebrand
log.log(Level.SEVERE, "The server has not responded for " + (currentTime - lastTick) / 1000 + " seconds! Creating thread dump");
}
// Paper end - Different message for short timeout
log.log( Level.SEVERE, "------------------------------" );
- log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Purpur!):" ); // Paper // Purpur
+ log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to " + BRANDING + "!):" ); // Paper // Purpur // Plazma - Rebrand
+ log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to " + org.bukkit.craftbukkit.util.Versioning.BRANDING + "!):" ); // Paper // Purpur // Plazma - Rebrand
io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper - rewrite chunk system
this.dumpTickingInfo(); // Paper - log detailed tick information
WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
@@ -205,7 +207,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
@@ -205,7 +205,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
WatchdogThread.dumpThread( thread, log );
}
} else {
- log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH ---"); // Purpur
+ log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO " + BRANDING.toUpperCase() + " - THIS IS NOT A BUG OR A CRASH ---"); // Purpur // Plazma - Rebrand
+ log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO " + org.bukkit.craftbukkit.util.Versioning.BRAND_U + " - THIS IS NOT A BUG OR A CRASH ---"); // Purpur // Plazma - Rebrand
}
log.log( Level.SEVERE, "------------------------------" );

16
patches/server/0005-Plazma-Configurations.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Plazma Configurations
diff --git a/build.gradle.kts b/build.gradle.kts
index e6b6d1f26fd673f35f66a09a64c83810e092e757..1bccc21fa2130e577bd5c64b6ca08e9b2853cc22 100644
index 279e1cfd24f29d3ac55e74759d8b542a7520de3d..5b81ed7a9f978b59b1b287126c9161aa6446a28d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,6 +22,7 @@ dependencies {
@@ -17,7 +17,7 @@ index e6b6d1f26fd673f35f66a09a64c83810e092e757..1bccc21fa2130e577bd5c64b6ca08e9b
runtimeOnly(common.maven.provider)
diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java
index 44dda308913d8d25e53d8d0fc7e50c0c678b76d0..5500196e8ca85f9e4542d2ffd02a6f8f12a09083 100644
index f5d725feb6d32f947eed82073c5594e205f31afe..71be8c8e5bb887a68e9ae5ab822313d7766ad6ca 100644
--- a/src/main/java/io/papermc/paper/configuration/Configurations.java
+++ b/src/main/java/io/papermc/paper/configuration/Configurations.java
@@ -39,28 +39,95 @@ public abstract class Configurations<G, W> {
@@ -517,10 +517,10 @@ index 83a726bcf8b7dce73a361b0d79dbd63a0afc7a12..3c893e5da90f7fcf519f190e34e2b15e
+
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b797f719acb2258bee1cc93394561f14a9df5296..aa02d9390a90e235476a25db31c915668ebc0ec9 100644
index 6d549448e67a110a42dde6f8eeaab1f0033f3462..065308f8cca471dee8360857bd627402849976dc 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -316,6 +316,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -314,6 +314,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public final double[] recentTps = new double[ 4 ]; // Purpur
// Spigot end
public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
@@ -528,7 +528,7 @@ index b797f719acb2258bee1cc93394561f14a9df5296..aa02d9390a90e235476a25db31c91566
public static long currentTickLong = 0L; // Paper - track current tick as a long
public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
public boolean lagging = false; // Purpur
@@ -427,6 +428,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -425,6 +426,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
// CraftBukkit end
this.paperConfigurations = services.paperConfigurations(); // Paper - add paper configuration files
@@ -577,7 +577,7 @@ index 33e3815a0c979609d4c7ab83ad91e87ac07a556d..5b3d59cc5e4efd54bea967d2e37dc933
}
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index ae0849f190f54afa0bae19877189ec2de7521ae9..5fb36396bf0391361d23007c95b05dbffa30c1b0 100644
index d606da8627219b5ecf4f1500086905fb4f572ca9..28e8967a87715fb2db25feb84e8736c446f355b5 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -222,6 +222,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -666,11 +666,11 @@ index c3805881b675b5c2171a6aadbd2c9057eff1ab9e..76d61c1f0a8e2fd0bed6be3052828a04
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 0d31b43cc7d319accaaf5548df8ea88dcd05a903..c8979f3ec7b5d98daa0ddf75dd1d28da5ca82026 100644
index 369543328531b0bd12c76aa8552e565bc40b51f7..40fd40da9a7fc2b12035b99960e7f38c78eb2a5e 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -190,6 +190,14 @@ public class Main {
.defaultsTo("A Plazma Server") // Plazma - Rebrand
.defaultsTo("A " + org.bukkit.craftbukkit.util.Versioning.BRANDING + " Server") // Plazma - Rebrand
.describedAs("Name");
// Paper end
+

8
patches/server/0007-Warn-on-startup.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Warn on startup
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
index 2579b32009a5f5e288edf56ee8f1246cd70343fc..dafd37b3a31fbf63113787ccf6697651f5e1770d 100644
index 0fb3eeab083a0b1e9b495bd2c5c556fca2236c22..ce7782dd216922ad536bb435034255508271bfa4 100644
--- a/src/main/java/net/minecraft/server/Main.java
+++ b/src/main/java/net/minecraft/server/Main.java
@@ -127,6 +127,18 @@ public class Main {
@@ -14,10 +14,10 @@ index 2579b32009a5f5e288edf56ee8f1246cd70343fc..dafd37b3a31fbf63113787ccf6697651
// Plazma end
+ // Plazma start - Warn on startup
+ if (!org.plazmamc.plazma.Options.NO_WARN) {
+ LOGGER.warn("Warning! Plazma may cause unexpected problems, so be sure to test it thoroughly before using it on a public server.");
+ if (com.destroystokyo.paper.PaperVersionFetcher.DEVELOPMENT) {
+ LOGGER.warn("Warning! " + org.bukkit.craftbukkit.util.Versioning.BRANDING + " may cause unexpected problems, so be sure to test it thoroughly before using it on a public server.");
+ if (org.bukkit.craftbukkit.util.Versioning.DEVELOPMENT) {
+ LOGGER.error("*********************** CAUTION ***********************");
+ LOGGER.error("This version is a development version of Plazma.");
+ LOGGER.error("This version is a development version of " + org.bukkit.craftbukkit.util.Versioning.BRANDING + ".");
+ LOGGER.error("Nobody knows what kind of problem you're going to have, and there's always the possibility of unexpected problems.");
+ LOGGER.error("Never use this version on a public server, and after you've tested it enough before using it!");
+ LOGGER.error("*******************************************************");

24
patches/server/0008-Development-Build.patch
View File

@@ -4,16 +4,16 @@ Date: Tue, 7 May 2024 22:42:25 +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 0a846802f053c545992763e0447e15565204e764..31edd38bbcd117dcde867e4cf7d25f657ea16468 100644
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -27,7 +27,7 @@ public class PaperVersionFetcher implements VersionFetcher {
private static final String PROJECT_NAME = "Plazma";
private static final String PROJECT_REPO = "PlazmaMC/PlazmaBukkit";
private static final String DOWNLOAD_PAGE = "https://docs.plazmamc.org/plazma/about/downloads";
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 85265c28d2e5369c812ec856855183a98908680c..3dc8487be735cd13207cc9608e3faf95c3231536 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -18,7 +18,7 @@ public final class Versioning {
public static final String REPOSITORY = "PlazmaMC/PlazmaBukkit";
public static final String DOCUMENT = "https://docs.plazmamc.org/plazma/administration/getting-started";
public static final String STEPUP = "https://docs.plazmamc.org/plazma/administration/getting-started/next-step";
- public static final boolean DEVELOPMENT = false;
+ public static final boolean DEVELOPMENT = true;
// Plazma end
@Override
+ public static final boolean DEVELOPMENT = true; // Plazma - Development build
static {
InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.plazmamc.plazma/plazma-api/pom.properties");
Properties properties = new Properties();

10
patches/server/0009-Port-SparklyPaper-patches.patch
View File

@@ -137,10 +137,10 @@ index f164256d59b761264876ca0c85f812d101bfd5de..deaeb134c47da8710afa747bf980bd00
final TrackedChunk chunk = this.byChunk.get(CoordinateUtils.getChunkKey(chunkX, chunkZ));
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c30bc456caf25fa07dc870eb544469e6d1184169..2213f09a99ea832f59ba802d411f11abfdc8141b 100644
index 065308f8cca471dee8360857bd627402849976dc..eb4c8b516be77423c7decb247f261a264b1cfc89 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -325,6 +325,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -323,6 +323,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public volatile Thread shutdownThread; // Paper
public volatile boolean abnormalExit = false; // Paper
public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation
@@ -148,7 +148,7 @@ index c30bc456caf25fa07dc870eb544469e6d1184169..2213f09a99ea832f59ba802d411f11ab
public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
AtomicReference<S> atomicreference = new AtomicReference();
@@ -1743,17 +1744,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1741,17 +1742,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
//MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Spigot // Paper // Purpur
// Paper start - Folia scheduler API
((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
@@ -175,7 +175,7 @@ index c30bc456caf25fa07dc870eb544469e6d1184169..2213f09a99ea832f59ba802d411f11ab
// Paper end - Folia scheduler API
io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
//this.profiler.push("commandFunctions"); // Purpur
@@ -1820,7 +1819,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1818,7 +1817,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
try {
//worldserver.timings.doTick.startTiming(); // Spigot // Purpur
@@ -192,7 +192,7 @@ index c30bc456caf25fa07dc870eb544469e6d1184169..2213f09a99ea832f59ba802d411f11ab
for (final io.papermc.paper.chunk.SingleThreadChunkRegionManager regionManager : worldserver.getChunkSource().chunkMap.regionManagers) {
regionManager.recalculateRegions();
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 5fb36396bf0391361d23007c95b05dbffa30c1b0..f116d7163c71d35668ef7a3c77a627d925bb3550 100644
index 28e8967a87715fb2db25feb84e8736c446f355b5..32332070cc62c0842333b05c53005feb30051914 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -224,6 +224,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface

22
patches/server/0015-Completely-remove-Mojang-Profiler.patch
View File

@@ -65,7 +65,7 @@ index f626a2f28f2aebb3237cebb6afef3c4fa1a6cb37..467e17bfce31d0919d603698c9d88a04
public int forkLimit() {
return this.forkLimit;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 2213f09a99ea832f59ba802d411f11abfdc8141b..ecf2f3fb8bd62fca7552da8704752db96b287920 100644
index eb4c8b516be77423c7decb247f261a264b1cfc89..da5275e9137023b39f7a0a20255e483b61a5237f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -104,18 +104,18 @@ import net.minecraft.util.datafix.DataFixers;
@@ -97,7 +97,7 @@ index 2213f09a99ea832f59ba802d411f11abfdc8141b..ecf2f3fb8bd62fca7552da8704752db9
import net.minecraft.util.thread.ReentrantBlockableEventLoop;
import net.minecraft.world.Difficulty;
import net.minecraft.world.RandomSequences;
@@ -222,14 +222,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -220,14 +220,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public LevelStorageSource.LevelStorageAccess storageSource;
public final PlayerDataStorage playerDataStorage;
private final List<Runnable> tickables = Lists.newArrayList();
@@ -120,7 +120,7 @@ index 2213f09a99ea832f59ba802d411f11abfdc8141b..ecf2f3fb8bd62fca7552da8704752db9
private ServerConnectionListener connection;
public final ChunkProgressListenerFactory progressListenerFactory;
@Nullable
@@ -2596,10 +2596,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2594,10 +2594,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
@@ -133,7 +133,7 @@ index 2213f09a99ea832f59ba802d411f11abfdc8141b..ecf2f3fb8bd62fca7552da8704752db9
public abstract boolean isSingleplayerOwner(GameProfile profile);
@@ -2843,6 +2845,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2841,6 +2843,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
// CraftBukkit end
@@ -141,7 +141,7 @@ index 2213f09a99ea832f59ba802d411f11abfdc8141b..ecf2f3fb8bd62fca7552da8704752db9
private void startMetricsRecordingTick() {
if (false && this.willStartRecordingMetrics) { // Purpur
this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(Util.timeSource, this.isDedicatedServer()), Util.timeSource, Util.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
@@ -2869,12 +2872,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2867,12 +2870,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public void startRecordingMetrics(Consumer<ProfileResults> resultConsumer, Consumer<Path> dumpConsumer) {
@@ -156,7 +156,7 @@ index 2213f09a99ea832f59ba802d411f11abfdc8141b..ecf2f3fb8bd62fca7552da8704752db9
}
public void stopRecordingMetrics() {
@@ -2889,6 +2892,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2887,6 +2890,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
//this.metricsRecorder.cancel(); // Purpur
//this.profiler = this.metricsRecorder.getProfiler(); // Purpur
}
@@ -164,7 +164,7 @@ index 2213f09a99ea832f59ba802d411f11abfdc8141b..ecf2f3fb8bd62fca7552da8704752db9
public Path getWorldPath(LevelResource worldSavePath) {
return this.storageSource.getLevelPath(worldSavePath);
@@ -2939,6 +2943,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2937,6 +2941,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
return this.isSaving;
}
@@ -172,7 +172,7 @@ index 2213f09a99ea832f59ba802d411f11abfdc8141b..ecf2f3fb8bd62fca7552da8704752db9
public boolean isTimeProfilerRunning() {
return false; //this.debugCommandProfilerDelayStart || this.debugCommandProfiler != null; // Purpur
}
@@ -2957,6 +2962,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2955,6 +2960,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
return methodprofilerresults;
}
}
@@ -180,7 +180,7 @@ index 2213f09a99ea832f59ba802d411f11abfdc8141b..ecf2f3fb8bd62fca7552da8704752db9
public int getMaxChainedNeighborUpdates() {
return 1000000;
@@ -3008,6 +3014,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -3006,6 +3012,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
@@ -188,7 +188,7 @@ index 2213f09a99ea832f59ba802d411f11abfdc8141b..ecf2f3fb8bd62fca7552da8704752db9
private static class TimeProfiler {
final long startNanos;
@@ -3057,6 +3064,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -3055,6 +3062,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
};
}
}
@@ -361,7 +361,7 @@ index 8c587f829c5e8c6b6df3150024c4ae704988c47b..319f484b535143a94ee2da11114acacc
}
+// Plazma end - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 1dc1536df986862396aa0f58e834c9c1599bf38e..2d704c3e24505314ec9754cb407fce54e914511b 100644
index 0559c251107ebbcf49940a5c7647dce2310eae92..b8fcb2841abf0b00f278d21cb344866ed987b4ce 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -923,11 +923,13 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface

6
patches/server/0017-Reduce-create-random-instance.patch
View File

@@ -5,10 +5,10 @@ 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 56859a5aebdff201a829b40716c655a0ab7f7e72..e460bbcdc370ef300e6c4fbbacb71fe6172c944c 100644
index da5275e9137023b39f7a0a20255e483b61a5237f..33b7b4f544d3ec597075edcbd265815c65c9f8fa 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -237,6 +237,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -235,6 +235,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@Nullable
private ServerStatus.Favicon statusIcon;
private final RandomSource random;
@@ -30,7 +30,7 @@ index b47a8a082170bcb630c4354be7c77a4cac71d105..7fe6b99e146e7374cd29534f1e89046e
double d1 = (double) (center.y - maxRange);
double d2 = (double) (center.x + maxRange);
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 42a623254bd2886d09eb0cfeb01dd12d0dda19cf..feed838fe1ff9db60f1971cbafc25baf9af69fac 100644
index d7e4a9fe9676563845d9981523bff1a7ff12282c..b7b9e02ab31206c48f0db88beabc331b7e73245c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -482,7 +482,7 @@ public class ServerPlayer extends Player {

6
patches/server/0033-Add-more-MSPT.patch
View File

@@ -94,10 +94,10 @@ index 03be23690a94a14d7343526acad67ccf53b85c70..416c0a736edf47f76a37be0bc5fe8678
)
);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b991365962585ab1cd23c4bf1250dc54ad07b4d0..553c90d0d6a5719493cd20ad9a132f460a9adb1b 100644
index 33b7b4f544d3ec597075edcbd265815c65c9f8fa..3a7c0b25d160ca18a26ebd29cb3b0fcf78fef146 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -259,8 +259,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -257,8 +257,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
private final long[] tickTimesNanos;
private long aggregatedTickTimesNanos;
// Paper start - Add tick times API and /mspt command
@@ -108,7 +108,7 @@ index b991365962585ab1cd23c4bf1250dc54ad07b4d0..553c90d0d6a5719493cd20ad9a132f46
public final TickTimes tickTimes60s = new TickTimes(1200);
// Paper end - Add tick times API and /mspt command
@Nullable
@@ -1825,8 +1827,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1823,8 +1825,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
worldserver.tick(shouldKeepTicking);
long after = Util.getNanos() - before;

4
patches/server/0036-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Use Plazma logo instead if server favicon doesn't exist
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 553c90d0d6a5719493cd20ad9a132f460a9adb1b..ab36695fa53e074dac51dfd923448241aaca7170 100644
index 3a7c0b25d160ca18a26ebd29cb3b0fcf78fef146..4635d67ed906886f533b6d5911d99a163810ea11 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1559,29 +1559,36 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1557,29 +1557,36 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
private Optional<ServerStatus.Favicon> loadStatusIcon() {