From a2848751bda46ba409b91591a57cf88e90276f95 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Sun, 17 Nov 2024 00:40:07 +0100
Subject: chore(sterni/ingeborg/minecraft): 1.21.1 -> 1.21.3

Again, 1.21.3 only fixes uninteresting bugs compared to 1.21.2.

Change-Id: I406fe9692f21537480db734cf77eca183b6caaad
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12799
Reviewed-by: sterni <sternenseemann@systemli.org>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
---
 users/sterni/machines/ingeborg/minecraft.nix | 12 ++++++------
 users/sterni/modules/minecraft-fabric.nix    | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/users/sterni/machines/ingeborg/minecraft.nix b/users/sterni/machines/ingeborg/minecraft.nix
index 062bb9ffaa57..0ca892d4c616 100644
--- a/users/sterni/machines/ingeborg/minecraft.nix
+++ b/users/sterni/machines/ingeborg/minecraft.nix
@@ -2,13 +2,13 @@
 
 let
   carpet = pkgs.fetchurl {
-    url = "https://github.com/gnembon/fabric-carpet/releases/download/1.4.147/fabric-carpet-1.21-1.4.147+v240613.jar";
-    sha256 = "1n8r1zznl2xvkzqqwzg18d0rhfzrb675ik7z22q29svkw2jci7q7";
+    url = "https://github.com/gnembon/fabric-carpet/releases/download/1.4.158/fabric-carpet-1.21.2-1.4.158+v241022.jar";
+    sha256 = "0c76r0gz7nyn91k86flvwpbbypw5v41iib7kkvbyjb84aaafb8ap";
   };
 
   carpet-extra = pkgs.fetchurl {
-    url = "https://github.com/gnembon/carpet-extra/releases/download/1.4.148/carpet-extra-1.21-1.4.148.jar";
-    sha256 = "1yyqv1c08vml3sxyjbs5qk0z3yqiylzq8qa8vxbwiyw49dx5yhnq";
+    url = "https://github.com/gnembon/carpet-extra/releases/download/1.4.158/carpet-extra-1.21.2-1.4.158.jar";
+    sha256 = "083zifzpdgl7xxd989nm1svrrqxl4fmv7wxna10cyipg6jjabjq1";
   };
 
   userGroup = "minecraft";
@@ -74,7 +74,7 @@ in
     services.minecraft-fabric-server = {
       creative = {
         enable = false; # not actively used
-        version = "1.21.1";
+        version = "1.21.3";
         mods = [
           carpet
           carpet-extra
@@ -100,7 +100,7 @@ in
 
       carpet = {
         enable = true;
-        version = "1.21.1";
+        version = "1.21.3";
         mods = [
           carpet
           carpet-extra
diff --git a/users/sterni/modules/minecraft-fabric.nix b/users/sterni/modules/minecraft-fabric.nix
index 0234cf968368..adeca10842a0 100644
--- a/users/sterni/modules/minecraft-fabric.nix
+++ b/users/sterni/modules/minecraft-fabric.nix
@@ -201,6 +201,20 @@ let
       url = "https://piston-data.mojang.com/v1/objects/59353fb40c36d304f2035d51e7d6e6baa98dc05c/server.jar";
       sha256 = "1fxl66938ixks6imz8c5bry69z0kh6iawq1fiwca1kck7rlmbg73";
     };
+    # https://www.minecraft.net/en-us/article/minecraft-java-edition-1-21-2
+    "1.21.2" = fetchJar {
+      pname = "server";
+      version = "1.21.2";
+      url = "https://piston-data.mojang.com/v1/objects/7bf95409b0d9b5388bfea3704ec92012d273c14c/server.jar";
+      sha256 = "13a1j3vw0hy9c6wm3m2yzg6g99ikdsasap728pvi62ivna1cmjrv";
+    };
+    # https://www.minecraft.net/en-us/article/minecraft-java-edition-1-21-3 (bug fixes for 1.21.2)
+    "1.21.3" = fetchJar {
+      pname = "server";
+      version = "1.21.3";
+      url = "https://piston-data.mojang.com/v1/objects/45810d238246d90e811d896f87b14695b7fb6839/server.jar";
+      sha256 = "1ddgz0dh830869v82q0cp3zkyanl1p45f7ccbvgrr0y00advhlz1";
+    };
   };
 
   #
-- 
cgit 1.4.1