tlaternet/tlaternet-server
1
0
Fork 0
Code Issues 9 Pull requests Releases Activity

Compare commits

base: tlaternet:a321411cdeceaa77a9b7110b50d18436b9f492f8
Branches Tags
tlaternet:master
tlaternet:tlater/with-minecraft
tlaternet:tlater/nixpkgs-formatting
tlaternet:tlater/authelia
..
compare: tlaternet:99ad147192a4aa8167de2551b4161c57f55d0c6d
Branches Tags
tlaternet:tlater/with-minecraft
tlaternet:master
tlaternet:tlater/nixpkgs-formatting
tlaternet:tlater/authelia

5 commits
a321411cde ... 99ad147192

Author SHA1 Message Date
Tristan Daniël Maat 99ad147192
voor-kia: Add overworld-two 
Worldgen optimization mod; should be very useful!
 2021-07-31 00:06:19 +01:00
Tristan Daniël Maat 4aaab7ca70
voor-kia: Downgrade supplementaries due to graphics bugs 
See https://github.com/MehVahdJukaar/Supplementaries/issues/86
 2021-07-31 00:06:15 +01:00
Tristan Daniël Maat 4b06f1f8f9
voor-kia: Downgrade citadel because of an incompatibility with iceandfire 
See https://github.com/Alex-the-666/Citadel/issues/40
 2021-07-31 00:06:07 +01:00
Tristan Daniël Maat 17355b0a42
voor-kia: Add client mods 2021-07-31 00:06:01 +01:00
Tristan Daniël Maat e35f47bc86
voor-kia: Update minecraft mods 2021-07-31 00:05:52 +01:00
4 changed files with 6 additions and 27 deletions
Show stats Expand all files Collapse all files

21
lib/minecraft.nix
View file

@ -27,25 +27,4 @@
cp * $out/mods 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/
'';
};
} }

4
pkgs/minecraft/forge-server.nix
View file

@ -3,12 +3,12 @@
let let
name = "forge-server"; 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"; mirror = "https://files.minecraftforge.net/maven/net/minecraftforge/forge";
src = fetchurl { src = fetchurl {
url = "${mirror}/${version}/forge-${version}-installer.jar"; url = "${mirror}/${version}/forge-${version}-installer.jar";
# Forge doesn't seem to like newer shas # Forge doesn't seem to like newer shas
sha1 = "055190497ad9e23d2aeed2473743e37de98ff8a2"; sha1 = "9aedcd5e64bfc12483b9c51bc4cf18e551ad054a";
}; };
unpackCmd = "mkdir -p src; cp $curSrc src/forge-${version}-installer.jar"; unpackCmd = "mkdir -p src; cp $curSrc src/forge-${version}-installer.jar";

2
pkgs/minecraft/voor-kia-client.nix
View file

@ -1,6 +1,6 @@
{ lib, local-lib, stdenv }: { lib, local-lib, stdenv }:
local-lib.minecraft.mkModpackZip { local-lib.minecraft.mkModpack {
name = "voor-kia-client"; name = "voor-kia-client";
version = "1.1"; version = "1.1";
mods = (builtins.fromJSON (builtins.readFile ./voor-kia/mods.json)) mods = (builtins.fromJSON (builtins.readFile ./voor-kia/mods.json))

6
pkgs/minecraft/voor-kia/mods.json
View file

@ -497,11 +497,11 @@
"sha256": "65e6e7a7fac64130de455b8b8e3ec1a16ee48411df0ab3963790038019f69a25" "sha256": "65e6e7a7fac64130de455b8b8e3ec1a16ee48411df0ab3963790038019f69a25"
}, },
{ {
"filename": "selene-1.16.5-1.3.jar", "filename": "selene-1.16.5-1.5.jar",
"id": 3377212, "id": 3392984,
"project": "selene", "project": "selene",
"project_id": 499980, "project_id": 499980,
"sha256": "49a08a86b9f63170fb1a9bf9c81d6a91157eecfbf150ac04bb010207a0133485" "sha256": "0138b5a0591f60bc9ac6da73cd7501f123a1c32822a0289447f0c8a7ee8bdfa9"
}, },
{ {
"filename": "SnowRealMagic-1.16.4-2.5.8.jar", "filename": "SnowRealMagic-1.16.4-2.5.8.jar",