diff options
| author | sterni <sternenseemann@systemli.org> | 2023-03-20T13·44+0100 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-03-21T15·31+0000 |
| commit | 3c7be2b361a283b8ffe48bfb1040dee7c68a4438 (patch) | |
| tree | 87a0a30dcbfce881b33998d0a39f2666c51f45f4 | |
| parent | 2ccaabf9dba1569cdd6a82a7e1680e777bc81dbb (diff) | |
chore(sterni/machines/edwin): minecraft 1.17.1 -> 1.18 r/6033
Change-Id: If9f6ee1c49a6c427530e56ceff60a2508f6fd9c6 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8331 Reviewed-by: sterni <sternenseemann@systemli.org> Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
| -rw-r--r-- | users/sterni/machines/edwin/minecraft.nix | 14 | ||||
| -rw-r--r-- | users/sterni/modules/minecraft-fabric.nix | 11 |
2 files changed, 18 insertions, 7 deletions
diff --git a/users/sterni/machines/edwin/minecraft.nix b/users/sterni/machines/edwin/minecraft.nix index 4e9a184d10a8..0ba0cda25451 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.57/fabric-carpet-1.17.1-1.4.57+v220119.jar"; - sha256 = "1q3mnhcrjcp0i573645lyb92ldb8n0jhpjl4ydi1fbk9wqckxzcs"; + url = "https://github.com/gnembon/fabric-carpet/releases/download/1.4.56/fabric-carpet-1.18-1.4.56+v211130.jar"; + sha256 = "0rvl2yb8xymla8c052j07gqkqfkz4h5pxf6aip2v9v0h8r84p9hf"; }; carpet-extra = pkgs.fetchurl { - url = "https://github.com/gnembon/carpet-extra/releases/download/1.4.57/carpet-extra-1.17.1-1.4.57.jar"; - sha256 = "1bliqby1h5wm7rdfrx6z698qb9acfvm3d1sjcvlw2q55x982g7gb"; + url = "https://github.com/gnembon/carpet-extra/releases/download/1.4.56/carpet-extra-1.18-1.4.56.jar"; + sha256 = "16d8szz13wh5344d61sf0f3f7aj3qa35c6jrbd68krf3srpqfa4x"; }; userGroup = "minecraft"; @@ -37,6 +37,8 @@ let }; in +# TODO(sterni): regular backups of carpet world + { imports = [ ../../modules/minecraft-fabric.nix @@ -65,7 +67,7 @@ in services.minecraft-fabric-server = { creative = { enable = true; - version = "1.17.1"; + version = "1.18"; mods = [ carpet carpet-extra @@ -91,7 +93,7 @@ in carpet = { enable = true; - version = "1.17.1"; + version = "1.18"; mods = [ carpet carpet-extra diff --git a/users/sterni/modules/minecraft-fabric.nix b/users/sterni/modules/minecraft-fabric.nix index b8556ec3eb20..c599d6c04282 100644 --- a/users/sterni/modules/minecraft-fabric.nix +++ b/users/sterni/modules/minecraft-fabric.nix @@ -23,7 +23,7 @@ # * Op levels # # SPDX-License-Identifier: MIT -# SPDX-FileCopyrightText: 2022 sterni <sternenseemann@systemli.org> +# SPDX-FileCopyrightText: 2022-2023 sterni <sternenseemann@systemli.org> { lib, pkgs, config, depot, ... }: @@ -98,6 +98,15 @@ let "-Dlog4j2.formatMsgNoLookups=true" ]; }; + "1.18" = fetchJar { + pname = "server"; + version = "1.18"; + url = "https://launcher.mojang.com/v1/objects/3cf24a8694aca6267883b17d934efacc5e44440d/server.jar"; + sha256 = "0vvycjcfq96z7cl5dsrq98k9b7j7l4x0y9nflrcqmcvink7fs5w4"; + passthru.baseJvmOpts = [ + "-Dlog4j2.formatMsgNoLookups=true" + ]; + }; }; # |