diff --git a/lib/minecraft.nix b/lib/minecraft.nix index ef50b3d..87d5402 100644 --- a/lib/minecraft.nix +++ b/lib/minecraft.nix @@ -27,25 +27,4 @@ cp * $out/mods ''; }; - - mkModpackZip = { name, version, mods }: - pkgs.stdenv.mkDerivation { - inherit name version; - srcs = map pkgs.local.fetchFromCurseForge mods; - - sourceRoot = "src/"; - preUnpack = "mkdir -p src/"; - unpackCmd = "cp $curSrc src/"; - - buildInputs = [ pkgs.zip]; - - buildPhase = '' - zip voor-kia-mods.zip *.jar - ''; - - installPhase = '' - mkdir -p $out/ - cp voor-kia-mods.zip $out/ - ''; - }; } diff --git a/pkgs/minecraft/forge-server.nix b/pkgs/minecraft/forge-server.nix index f75f6b8..d91c5e6 100644 --- a/pkgs/minecraft/forge-server.nix +++ b/pkgs/minecraft/forge-server.nix @@ -3,12 +3,12 @@ let name = "forge-server"; - version = "1.16.5-36.2.2"; + version = "1.16.5-36.1.65"; mirror = "https://files.minecraftforge.net/maven/net/minecraftforge/forge"; src = fetchurl { url = "${mirror}/${version}/forge-${version}-installer.jar"; # Forge doesn't seem to like newer shas - sha1 = "055190497ad9e23d2aeed2473743e37de98ff8a2"; + sha1 = "9aedcd5e64bfc12483b9c51bc4cf18e551ad054a"; }; unpackCmd = "mkdir -p src; cp $curSrc src/forge-${version}-installer.jar"; diff --git a/pkgs/minecraft/voor-kia-client.nix b/pkgs/minecraft/voor-kia-client.nix index 8d0c687..235bacd 100644 --- a/pkgs/minecraft/voor-kia-client.nix +++ b/pkgs/minecraft/voor-kia-client.nix @@ -1,6 +1,6 @@ { lib, local-lib, stdenv }: -local-lib.minecraft.mkModpackZip { +local-lib.minecraft.mkModpack { name = "voor-kia-client"; version = "1.1"; mods = (builtins.fromJSON (builtins.readFile ./voor-kia/mods.json)) diff --git a/pkgs/minecraft/voor-kia/mods.json b/pkgs/minecraft/voor-kia/mods.json index 96d0231..db0f007 100644 --- a/pkgs/minecraft/voor-kia/mods.json +++ b/pkgs/minecraft/voor-kia/mods.json @@ -497,11 +497,11 @@ "sha256": "65e6e7a7fac64130de455b8b8e3ec1a16ee48411df0ab3963790038019f69a25" }, { - "filename": "selene-1.16.5-1.3.jar", - "id": 3377212, + "filename": "selene-1.16.5-1.5.jar", + "id": 3392984, "project": "selene", "project_id": 499980, - "sha256": "49a08a86b9f63170fb1a9bf9c81d6a91157eecfbf150ac04bb010207a0133485" + "sha256": "0138b5a0591f60bc9ac6da73cd7501f123a1c32822a0289447f0c8a7ee8bdfa9" }, { "filename": "SnowRealMagic-1.16.4-2.5.8.jar",