more modfest build serv stuff

This commit is contained in:
Jill 2024-01-02 15:13:00 +01:00
parent e826bc5100
commit ebdf499ffe
2 changed files with 15 additions and 19 deletions

View File

@ -4,8 +4,8 @@ with lib;
let let
# https://git.sleeping.town/unascribed/unsup/releases # https://git.sleeping.town/unascribed/unsup/releases
unsup = pkgs.fetchurl { unsup = pkgs.fetchurl {
url = "https://git.sleeping.town/attachments/c521d178-8938-40a5-b21b-0333eef4099e"; url = "https://git.sleeping.town/unascribed/unsup/releases/download/v0.2.3/unsup-0.2.3.jar";
sha256 = "c5bd49784392b651e4bc71fe57976f5b4fb14f09e0e23183ae5b94a821ae4756"; hash = "sha256-DBMxiZwfUUiLqXYOMD8EUz4HubAZIEjAPmk32T0NYtA=";
}; };
mkUnsupINI = { url, extraConfig ? "" }: pkgs.writeTextFile { mkUnsupINI = { url, extraConfig ? "" }: pkgs.writeTextFile {
@ -43,7 +43,7 @@ in {
"gayrats" = import ./gayrats.nix { "gayrats" = import ./gayrats.nix {
inherit pkgs; inherit pkgs;
enable = true; enable = false;
server-port = 25565; server-port = 25565;
inherit unsup; inherit unsup;
@ -67,7 +67,7 @@ in {
"n3ko-test" = import ./n3ko-test.nix { "n3ko-test" = import ./n3ko-test.nix {
inherit pkgs; inherit pkgs;
enable = true; enable = false;
server-port = 25595; server-port = 25595;
}; };
@ -75,7 +75,7 @@ in {
inherit pkgs; inherit pkgs;
inherit lib; inherit lib;
enable = true; enable = false;
server-port = 25535; server-port = 25535;
inherit unsup; inherit unsup;
@ -91,25 +91,20 @@ in {
}; };
"modfest-build" = let "modfest-build" = let
modpack = (pkgs.fetchPackwizModpack rec { unsupINI = mkUnsupINI {
url = "https://raw.githubusercontent.com/ModFest/modfest-skyandsea/main/pack/pack.toml"; url = "https://raw.githack.com/ModFest/modfest-1-20/main/pack/pack.toml";
packHash = "sha256:7c9nTOZ8ZFQIvgZPWiRvF1N1nP0E6zTAZbPllRAaFTs="; };
manifestHash = "sha256:0w4b3y95s0jqhjfbzagbilw6fv6zlgzbqnl15kmsgcgb7kxzrzyy";
});
mcVersion = "${modpack.manifest.versions.minecraft}";
serverVersion = lib.replaceStrings [ "." ] [ "_" ] "fabric-${mcVersion}-0_15_1";
in { in {
enable = true; enable = true;
package = pkgs.fabricServers.${serverVersion}; package = pkgs.fabricServers."fabric-1_20_4".override { loaderVersion = "0.15.3"; };
jvmOpts = (import ./mc-flags.nix) "4G"; jvmOpts = ((import ./mc-flags.nix) "4G") + " -javaagent:${unsup}";
openFirewall = true; openFirewall = true;
serverProperties = { serverProperties = {
server-port = 25525; server-port = 25525;
gamemode = 1; gamemode = 1;
motd = "test server ignore"; motd = "modfest build server !";
white-list = true; white-list = true;
max-players = 128; max-players = 128;
allow-flight = true; allow-flight = true;
@ -120,7 +115,7 @@ in {
}; };
symlinks = { symlinks = {
"mods" = "${modpack}/mods"; "unsup.ini" = unsupINI;
}; };
}; };
}; };

View File

@ -21,6 +21,7 @@
symlinks = { "unsup.ini" = unsupINI; }; symlinks = { "unsup.ini" = unsupINI; };
package = pkgs.minecraftServers.fabric-1_19_2; package = pkgs.fabricServers."fabric-1_19_2".override { loaderVersion = "0.14.17"; };
jvmOpts = "-Xmx6G -javaagent:${unsup}"; jvmOpts = "-Xmx6G -javaagent:${unsup}";
} }