From 6a8afb578c101e258dbca3db6a1d4a476d190af8 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Mon, 20 Mar 2023 14:57:37 +0100
Subject: chore(sterni/machines/edwin): minecraft 1.18 -> 1.18.2

Starting with 1.18.1 we no longer need to pass an extra flag to work
around the log4j CVE, so baseJvmOpts can be empty.

Change-Id: I6d6c5a366ecbb499b2e3945db81ca0a8b2e2dcbf
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8332
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 | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'users/sterni')

diff --git a/users/sterni/machines/edwin/minecraft.nix b/users/sterni/machines/edwin/minecraft.nix
index 0ba0cda254..b82e729a67 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.56/fabric-carpet-1.18-1.4.56+v211130.jar";
-    sha256 = "0rvl2yb8xymla8c052j07gqkqfkz4h5pxf6aip2v9v0h8r84p9hf";
+    url = "https://github.com/gnembon/fabric-carpet/releases/download/1.4.69/fabric-carpet-1.18.2-1.4.69+v220331.jar";
+    sha256 = "0rg21myrcfaapc77582zxq89rrfnwibzbik3nvfmrjcdhirrn2zy";
   };
 
   carpet-extra = pkgs.fetchurl {
-    url = "https://github.com/gnembon/carpet-extra/releases/download/1.4.56/carpet-extra-1.18-1.4.56.jar";
-    sha256 = "16d8szz13wh5344d61sf0f3f7aj3qa35c6jrbd68krf3srpqfa4x";
+    url = "https://github.com/gnembon/carpet-extra/releases/download/1.4.72/carpet-extra-1.18.2-1.4.72.jar";
+    sha256 = "1vd5z5zw26jkfzdwj81xcmaa5rdi4gdsq8ii0533gbn5gqlmngas";
   };
 
   userGroup = "minecraft";
@@ -67,7 +67,7 @@ in
     services.minecraft-fabric-server = {
       creative = {
         enable = true;
-        version = "1.18";
+        version = "1.18.2";
         mods = [
           carpet
           carpet-extra
@@ -93,7 +93,7 @@ in
 
       carpet = {
         enable = true;
-        version = "1.18";
+        version = "1.18.2";
         mods = [
           carpet
           carpet-extra
diff --git a/users/sterni/modules/minecraft-fabric.nix b/users/sterni/modules/minecraft-fabric.nix
index c599d6c042..716d8fae0a 100644
--- a/users/sterni/modules/minecraft-fabric.nix
+++ b/users/sterni/modules/minecraft-fabric.nix
@@ -107,6 +107,18 @@ let
         "-Dlog4j2.formatMsgNoLookups=true"
       ];
     };
+    "1.18.1" = fetchJar {
+      pname = "server";
+      version = "1.18.1";
+      url = "https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/server.jar";
+      sha256 = "1pyvym6xzjb1siizzj4ma7lpb05qhgxnzps8lmlbk00lv0515kgb";
+    };
+    "1.18.2" = fetchJar {
+      pname = "server";
+      version = "1.18.2";
+      url = "https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar";
+      sha256 = "0hx330bnadixph44sip0h5h986m11qxbdba6lbgwz4da6lg9vgjp";
+    };
   };
 
   #
@@ -245,7 +257,7 @@ let
       # the actual shutdown in the stop script without relying on $MAINPID.
       exec "${bins.flock}" "''${RUNTIME_DIRECTORY}" \
           "${bins.java}" \
-          ${lib.escapeShellArgs (serverJar.baseJvmOpts ++ instanceCfg.jvmOpts)} \
+          ${lib.escapeShellArgs (serverJar.baseJvmOpts or [ ] ++ instanceCfg.jvmOpts)} \
           -jar fabric-server-launch.jar nogui
     '';
 
-- 
cgit 1.4.1