Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-23 17:09:26 +00:00
Code Issues Releases Activity

Update 1.20.1

Browse Source
This commit is contained in:
violetc
2023-06-14 10:57:16 +08:00
parent 7d2b967e1c
commit 494cb91a51
19 changed files with 85 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
patches/server/0003-Update-version-fetcher-repo.patch
View File

@@ -5,22 +5,19 @@ Subject: [PATCH] Update version fetcher repo
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
index bf42969859545a8a520923ef1836ffa4a5cc24a0..895eac4479d27915566147d2f328e116ab1adbc9 100644
index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..902a4a71faeb8c41f89659df0a2a31602b4781a6 100644
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -5,10 +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.event.ClickEvent;
+import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextDecoration;
-import net.kyori.adventure.text.TextComponent;
@@ -20,7 +20,7 @@ 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
private static final String GITHUB_BRANCH_NAME = "master";
- private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper";
+ private static final String DOWNLOAD_PAGE = "https://github.com/LeavesMC/Leaves/releases"; // Leaves - change
private static @Nullable String mcVer;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -31,8 +30,10 @@ public class PaperVersionFetcher implements VersionFetcher {
@Override
@@ -31,8 +31,10 @@ public class PaperVersionFetcher implements VersionFetcher {
@Nonnull
@Override
public Component getVersionMessage(@Nonnull String serverVersion) {
@@ -33,7 +30,7 @@ index bf42969859545a8a520923ef1836ffa4a5cc24a0..895eac4479d27915566147d2f328e116
final Component history = getHistory();
return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
@@ -56,14 +57,12 @@ public class PaperVersionFetcher implements VersionFetcher {
@@ -56,14 +58,12 @@ public class PaperVersionFetcher implements VersionFetcher {
private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
int distance;
@@ -53,17 +50,21 @@ index bf42969859545a8a520923ef1836ffa4a5cc24a0..895eac4479d27915566147d2f328e116
switch (distance) {
case -1:
return Component.text("Error obtaining version information", NamedTextColor.YELLOW);
@@ -72,12 +71,7 @@ public class PaperVersionFetcher implements VersionFetcher {
case -2:
@@ -73,11 +73,12 @@ public class PaperVersionFetcher implements VersionFetcher {
return Component.text("Unknown version", NamedTextColor.YELLOW);
default:
- return Component.text("You are " + distance + " version(s) behind", NamedTextColor.YELLOW)
return Component.text("You are " + distance + " version(s) behind", NamedTextColor.YELLOW)
- .append(Component.newline())
- .append(Component.text("Download the new version at: ")
- .append(Component.text(DOWNLOAD_PAGE, NamedTextColor.GOLD)
- .hoverEvent(Component.text("Click to open", NamedTextColor.WHITE))
- .clickEvent(ClickEvent.openUrl(DOWNLOAD_PAGE))));
+ return Component.text("You are " + distance + " version(s) behind", NamedTextColor.YELLOW); // Leaves - we dont have DOWNLOAD_PAGE now
+ .append(Component.newline())
+ .append(Component.text("Download the new version at: ")
+ .append(Component.text(DOWNLOAD_PAGE, NamedTextColor.GOLD)
+ .hoverEvent(Component.text("Click to open", NamedTextColor.WHITE))
+ .clickEvent(ClickEvent.openUrl(DOWNLOAD_PAGE))));
+
}
}