From 7b7c83e449fbb0cf13ec36f4ecb094c96b11a533 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Sun, 19 Mar 2023 13:56:23 +0100
Subject: feat(sterni/machines/edwin): minecraft 1.16.5 -> 1.17

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

diff --git a/users/sterni/machines/edwin/minecraft.nix b/users/sterni/machines/edwin/minecraft.nix
index 6014a3d579..d68e9cc3eb 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.44/fabric-carpet-1.16.5-1.4.44+v210714.jar";
-    sha256 = "099nwspgxv7h2k3mwwmgcykmwfcb7yg1azb38fd4ravv97z4l3j8";
+    url = "https://github.com/gnembon/fabric-carpet/releases/download/1.4.40/fabric-carpet-1.17-1.4.40+v210608.jar";
+    sha256 = "0gv8nmishgml034ncvwldiz3q607sg8xcj6k0c3lfns23cyg80dv";
   };
 
   carpet-extra = pkgs.fetchurl {
-    url = "https://github.com/gnembon/carpet-extra/releases/download/1.4.43/carpet-extra-1.16.5-1.4.43.jar";
-    sha256 = "0w3gng1xyiqybm1qv4gbbsyqry3dr2ndvynx14qb59wxlw0dv5za";
+    url = "https://github.com/gnembon/carpet-extra/releases/download/1.4.40/carpet-extra-1.17-1.4.40.jar";
+    sha256 = "16bj57scbgfrbljr5nci2s438hip6zrg92wfzz9il4mw6cdgbymc";
   };
 
   userGroup = "minecraft";
@@ -65,7 +65,7 @@ in
     services.minecraft-fabric-server = {
       creative = {
         enable = true;
-        version = "1.16.5";
+        version = "1.17";
         mods = [
           carpet
           carpet-extra
@@ -91,7 +91,7 @@ in
 
       carpet = {
         enable = true;
-        version = "1.16.5";
+        version = "1.17";
         mods = [
           carpet
           carpet-extra
diff --git a/users/sterni/modules/minecraft-fabric.nix b/users/sterni/modules/minecraft-fabric.nix
index 07171d8071..06572ca9c8 100644
--- a/users/sterni/modules/minecraft-fabric.nix
+++ b/users/sterni/modules/minecraft-fabric.nix
@@ -80,6 +80,15 @@ let
         ];
       };
     };
+    "1.17" = fetchJar {
+      pname = "server";
+      version = "1.17";
+      url = "https://launcher.mojang.com/v1/objects/0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e/server.jar";
+      sha256 = "0jqz7hpx7zvjj2n5rfrh8jmdj6ziqyp8c9nq4sr4jmkbky6hsfbv";
+      passthru.baseJvmOpts = [
+        "-Dlog4j2.formatMsgNoLookups=true"
+      ];
+    };
   };
 
   #
-- 
cgit 1.4.1