From 9b78aa1ad65a0cf1b740a43c4032a248660bbe81 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Wed, 5 Apr 2023 18:50:48 +0200
Subject: chore(sterni/machines/edwin): minecraft 1.19.2 -> 1.19.4

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

(limited to 'users/sterni')

diff --git a/users/sterni/machines/edwin/minecraft.nix b/users/sterni/machines/edwin/minecraft.nix
index b974f77fbe..1d623f00e6 100644
--- a/users/sterni/machines/edwin/minecraft.nix
+++ b/users/sterni/machines/edwin/minecraft.nix
@@ -2,13 +2,13 @@
 
 let
   carpet = pkgs.fetchurl {
-    url = "https://github.com/gnembon/fabric-carpet/releases/download/1.4.84/fabric-carpet-1.19.2-1.4.84+v221018.jar";
-    sha256 = "146pir1j0m5l27wc5aqpq55a0bmm154q2n1c3rk9jcv5zmw34nfs";
+    url = "https://github.com/gnembon/fabric-carpet/releases/download/1.4.101/fabric-carpet-1.19.4-1.4.101+v230319.jar";
+    sha256 = "1zppsl3x9iaj616phrllc8hirj4f5wqdjf6f9w2nm0mkxr66z10l";
   };
 
   carpet-extra = pkgs.fetchurl {
-    url = "https://github.com/gnembon/carpet-extra/releases/download/1.4.84/carpet-extra-1.19.2-1.4.84.jar";
-    sha256 = "0qz79nzgssrgzpcfbaawrzcp5yp4d407vw4nl4r0isng33wh265s";
+    url = "https://github.com/gnembon/carpet-extra/releases/download/1.4.100/carpet-extra-1.19.4-1.4.100.jar";
+    sha256 = "1x3jh7nds5kkda445sbcgnz5fvw42f4pq0pvarz7rf9wgkz15i8r";
   };
 
   userGroup = "minecraft";
@@ -68,7 +68,7 @@ in
     services.minecraft-fabric-server = {
       creative = {
         enable = true;
-        version = "1.19.2";
+        version = "1.19.4";
         mods = [
           carpet
           carpet-extra
@@ -94,7 +94,7 @@ in
 
       carpet = {
         enable = true;
-        version = "1.19.2";
+        version = "1.19.4";
         mods = [
           carpet
           carpet-extra
diff --git a/users/sterni/modules/minecraft-fabric.nix b/users/sterni/modules/minecraft-fabric.nix
index 96d85e626f..7c04aae725 100644
--- a/users/sterni/modules/minecraft-fabric.nix
+++ b/users/sterni/modules/minecraft-fabric.nix
@@ -137,6 +137,20 @@ let
       url = "https://piston-data.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar";
       sha256 = "15jdxh5zvsgvvk9hnv47swgjfg8fr653g6nx99q1rxpmkq32frxj";
     };
+    "1.19.3" = fetchJar {
+      pname = "server";
+      version = "1.19.3";
+      url = "https://piston-data.mojang.com/v1/objects/c9df48efed58511cdd0213c56b9013a7b5c9ac1f/server.jar";
+      sha256 = "06qykz3nq7qmfw4phs3wvq3nk28clg8s3qrs37856aai8b8kmgaf";
+    };
+    # Starting with 1.19.4 we could use --pidFile for systemd's PIDFile=, but as
+    # the service doesn't fork, there seems to be no point.
+    "1.19.4" = fetchJar {
+      pname = "server";
+      version = "1.19.4";
+      url = "https://piston-data.mojang.com/v1/objects/8f3112a1049751cc472ec13e397eade5336ca7ae/server.jar";
+      sha256 = "0lrzpqd6zjvqh9g2byicgh66n43z0hwzp863r22ifx2hll6s2955";
+    };
   };
 
   #
-- 
cgit 1.4.1