mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-21 07:49:35 +00:00
81 lines
4.1 KiB
Diff
81 lines
4.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Tue, 26 Oct 2021 14:13:50 +0800
|
|
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 ece77f5ea4b14bbed7c070131b3251ea86764538..102232306e7ee9922258e38e8a449a92173f074a 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
|
@@ -3,16 +3,20 @@ package com.destroystokyo.paper;
|
|
import com.destroystokyo.paper.util.VersionFetcher;
|
|
import com.google.common.base.Charsets;
|
|
import com.google.common.io.Resources;
|
|
-import com.google.gson.*;
|
|
+import com.google.gson.Gson;
|
|
+import com.google.gson.JsonArray;
|
|
+import com.google.gson.JsonObject;
|
|
+import com.google.gson.JsonSyntaxException;
|
|
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;
|
|
|
|
import javax.annotation.Nonnull;
|
|
import javax.annotation.Nullable;
|
|
-import java.io.*;
|
|
+import java.io.BufferedReader;
|
|
+import java.io.IOException;
|
|
+import java.io.InputStreamReader;
|
|
import java.net.HttpURLConnection;
|
|
import java.net.URL;
|
|
import java.util.stream.StreamSupport;
|
|
@@ -31,8 +35,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-Leaves-".length()).split("[-\\s]");
|
|
+ final Component updateMessage = getUpdateStatusMessage("LeavesMC/Leaves", GITHUB_BRANCH_NAME, parts[0]);
|
|
final Component history = getHistory();
|
|
|
|
return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
|
|
@@ -56,14 +60,12 @@ public class PaperVersionFetcher implements VersionFetcher {
|
|
|
|
private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
|
|
int distance;
|
|
- try {
|
|
- int jenkinsBuild = Integer.parseInt(versionInfo);
|
|
- distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion());
|
|
- } catch (NumberFormatException ignored) {
|
|
- versionInfo = versionInfo.replace("\"", "");
|
|
- distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
|
|
- }
|
|
|
|
+ // Leaves start - we dont have jenkins setup
|
|
+ versionInfo = versionInfo.replace("\"", "");
|
|
+ distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
|
|
+ // Leaves end - we dont have jenkins setup
|
|
+
|
|
switch (distance) {
|
|
case -1:
|
|
return Component.text("Error obtaining version information", NamedTextColor.YELLOW);
|
|
@@ -72,12 +74,7 @@ public class PaperVersionFetcher implements VersionFetcher {
|
|
case -2:
|
|
return Component.text("Unknown version", NamedTextColor.YELLOW);
|
|
default:
|
|
- 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
|
|
}
|
|
}
|
|
|