diff --git a/modules/server/game/minecraft/default.nix b/modules/server/game/minecraft/default.nix index 8774073e..fa38ddab 100644 --- a/modules/server/game/minecraft/default.nix +++ b/modules/server/game/minecraft/default.nix @@ -16,32 +16,39 @@ in { services.minecraft-servers = { enable = true; eula = true; - servers.wires = - let modpack = pkgs.fetchPackwizModpack { url = ./sakopack; }; - in { - enable = true; - # HAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHHAAHAHHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAH - openFirewall = true; - package = pkgs.fabricServers.fabric-1_20_4.override { - loaderVersion = "0.16.9"; - }; - whitelist = { Sakoooo = "6b05caca-3d78-4597-aba5-d0f816f94024"; }; - serverProperties = { - white-list = true; - difficulty = "normal"; - server-port = 25568; - gamemode = "survival"; - }; - symlinks = { "mods" = "${modpack}/mods"; }; - # files = { - # "config" = "${modpack}/config"; - # "config/mod1.yml" = "${modpack}/config/mod1.yml"; - # "config/mod2.conf" = "${modpack}/config/mod2.conf"; - # # You can add files not on the modpack, of course - # "config/server-specific.conf".value = { example = "foo-bar"; }; - # }; - # }; + servers.wires = let + modpack = pkgs.fetchPackwizModpack { + url = + "https://git.sako.lol/sako/sakopack/raw/branch/master/pack.toml"; }; + mcVersion = modpack.manifest.versions.minecraft; + fabricVersion = modpack.manifest.versions.fabric; + serverVersion = + lib.replaceStrings [ "." ] [ "_" ] "fabric-${mcVersion}"; + in { + enable = true; + # HAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHHAAHAHHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAH + openFirewall = true; + package = pkgs.fabricServers.${serverVersion}.override { + loaderVersion = fabricVersion; + }; + whitelist = { Sakoooo = "6b05caca-3d78-4597-aba5-d0f816f94024"; }; + serverProperties = { + white-list = true; + difficulty = "normal"; + server-port = 25568; + gamemode = "survival"; + }; + symlinks = { "mods" = "${modpack}/mods"; }; + # files = { + # "config" = "${modpack}/config"; + # "config/mod1.yml" = "${modpack}/config/mod1.yml"; + # "config/mod2.conf" = "${modpack}/config/mod2.conf"; + # # You can add files not on the modpack, of course + # "config/server-specific.conf".value = { example = "foo-bar"; }; + # }; + # }; + }; }; }; } diff --git a/modules/server/game/minecraft/sakopack/index.toml b/modules/server/game/minecraft/sakopack/index.toml deleted file mode 100644 index 6a8f1f5b..00000000 --- a/modules/server/game/minecraft/sakopack/index.toml +++ /dev/null @@ -1,56 +0,0 @@ -hash-format = "sha256" - -[[files]] -file = "mods/c2me-fabric.pw.toml" -hash = "47417b73fa94227651ac63139dddaf6beb937d45aed9ba8221a563a8ad50e209" -metafile = true - -[[files]] -file = "mods/chunky.pw.toml" -hash = "6211df918f9c91638c0e6e56361192afcd60d336b95687e4766540f9d2b6f118" -metafile = true - -[[files]] -file = "mods/debugify.pw.toml" -hash = "ebc95d8dac761549f43c49938b8d1a0044a43af4484f492959de83a2bdc9e267" -metafile = true - -[[files]] -file = "mods/fabric-api.pw.toml" -hash = "1dea1472741762757eed29f76877f5913b0e445aa5e91a43ec9dcab63149e190" -metafile = true - -[[files]] -file = "mods/ferrite-core.pw.toml" -hash = "39a6a39433b1b104bfafafcd60a8171f866daa2ebefffd64df822d0e69288e3a" -metafile = true - -[[files]] -file = "mods/krypton.pw.toml" -hash = "fe6abe1ea33393fe1441801f79eda74ea892e5f4b677a56eccafafcbf4d253ca" -metafile = true - -[[files]] -file = "mods/ksyxis.pw.toml" -hash = "cf4d50556f99d310bea0745680a9d8574791ad55880e5a8d85029e85711601ff" -metafile = true - -[[files]] -file = "mods/lithium.pw.toml" -hash = "ed27ecb297016accc41e9894b6e11d6c46b455211e358afa6218ce629ef56978" -metafile = true - -[[files]] -file = "mods/modernfix.pw.toml" -hash = "f6a053554df5a596e3113b7add27bd88c504ff50b8cb8083e8acdc2331a30bba" -metafile = true - -[[files]] -file = "mods/no-chat-reports.pw.toml" -hash = "293f06651cc903947ae422f5e612c73d66154453ad1390bda63920370671b968" -metafile = true - -[[files]] -file = "mods/yacl.pw.toml" -hash = "b99779a2db78a85b36377eb7bf7d67cf02d6fffdcc32ff193d2269732905a14b" -metafile = true diff --git a/modules/server/game/minecraft/sakopack/mods/c2me-fabric.pw.toml b/modules/server/game/minecraft/sakopack/mods/c2me-fabric.pw.toml deleted file mode 100644 index ef6cfe9b..00000000 --- a/modules/server/game/minecraft/sakopack/mods/c2me-fabric.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Concurrent Chunk Management Engine (Fabric)" -filename = "c2me-fabric-mc1.20.2-0.2.0+alpha.11.24.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/VSNURh3q/versions/vADXBkQ9/c2me-fabric-mc1.20.2-0.2.0%2Balpha.11.24.jar" -hash-format = "sha1" -hash = "12e037a8835d170c25f62af74537cda8c6d15f4e" - -[update] -[update.modrinth] -mod-id = "VSNURh3q" -version = "vADXBkQ9" diff --git a/modules/server/game/minecraft/sakopack/mods/chunky.pw.toml b/modules/server/game/minecraft/sakopack/mods/chunky.pw.toml deleted file mode 100644 index 4de93316..00000000 --- a/modules/server/game/minecraft/sakopack/mods/chunky.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Chunky" -filename = "Chunky-1.3.146.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/fALzjamp/versions/NHWYq9at/Chunky-1.3.146.jar" -hash-format = "sha1" -hash = "b5672d69dc2b210ab2165a27afc03a424fa2b46a" - -[update] -[update.modrinth] -mod-id = "fALzjamp" -version = "NHWYq9at" diff --git a/modules/server/game/minecraft/sakopack/mods/debugify.pw.toml b/modules/server/game/minecraft/sakopack/mods/debugify.pw.toml deleted file mode 100644 index 191acfeb..00000000 --- a/modules/server/game/minecraft/sakopack/mods/debugify.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Debugify" -filename = "Debugify-1.20.2+1.0.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/QwxR6Gcd/versions/ZSI78Xd3/Debugify-1.20.2%2B1.0.jar" -hash-format = "sha1" -hash = "5afa015e026de8acb4622e6e1429221e0b26e05e" - -[update] -[update.modrinth] -mod-id = "QwxR6Gcd" -version = "ZSI78Xd3" diff --git a/modules/server/game/minecraft/sakopack/mods/fabric-api.pw.toml b/modules/server/game/minecraft/sakopack/mods/fabric-api.pw.toml deleted file mode 100644 index 8f2eec5b..00000000 --- a/modules/server/game/minecraft/sakopack/mods/fabric-api.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Fabric API" -filename = "fabric-api-0.91.6+1.20.2.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/8GVp7wDk/fabric-api-0.91.6%2B1.20.2.jar" -hash-format = "sha1" -hash = "7647a59c2b37c673948b0a35961eabac3a5eda96" - -[update] -[update.modrinth] -mod-id = "P7dR8mSH" -version = "8GVp7wDk" diff --git a/modules/server/game/minecraft/sakopack/mods/ferrite-core.pw.toml b/modules/server/game/minecraft/sakopack/mods/ferrite-core.pw.toml deleted file mode 100644 index 2b83cf68..00000000 --- a/modules/server/game/minecraft/sakopack/mods/ferrite-core.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "FerriteCore" -filename = "ferritecore-6.0.1-fabric.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/uXXizFIs/versions/unerR5MN/ferritecore-6.0.1-fabric.jar" -hash-format = "sha1" -hash = "8fa3b84fc5860dbc30fdf8cced02af68dffcf3fa" - -[update] -[update.modrinth] -mod-id = "uXXizFIs" -version = "unerR5MN" diff --git a/modules/server/game/minecraft/sakopack/mods/krypton.pw.toml b/modules/server/game/minecraft/sakopack/mods/krypton.pw.toml deleted file mode 100644 index 00a36fa2..00000000 --- a/modules/server/game/minecraft/sakopack/mods/krypton.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Krypton" -filename = "krypton-0.2.6.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/fQEb0iXm/versions/bRcuOnao/krypton-0.2.6.jar" -hash-format = "sha1" -hash = "fc237a3cdf7cff71e222db8e14fa6d4546e2d000" - -[update] -[update.modrinth] -mod-id = "fQEb0iXm" -version = "bRcuOnao" diff --git a/modules/server/game/minecraft/sakopack/mods/ksyxis.pw.toml b/modules/server/game/minecraft/sakopack/mods/ksyxis.pw.toml deleted file mode 100644 index 354027ad..00000000 --- a/modules/server/game/minecraft/sakopack/mods/ksyxis.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Ksyxis" -filename = "Ksyxis-1.3.2.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/2ecVyZ49/versions/QFfBwOwT/Ksyxis-1.3.2.jar" -hash-format = "sha1" -hash = "21c82ab70e7b427e07cee07cec26ba603301d83e" - -[update] -[update.modrinth] -mod-id = "2ecVyZ49" -version = "QFfBwOwT" diff --git a/modules/server/game/minecraft/sakopack/mods/lithium.pw.toml b/modules/server/game/minecraft/sakopack/mods/lithium.pw.toml deleted file mode 100644 index f96a0043..00000000 --- a/modules/server/game/minecraft/sakopack/mods/lithium.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Lithium" -filename = "lithium-fabric-mc1.20.2-0.12.0.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/qdzL5Hkg/lithium-fabric-mc1.20.2-0.12.0.jar" -hash-format = "sha1" -hash = "9b713d4909582d900274dcd7ca01abd195b53520" - -[update] -[update.modrinth] -mod-id = "gvQqBUqZ" -version = "qdzL5Hkg" diff --git a/modules/server/game/minecraft/sakopack/mods/modernfix.pw.toml b/modules/server/game/minecraft/sakopack/mods/modernfix.pw.toml deleted file mode 100644 index c6867003..00000000 --- a/modules/server/game/minecraft/sakopack/mods/modernfix.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "ModernFix" -filename = "modernfix-fabric-5.10.1+mc1.20.2.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/nmDcB62a/versions/rRcwOsPa/modernfix-fabric-5.10.1%2Bmc1.20.2.jar" -hash-format = "sha1" -hash = "530fd499a1615176faf0b717590a0a312cbeb709" - -[update] -[update.modrinth] -mod-id = "nmDcB62a" -version = "rRcwOsPa" diff --git a/modules/server/game/minecraft/sakopack/mods/no-chat-reports.pw.toml b/modules/server/game/minecraft/sakopack/mods/no-chat-reports.pw.toml deleted file mode 100644 index 1961b5a5..00000000 --- a/modules/server/game/minecraft/sakopack/mods/no-chat-reports.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "No Chat Reports" -filename = "NoChatReports-FABRIC-1.20.2-v2.3.1.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/qQyHxfxd/versions/xQyq2W5g/NoChatReports-FABRIC-1.20.2-v2.3.1.jar" -hash-format = "sha1" -hash = "cb77c14bfc458066eda3c7962c3286e0f973725e" - -[update] -[update.modrinth] -mod-id = "qQyHxfxd" -version = "xQyq2W5g" diff --git a/modules/server/game/minecraft/sakopack/mods/yacl.pw.toml b/modules/server/game/minecraft/sakopack/mods/yacl.pw.toml deleted file mode 100644 index 24fb26e2..00000000 --- a/modules/server/game/minecraft/sakopack/mods/yacl.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "YetAnotherConfigLib (YACL)" -filename = "yet-another-config-lib-fabric-3.3.0-beta.1+1.20.2.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/1eAoo2KR/versions/vede4iWJ/yet-another-config-lib-fabric-3.3.0-beta.1%2B1.20.2.jar" -hash-format = "sha1" -hash = "772af4c248d33af696762533819d7cacad4716ea" - -[update] -[update.modrinth] -mod-id = "1eAoo2KR" -version = "vede4iWJ" diff --git a/modules/server/game/minecraft/sakopack/pack.toml b/modules/server/game/minecraft/sakopack/pack.toml deleted file mode 100644 index 59b1b3f9..00000000 --- a/modules/server/game/minecraft/sakopack/pack.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Sakopack" -author = "sako" -version = "0.0.1" -pack-format = "packwiz:1.1.0" - -[index] -file = "index.toml" -hash-format = "sha256" -hash = "994ca324dbb9bf3478bf475afc7afa8ad2003cd585e7bba52844b2de20d563e7" - -[versions] -fabric = "0.16.9" -minecraft = "1.20.2"