mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(sterni/ingeborg/minecraft): 1.20.4 -> 1.21.1

Browse source 
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
This commit is contained in:
sterni 2024-11-16 18:27:28 +01:00 committed by clbot
parent 3f1b326b3a
commit ef7f281f37
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
users/sterni/machines/ingeborg/minecraft.nix
View file

@ -2,13 +2,13 @@
let let
carpet = pkgs.fetchurl { 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"; url = "https://github.com/gnembon/fabric-carpet/releases/download/1.4.147/fabric-carpet-1.21-1.4.147+v240613.jar";
sha256 = "1jh2pb9pjwyfv1ianzykmja21nqlv175a8rg926xg3w4hhhwzrfq"; sha256 = "1n8r1zznl2xvkzqqwzg18d0rhfzrb675ik7z22q29svkw2jci7q7";
}; };
carpet-extra = pkgs.fetchurl { 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"; url = "https://github.com/gnembon/carpet-extra/releases/download/1.4.148/carpet-extra-1.21-1.4.148.jar";
sha256 = "0gxwm5ayr0y5dri0kxlnrrgy9pyaim34rl6km1j42fkyvc4r8p6x"; sha256 = "1yyqv1c08vml3sxyjbs5qk0z3yqiylzq8qa8vxbwiyw49dx5yhnq";
}; };
userGroup = "minecraft"; userGroup = "minecraft";
@ -31,10 +31,12 @@ let
difficulty = "hard"; difficulty = "hard";
function-permission-level = 4; function-permission-level = 4;
snooper-enabled = false; snooper-enabled = false;
# TODO(sterni): replaced (?) by simulation-distance which defaults to 1
view-distance = 12; view-distance = 12;
sync-chunk-writes = "false"; # the single biggest performance fix sync-chunk-writes = "false"; # the single biggest performance fix
max-tick-time = 6000000; # TODO(sterni): disable watchdog via carpet max-tick-time = 6000000; # TODO(sterni): disable watchdog via carpet
enforce-secure-profile = false; enforce-secure-profile = false;
# TODO(sterni): set disable pause-when-empty-seconds? we don't have anything in spawn though.
}; };
in in
@ -72,7 +74,7 @@ in
services.minecraft-fabric-server = { services.minecraft-fabric-server = {
creative = { creative = {
enable = false; # not actively used enable = false; # not actively used
version = "1.20.4"; version = "1.21.1";
mods = [ mods = [
carpet carpet
carpet-extra carpet-extra
@ -98,7 +100,7 @@ in
carpet = { carpet = {
enable = true; enable = true;
version = "1.20.4"; version = "1.21.1";
mods = [ mods = [
carpet carpet
carpet-extra carpet-extra

15
users/sterni/modules/minecraft-fabric.nix
View file

@ -186,6 +186,21 @@ let
url = "https://piston-data.mojang.com/v1/objects/8dd1a28015f51b1803213892b50b7b4fc76e594d/server.jar"; url = "https://piston-data.mojang.com/v1/objects/8dd1a28015f51b1803213892b50b7b4fc76e594d/server.jar";
sha256 = "0qykf9a3nacklqsyb30kg9m79nw462la6rf92gsdssdakprscgy0"; sha256 = "0qykf9a3nacklqsyb30kg9m79nw462la6rf92gsdssdakprscgy0";
}; };
# https://www.minecraft.net/en-us/article/minecraft-java-edition-1-21
# Has a known exploit, fixed in 1.21.1
"1.21" = fetchJar {
pname = "server";
version = "1.21";
url = "https://piston-data.mojang.com/v1/objects/450698d1863ab5180c25d7c804ef0fe6369dd1ba/server.jar";
sha256 = "0gzmpifl6l1cq11lpjd5gadw50095wgyxlm2gkpzkngrhvd98qy9";
};
# https://www.minecraft.net/en-us/article/minecraft-java-edition-1-21-1
"1.21.1" = fetchJar {
pname = "server";
version = "1.21.1";
url = "https://piston-data.mojang.com/v1/objects/59353fb40c36d304f2035d51e7d6e6baa98dc05c/server.jar";
sha256 = "1fxl66938ixks6imz8c5bry69z0kh6iawq1fiwca1kck7rlmbg73";
};
}; };
# #