From c7601efd979b3faaf781b6b9e338ea061acb32c0 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Fri, 3 Jan 2025 15:49:11 -0500 Subject: [PATCH] Update version fetcher --- .github/workflows/build-1213.yml | 2 +- patches/server/0001-Rebrand.patch | 23 +++++++++++++++++++++-- todos.md | 3 ++- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-1213.yml b/.github/workflows/build-1213.yml index 190725de..158292b3 100644 --- a/.github/workflows/build-1213.yml +++ b/.github/workflows/build-1213.yml @@ -2,7 +2,7 @@ name: Build Leaf 1.21.3 on: push: - branches: [ "dev/1.21.3" ] + branches: [ "ver/1.21.3" ] pull_request: branches: [ "ver/1.21.3" ] diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 276a2524..e5791159 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -70,6 +70,25 @@ index f21106b0897dd6e373970f32f5dd269418528977..6d8634caade010a31a8e1c59684e9bb0 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> 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 2beea17d87464683faaefa835206f2654df9bde0..c066586ce43b3ae5c64d52a3a93c8c8ee883b499 100644 +--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java ++++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +@@ -40,12 +40,12 @@ public class PaperVersionFetcher extends org.galemc.gale.version.AbstractPaperVe + + public PaperVersionFetcher() { + super( +- "master", ++ "ver/1.21.3", // Leaf + "https://papermc.io/downloads/paper", + "PaperMC", + "Paper", + "PaperMC", +- "Paper" ++ "Paper-archive" // Leaf + ); + } + diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java index b78828e83d8128eace986aeb73213da3b3f905e4..9869bec65f4d0fbd5ed5aff896a8956e7ea2747f 100644 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -215,7 +234,7 @@ index 0b5979723bb30f9011ac64c36d894aa41713ec9b..e220f5601f6b92b7b280ce8ebe64117d if (stream != null) { diff --git a/src/main/java/org/dreeam/leaf/version/LeafVersionFetcher.java b/src/main/java/org/dreeam/leaf/version/LeafVersionFetcher.java new file mode 100644 -index 0000000000000000000000000000000000000000..8ebc1b7f2fb43ff78ed9e0a32d86e58882be1c74 +index 0000000000000000000000000000000000000000..a02577f08929747ea6ee964ca7289508499e1a3d --- /dev/null +++ b/src/main/java/org/dreeam/leaf/version/LeafVersionFetcher.java @@ -0,0 +1,17 @@ @@ -227,7 +246,7 @@ index 0000000000000000000000000000000000000000..8ebc1b7f2fb43ff78ed9e0a32d86e588 + + public LeafVersionFetcher() { + super( -+ "ver/1.21.1", ++ "ver/1.21.3", + "https://github.com/Winds-Studio/Leaf", + "Winds-Studio", + "Leaf", diff --git a/todos.md b/todos.md index 7c149fff..c1650012 100644 --- a/todos.md +++ b/todos.md @@ -5,4 +5,5 @@ - [ ] check multithreaded tracker, that moonrise change - [ ] Check and apply work patches - [ ] Backport Cache canHoldAnyFluid result to 1.21.1 -- [ ] tracking todos \ No newline at end of file +- [ ] tracking todos +- [ ] Update gitignore \ No newline at end of file