Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-19 15:09:25 +00:00
Code Issues Releases Activity

Cleanup version fetcher

Browse Source
This commit is contained in:
Dreeam
2025-05-28 01:19:57 +08:00
parent c1297d728e
commit 42a2c8d2f6
7 changed files with 69 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
leaf-server/gale-patches/features/0001-Rebrand.patch Normal file
View File

@@ -0,0 +1,51 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Wed, 28 May 2025 01:17:34 +0800
Subject: [PATCH] Rebrand
diff --git a/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java b/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java
index 38ecc4a0ea6e9a7f4c3a01077b7fc6f04fa20d80..fcaab9c6e1bab9b6fda8d7e1b4a68711f46aeb32 100644
--- a/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java
+++ b/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java
@@ -40,18 +40,15 @@ public abstract class AbstractPaperVersionFetcher implements VersionFetcher {
protected static final Logger LOGGER = LogUtils.getClassLogger();
protected static final int DISTANCE_ERROR = -1;
protected static final int DISTANCE_UNKNOWN = -2;
- protected static final ServerBuildInfo BUILD_INFO = ServerBuildInfo.buildInfo();
// Gale start - branding changes - version fetcher
- protected final String gitHubBranchName;
protected final String downloadPage;
protected final String organizationDisplayName;
protected final String projectDisplayName;
protected final String gitHubOrganizationName;
protected final String gitHubRepoName;
- protected AbstractPaperVersionFetcher(String githubBranchName, String downloadPage, String organizationDisplayName, String projectDisplayName, String gitHubOrganizationName, String gitHubRepoName) {
- this.gitHubBranchName = githubBranchName;
+ protected AbstractPaperVersionFetcher(String downloadPage, String organizationDisplayName, String projectDisplayName, String gitHubOrganizationName, String gitHubRepoName) {
this.downloadPage = downloadPage;
this.organizationDisplayName = organizationDisplayName;
this.projectDisplayName = projectDisplayName;
@@ -69,7 +66,7 @@ public abstract class AbstractPaperVersionFetcher implements VersionFetcher {
public @NotNull Component getVersionMessage(final @NotNull String serverVersion) {
final Component updateMessage;
final ServerBuildInfo build = ServerBuildInfo.buildInfo();
- if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) {
+ if (build.buildNumber().isEmpty() || build.gitCommit().isEmpty()) { // Gale - branding changes - version fetcher
updateMessage = text("You are running a development version without access to version information", color(0xFF5300));
} else {
updateMessage = getUpdateStatusMessage(this.gitHubOrganizationName + "/" + this.gitHubRepoName, build); // Gale - branding changes - version fetcher
diff --git a/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java b/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java
index 13de2359d321f2cebdc3a6d179ca27fb43ea5891..0d48c7b58efe3a01822ad207b44bdedaae5d4279 100644
--- a/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java
+++ b/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java
@@ -6,7 +6,6 @@ public class GaleVersionFetcher extends AbstractPaperVersionFetcher {
public GaleVersionFetcher() {
super(
- "ver/1.21.4",
"https://github.com/Dreeam-qwq/Gale",
"GaleMC",
"Gale",

0
leaf-server/gale-patches/features/0001-Leaf-Commands.patch → leaf-server/gale-patches/features/0002-Leaf-Commands.patch
View File

6
leaf-server/gale-patches/features/0002-Fix-Pufferfish-and-Purpur-patches.patch → leaf-server/gale-patches/features/0003-Fix-Pufferfish-and-Purpur-patches.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Pufferfish and Purpur patches
diff --git a/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java b/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java
index 38ecc4a0ea6e9a7f4c3a01077b7fc6f04fa20d80..6c99f64eca1fa68bb4714021cefb999dcd335b21 100644
index fcaab9c6e1bab9b6fda8d7e1b4a68711f46aeb32..8fd2157faece39024ef3bdc3000684c6b368091e 100644
--- a/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java
+++ b/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java
@@ -101,10 +101,10 @@ public abstract class AbstractPaperVersionFetcher implements VersionFetcher {
@@ -98,10 +98,10 @@ public abstract class AbstractPaperVersionFetcher implements VersionFetcher {
// Gale end - branding changes - version fetcher
return switch (distance) {
@@ -23,7 +23,7 @@ index 38ecc4a0ea6e9a7f4c3a01077b7fc6f04fa20d80..6c99f64eca1fa68bb4714021cefb999d
.append(Component.newline())
.append(text("Download the new version at: ")
.append(text(this.downloadPage, NamedTextColor.GOLD) // Gale - branding changes - version fetcher
@@ -149,6 +149,6 @@ public abstract class AbstractPaperVersionFetcher implements VersionFetcher {
@@ -146,6 +146,6 @@ public abstract class AbstractPaperVersionFetcher implements VersionFetcher {
return null;
}

0
leaf-server/gale-patches/features/0003-KeYi-Disable-arrow-despawn-counter-by-default.patch → leaf-server/gale-patches/features/0004-KeYi-Disable-arrow-despawn-counter-by-default.patch
View File

0
leaf-server/gale-patches/features/0004-Reduce-active-items-finding-hopper-nearby-check.patch → leaf-server/gale-patches/features/0005-Reduce-active-items-finding-hopper-nearby-check.patch
View File

14
leaf-server/paper-patches/features/0001-Rebrand.patch
View File

@@ -37,6 +37,18 @@ index 3d8ed4ff9a5a30d123508aeb485250271b528a6e..49ac2b52fc134bfa77a108bf58de3e81
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>(2); // Gale - metrics - reduce HashMap capacity
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
index 7fab7113821dc5d5f4ba4a2e0ee25968ad5a4439..eac1a227b50e9de07eac26dcfdba4055152897bc 100644
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -40,7 +40,6 @@ public class PaperVersionFetcher extends org.galemc.gale.version.AbstractPaperVe
public PaperVersionFetcher() {
super(
- "main",
"https://papermc.io/downloads/paper",
"PaperMC",
"Paper",
diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
index b78828e83d8128eace986aeb73213da3b3f905e4..f59879ae7d3c73cd4c4233d30667988bf22f12f1 100644
--- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
@@ -103,7 +115,7 @@ index f6bc955c3496b52cda1a20aabd78769803ef471f..f6f787db016f4d1ac14648ebf2b8e162
// (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/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index ebe1136e2487d0d13e5a924a644f2237900a86a6..bef2ae29856a72344d3d755926f1b2dce4907df1 100644
index 5155b3db9f723c4798d9964e6584654ba7c3368a..d4012acbad76ef0389d176a01e42a4c27e1918bc 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -508,7 +508,7 @@ public final class CraftMagicNumbers implements UnsafeValues {

5
leaf-server/src/main/java/org/dreeam/leaf/version/LeafVersionFetcher.java
View File

@@ -6,9 +6,8 @@ public class LeafVersionFetcher extends AbstractPaperVersionFetcher {
public LeafVersionFetcher() {
super(
"ver/1.21.4",
"https://github.com/Winds-Studio/Leaf",
"Winds-Studio",
"https://www.leafmc.one/download",
"Winds Studio",
"Leaf",
"Winds-Studio",
"Leaf"