about summary refs log tree commit diff
path: root/users/sterni/machines
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2024-11-16T17·27+0100
committerclbot <clbot@tvl.fyi>2024-11-17T15·57+0000
commitef7f281f37467db0375c8b049311e7b123e3ba3c (patch)
treee3683e91570331f5d5eca40a1be9bd4c75131355 /users/sterni/machines
parent3f1b326b3a6dfa5f319bad40b97885d3f9a049ff (diff)
chore(sterni/ingeborg/minecraft): 1.20.4 -> 1.21.1 r/8933
1.21.1 fixes an exploit in 1.21 without any other changes, so we can
safely skip it.

Change-Id: I72503c9f3869d7bafdfc78842b61804627a1d452
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12798
Reviewed-by: sterni <sternenseemann@systemli.org>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Diffstat (limited to 'users/sterni/machines')
-rw-r--r--users/sterni/machines/ingeborg/minecraft.nix14
1 files changed, 8 insertions, 6 deletions
diff --git a/users/sterni/machines/ingeborg/minecraft.nix b/users/sterni/machines/ingeborg/minecraft.nix
index 383fee8ca04c..062bb9ffaa57 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.128/fabric-carpet-1.20.3-1.4.128+v231205.jar";
-    sha256 = "1jh2pb9pjwyfv1ianzykmja21nqlv175a8rg926xg3w4hhhwzrfq";
+    url = "https://github.com/gnembon/fabric-carpet/releases/download/1.4.147/fabric-carpet-1.21-1.4.147+v240613.jar";
+    sha256 = "1n8r1zznl2xvkzqqwzg18d0rhfzrb675ik7z22q29svkw2jci7q7";
   };
 
   carpet-extra = pkgs.fetchurl {
-    url = "https://github.com/gnembon/carpet-extra/releases/download/1.4.128/carpet-extra-1.20.3-1.4.128.jar";
-    sha256 = "0gxwm5ayr0y5dri0kxlnrrgy9pyaim34rl6km1j42fkyvc4r8p6x";
+    url = "https://github.com/gnembon/carpet-extra/releases/download/1.4.148/carpet-extra-1.21-1.4.148.jar";
+    sha256 = "1yyqv1c08vml3sxyjbs5qk0z3yqiylzq8qa8vxbwiyw49dx5yhnq";
   };
 
   userGroup = "minecraft";
@@ -31,10 +31,12 @@ let
     difficulty = "hard";
     function-permission-level = 4;
     snooper-enabled = false;
+    # TODO(sterni): replaced (?) by simulation-distance which defaults to 1
     view-distance = 12;
     sync-chunk-writes = "false"; # the single biggest performance fix
     max-tick-time = 6000000; # TODO(sterni): disable watchdog via carpet
     enforce-secure-profile = false;
+    # TODO(sterni): set disable pause-when-empty-seconds? we don't have anything in spawn though.
   };
 in
 
@@ -72,7 +74,7 @@ in
     services.minecraft-fabric-server = {
       creative = {
         enable = false; # not actively used
-        version = "1.20.4";
+        version = "1.21.1";
         mods = [
           carpet
           carpet-extra
@@ -98,7 +100,7 @@ in
 
       carpet = {
         enable = true;
-        version = "1.20.4";
+        version = "1.21.1";
         mods = [
           carpet
           carpet-extra