Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 11:30:06 +01:00
216 Zeilen
8.0 KiB
Diff
216 Zeilen
8.0 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Kyle Wood <demonwav@gmail.com>
|
||
|
Date: Thu, 1 Mar 2018 19:37:52 -0600
|
||
|
Subject: [PATCH] Add version history to version command
|
||
|
|
||
|
|
||
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
||
|
index 1a1b50e475b9ede544b2f6d0d36632b24b68898c..580bae0d414d371a07a6bfeefc41fdd989dc0083 100644
|
||
|
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
||
|
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
||
|
@@ -5,7 +5,9 @@ import com.google.common.base.Charsets;
|
||
|
import com.google.common.io.Resources;
|
||
|
import com.google.gson.*;
|
||
|
import net.kyori.adventure.text.Component;
|
||
|
+import net.kyori.adventure.text.TextComponent;
|
||
|
import net.kyori.adventure.text.format.NamedTextColor;
|
||
|
+import net.kyori.adventure.text.format.TextDecoration;
|
||
|
|
||
|
import javax.annotation.Nonnull;
|
||
|
import javax.annotation.Nullable;
|
||
|
@@ -28,7 +30,10 @@ public class PaperVersionFetcher implements VersionFetcher {
|
||
|
@Override
|
||
|
public Component getVersionMessage(@Nonnull String serverVersion) {
|
||
|
String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]");
|
||
|
- return getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
|
||
|
+ final Component updateMessage = getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
|
||
|
+ final Component history = getHistory();
|
||
|
+
|
||
|
+ return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
|
||
|
}
|
||
|
|
||
|
private static @Nullable String getMinecraftVersion() {
|
||
|
@@ -119,4 +124,19 @@ public class PaperVersionFetcher implements VersionFetcher {
|
||
|
return -1;
|
||
|
}
|
||
|
}
|
||
|
+
|
||
|
+ @Nullable
|
||
|
+ private Component getHistory() {
|
||
|
+ final VersionHistoryManager.VersionData data = VersionHistoryManager.INSTANCE.getVersionData();
|
||
|
+ if (data == null) {
|
||
|
+ return null;
|
||
|
+ }
|
||
|
+
|
||
|
+ final String oldVersion = data.getOldVersion();
|
||
|
+ if (oldVersion == null) {
|
||
|
+ return null;
|
||
|
+ }
|
||
|
+
|
||
|
+ return Component.text("Previous version: " + oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC);
|
||
|
+ }
|
||
|
}
|
||
|
diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
|
||
|
new file mode 100644
|
||
|
index 0000000000000000000000000000000000000000..aac3f66cb23d260729c2a48d8710a9de2346aa22
|
||
|
--- /dev/null
|
||
|
+++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
|
||
|
@@ -0,0 +1,145 @@
|
||
|
+package com.destroystokyo.paper;
|
||
|
+
|
||
|
+import com.google.common.base.MoreObjects;
|
||
|
+import com.google.gson.Gson;
|
||
|
+import com.google.gson.JsonSyntaxException;
|
||
|
+import java.io.BufferedReader;
|
||
|
+import java.io.BufferedWriter;
|
||
|
+import java.io.IOException;
|
||
|
+import java.nio.charset.StandardCharsets;
|
||
|
+import java.nio.file.Files;
|
||
|
+import java.nio.file.Path;
|
||
|
+import java.nio.file.Paths;
|
||
|
+import java.nio.file.StandardOpenOption;
|
||
|
+import java.util.Objects;
|
||
|
+import java.util.logging.Level;
|
||
|
+import java.util.logging.Logger;
|
||
|
+import org.bukkit.Bukkit;
|
||
|
+
|
||
|
+import javax.annotation.Nonnull;
|
||
|
+import javax.annotation.Nullable;
|
||
|
+
|
||
|
+public enum VersionHistoryManager {
|
||
|
+ INSTANCE;
|
||
|
+
|
||
|
+ private final Gson gson = new Gson();
|
||
|
+
|
||
|
+ private final Logger logger = Bukkit.getLogger();
|
||
|
+
|
||
|
+ private VersionData currentData = null;
|
||
|
+
|
||
|
+ VersionHistoryManager() {
|
||
|
+ final Path path = Paths.get("version_history.json");
|
||
|
+
|
||
|
+ if (Files.exists(path)) {
|
||
|
+ // Basic file santiy checks
|
||
|
+ if (!Files.isRegularFile(path)) {
|
||
|
+ if (Files.isDirectory(path)) {
|
||
|
+ logger.severe(path + " is a directory, cannot be used for version history");
|
||
|
+ } else {
|
||
|
+ logger.severe(path + " is not a regular file, cannot be used for version history");
|
||
|
+ }
|
||
|
+ // We can't continue
|
||
|
+ return;
|
||
|
+ }
|
||
|
+
|
||
|
+ try (final BufferedReader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8)) {
|
||
|
+ currentData = gson.fromJson(reader, VersionData.class);
|
||
|
+ } catch (final IOException e) {
|
||
|
+ logger.log(Level.SEVERE, "Failed to read version history file '" + path + "'", e);
|
||
|
+ return;
|
||
|
+ } catch (final JsonSyntaxException e) {
|
||
|
+ logger.log(Level.SEVERE, "Invalid json syntax for file '" + path + "'", e);
|
||
|
+ return;
|
||
|
+ }
|
||
|
+
|
||
|
+ final String version = Bukkit.getVersion();
|
||
|
+ if (version == null) {
|
||
|
+ logger.severe("Failed to retrieve current version");
|
||
|
+ return;
|
||
|
+ }
|
||
|
+
|
||
|
+ if (!version.equals(currentData.getCurrentVersion())) {
|
||
|
+ // The version appears to have changed
|
||
|
+ currentData.setOldVersion(currentData.getCurrentVersion());
|
||
|
+ currentData.setCurrentVersion(version);
|
||
|
+ writeFile(path);
|
||
|
+ }
|
||
|
+ } else {
|
||
|
+ // File doesn't exist, start fresh
|
||
|
+ currentData = new VersionData();
|
||
|
+ // oldVersion is null
|
||
|
+ currentData.setCurrentVersion(Bukkit.getVersion());
|
||
|
+ writeFile(path);
|
||
|
+ }
|
||
|
+ }
|
||
|
+
|
||
|
+ private void writeFile(@Nonnull final Path path) {
|
||
|
+ try (final BufferedWriter writer = Files.newBufferedWriter(
|
||
|
+ path,
|
||
|
+ StandardCharsets.UTF_8,
|
||
|
+ StandardOpenOption.WRITE,
|
||
|
+ StandardOpenOption.CREATE,
|
||
|
+ StandardOpenOption.TRUNCATE_EXISTING
|
||
|
+ )) {
|
||
|
+ gson.toJson(currentData, writer);
|
||
|
+ } catch (final IOException e) {
|
||
|
+ logger.log(Level.SEVERE, "Failed to write to version history file", e);
|
||
|
+ }
|
||
|
+ }
|
||
|
+
|
||
|
+ @Nullable
|
||
|
+ public VersionData getVersionData() {
|
||
|
+ return currentData;
|
||
|
+ }
|
||
|
+
|
||
|
+ public static class VersionData {
|
||
|
+ private String oldVersion;
|
||
|
+
|
||
|
+ private String currentVersion;
|
||
|
+
|
||
|
+ @Nullable
|
||
|
+ public String getOldVersion() {
|
||
|
+ return oldVersion;
|
||
|
+ }
|
||
|
+
|
||
|
+ public void setOldVersion(@Nullable String oldVersion) {
|
||
|
+ this.oldVersion = oldVersion;
|
||
|
+ }
|
||
|
+
|
||
|
+ @Nullable
|
||
|
+ public String getCurrentVersion() {
|
||
|
+ return currentVersion;
|
||
|
+ }
|
||
|
+
|
||
|
+ public void setCurrentVersion(@Nullable String currentVersion) {
|
||
|
+ this.currentVersion = currentVersion;
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public String toString() {
|
||
|
+ return MoreObjects.toStringHelper(this)
|
||
|
+ .add("oldVersion", oldVersion)
|
||
|
+ .add("currentVersion", currentVersion)
|
||
|
+ .toString();
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public boolean equals(@Nullable Object o) {
|
||
|
+ if (this == o) {
|
||
|
+ return true;
|
||
|
+ }
|
||
|
+ if (o == null || getClass() != o.getClass()) {
|
||
|
+ return false;
|
||
|
+ }
|
||
|
+ final VersionData versionData = (VersionData) o;
|
||
|
+ return Objects.equals(oldVersion, versionData.oldVersion) &&
|
||
|
+ Objects.equals(currentVersion, versionData.currentVersion);
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public int hashCode() {
|
||
|
+ return Objects.hash(oldVersion, currentVersion);
|
||
|
+ }
|
||
|
+ }
|
||
|
+}
|
||
|
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||
|
index 59942eb6bb6e8e1e9a988bce0d09757e575018b9..faf4d00bf288359db806913c4d2964324e8706b7 100644
|
||
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||
|
@@ -196,6 +196,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||
|
return false;
|
||
|
}
|
||
|
com.destroystokyo.paper.PaperConfig.registerCommands();
|
||
|
+ com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
|
||
|
// Paper end
|
||
|
|
||
|
this.setPVP(dedicatedserverproperties.pvp);
|