Scissors/patches/server/0017-Change-version-fetcher-to-AMG.patch

40 lines
2.4 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Sat, 26 Mar 2022 21:51:07 -0500
Subject: [PATCH] Change version fetcher to AMG
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
2022-03-26 23:34:10 -04:00
index ece77f5ea4b14bbed7c070131b3251ea86764538..7437299baa0a8d720e7b374d92530169aed5aa1d 100644
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -19,7 +19,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 GITHUB_BRANCH_NAME = "main";
private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads";
private static @Nullable String mcVer;
@@ -31,8 +31,8 @@ public class PaperVersionFetcher implements VersionFetcher {
@Nonnull
@Override
public Component getVersionMessage(@Nonnull String serverVersion) {
- String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]");
- final Component updateMessage = getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
+ String[] parts = serverVersion.substring("git-Scissors-".length()).split("[-\\s]");
+ final Component updateMessage = getUpdateStatusMessage("AtlasMediaGroup/Scissors", GITHUB_BRANCH_NAME, parts[0]);
final Component history = getHistory();
return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
2022-03-26 23:34:10 -04:00
@@ -57,7 +57,7 @@ public class PaperVersionFetcher implements VersionFetcher {
2022-03-26 23:13:07 -04:00
private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
int distance;
2022-03-26 23:34:10 -04:00
try {
2022-03-26 23:13:07 -04:00
- int jenkinsBuild = Integer.parseInt(versionInfo);
2022-03-26 23:34:10 -04:00
+ int jenkinsBuild = Integer.parseInt("force-git");
distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion());
} catch (NumberFormatException ignored) {
versionInfo = versionInfo.replace("\"", "");