From ada56e25dc5898df8d2eb9c6c36b0ec8bd7adf63 Mon Sep 17 00:00:00 2001
From: Luke Hoersten <luke@hoersten.org>
Date: Mon, 26 Oct 2026 20:09:51 -0500
Subject: minecraft: bump paper build; migrate geyser off the retired Jenkins
 CI

paper: bump build 69 -> 132 for the same pinned Minecraft version
(1.21.11); no game-version change.

geyser: ci.opencollab.dev (the old Jenkins CI minecraft_geyser_url
pointed at) is retired, returning 502 on every path including the base
job page. Migrate to download.geysermc.org's v2 API, same pattern
main.yaml already uses for paper's fill.papermc.io v3 API: look up the
build info for its sha256, then get_url with that checksum so a version
bump actually triggers a re-download. The old Jenkins build number
("1538") and the new API's build numbers are unrelated sequences, so
this is a fresh pin (2.12.1 build 1273), not a continuation.
---
 minecraft/server/defaults/main.yaml | 12 +++++++-----
 minecraft/server/tasks/geyser.yaml  | 11 ++++++++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'minecraft/server')

diff --git a/minecraft/server/defaults/main.yaml b/minecraft/server/defaults/main.yaml
index 2552e8e..dcc3a6a 100644
--- a/minecraft/server/defaults/main.yaml
+++ b/minecraft/server/defaults/main.yaml
@@ -13,7 +13,7 @@ minecraft_dir: "{{minecraft_parent_dir}}/minecraft/{{minecraft_world_name}}"
 # paper is a spigot derivative
 # version-check: https://papermc.io/downloads/paper
 minecraft_paper_version: "1.21.11"
-minecraft_paper_build: "69"
+minecraft_paper_build: "132"
 
 minecreat_plugins_enabled:
   - "dynmap"
@@ -24,7 +24,9 @@ minecreat_plugins_enabled:
 minecraft_dynmap_version: "3.8"
 minecraft_dynmap_url: "http://dynmap.us/builds/dynmap/Dynmap-{{minecraft_dynmap_version}}-spigot.jar"
 
-# https://geysermc.org
-# version-check: https://ci.opencollab.dev/job/GeyserMC/view/default/builds
-minecraft_geyser_version: "1538"
-minecraft_geyser_url: "https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/{{minecraft_geyser_version}}/artifact/bootstrap/spigot/build/libs/Geyser-Spigot.jar"
+# ci.opencollab.dev (old Jenkins CI) is retired; download.geysermc.org v2
+# returns the download url and sha256 directly, same as fill.papermc.io
+# above.
+# version-check: https://download.geysermc.org/v2/projects/geyser/versions/latest/builds/latest
+minecraft_geyser_version: "2.12.1"
+minecraft_geyser_build: "1273"
diff --git a/minecraft/server/tasks/geyser.yaml b/minecraft/server/tasks/geyser.yaml
index be22a49..3d03561 100644
--- a/minecraft/server/tasks/geyser.yaml
+++ b/minecraft/server/tasks/geyser.yaml
@@ -9,10 +9,19 @@
     mode: "0755"
     state: "directory"
 
+- name: get geyser download info
+  uri:
+    url: "https://download.geysermc.org/v2/projects/geyser/versions/{{minecraft_geyser_version}}/builds/{{minecraft_geyser_build}}"
+    return_content: yes
+  register: minecraft_geyser_build_info
+
+# The checksum makes version bumps take effect: without it, get_url skips
+# the download whenever geyser.jar already exists.
 - name: download geyser
   become: yes
   get_url:
-    url: "{{minecraft_geyser_url}}"
+    url: "https://download.geysermc.org/v2/projects/geyser/versions/{{minecraft_geyser_version}}/builds/{{minecraft_geyser_build}}/downloads/spigot"
+    checksum: "sha256:{{minecraft_geyser_build_info.json.downloads.spigot.sha256}}"
     dest: "{{minecraft_dir}}/plugins/geyser.jar"
     mode: "0755"
   notify: restart minecraft
-- 
cgit v1.2.3