From 1cbf5f4fa43b1c62bbd9b4c81ccab3ac95206430 Mon Sep 17 00:00:00 2001 From: Aninus Partikler Date: Wed, 27 Mar 2024 19:19:10 +0100 Subject: [PATCH] update(mods): Updated mods mod(mods): Replaced Borderless Mining with Cubes Without Borders --- flake.nix | 16 +++++++++----- main/config/version.txt | 2 +- main/index.toml | 24 +++++++++------------ main/mods/borderless-mining.pw.toml | 13 ----------- main/mods/cubes-without-borders.pw.toml | 13 +++++++++++ main/mods/fuy_gg.pw.toml | 8 +++---- main/mods/immediatelyfast.pw.toml | 8 +++---- main/mods/qsl.pw.toml | 8 +++---- main/mods/shoulder-surfing-reloaded.pw.toml | 8 +++---- main/mods/wynntils.pw.toml | 8 +++---- main/pack.toml | 4 ++-- pre-commit-hooks.nix | 15 ------------- 12 files changed, 57 insertions(+), 70 deletions(-) delete mode 100644 main/mods/borderless-mining.pw.toml create mode 100644 main/mods/cubes-without-borders.pw.toml delete mode 100644 pre-commit-hooks.nix diff --git a/flake.nix b/flake.nix index f3580ab..f670de4 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ systems = ["x86_64-linux"]; imports = [ - ./pre-commit-hooks.nix + inputs.pre-commit-hooks.flakeModule ]; perSystem = { @@ -24,15 +24,21 @@ pkgs, ... }: { + pre-commit = { + check.enable = true; + settings.excludes = ["flake.lock"]; + settings.hooks = { + alejandra.enable = true; + deadnix.enable = true; + prettier.enable = true; + markdownlint.enable = true; + }; + }; devShells.default = pkgs.mkShell { packages = [ - pkgs.alejandra pkgs.git pkgs.packwiz - pkgs.yamllint ]; - name = "mc-modpack-kit"; - DIRENV_LOG_FORMAT = ""; shellHook = '' ${config.pre-commit.installationScript} ''; diff --git a/main/config/version.txt b/main/config/version.txt index ab7f13b..bd431c7 100755 --- a/main/config/version.txt +++ b/main/config/version.txt @@ -1 +1 @@ -Wynncraft 101 - 1.1.0 +Wynncraft 101 - 1.1.1 diff --git a/main/index.toml b/main/index.toml index db1b1c8..c668c95 100644 --- a/main/index.toml +++ b/main/index.toml @@ -2,7 +2,7 @@ hash-format = "sha256" [[files]] file = "CHANGELOG.md" -hash = "f766cbc0cc9bc8dcef556f506a398c86e4384f2eac0738ec33b37188b8bc90d7" +hash = "860e3a1ebd243dba0d0a812514f05fed3ea61bcbdb2ffbc29bdcf74d189e0d4d" [[files]] file = "config/fancymenu/config.txt" @@ -76,22 +76,18 @@ hash = "27018a3243d614a00fd5f645e403776cf0e2be2a06b43d1cf92cfdd49cf80d55" file = "config/yosbr/config/iris.properties" hash = "1433d3b049af59d534211442102a81613adab4a2922e3f8dc0252d8b7157b508" -[[files]] -file = "config/yosbr/config/ok-boomer.json5" -hash = "488feb7357c6640da047d4359940fbae58ac37a0d25d6687d25f6ac231628b9c" - [[files]] file = "config/yosbr/config/shouldersurfing.toml" hash = "689a1d3dac47acc9dff4a84d6e91142f54fa4146ef6409c164496c807625cd95" [[files]] -file = "mods/borderless-mining.pw.toml" -hash = "5cc5a514cc9b8567abda1d5860a8ac3afdf868906caf9bd24c6c534943e1fb4c" +file = "mods/cloth-config.pw.toml" +hash = "c6fb2a9c31fe297e65fbb72c20967c498860168082a5d7881487dcb1a61ac72c" metafile = true [[files]] -file = "mods/cloth-config.pw.toml" -hash = "c6fb2a9c31fe297e65fbb72c20967c498860168082a5d7881487dcb1a61ac72c" +file = "mods/cubes-without-borders.pw.toml" +hash = "1a65361cf2207ba6bad6eba3e66e407983452398c4ac5cbe5db0d8430b8a6496" metafile = true [[files]] @@ -121,12 +117,12 @@ metafile = true [[files]] file = "mods/fuy_gg.pw.toml" -hash = "dea0a8fc6440562e757d9d57bd2553f63bc037d169c91283e91c60cdf1e56415" +hash = "737eec2a28be601b677fb89d74a20c41894d8aea0c5b22edde0c2f619bd920d6" metafile = true [[files]] file = "mods/immediatelyfast.pw.toml" -hash = "b411b04e1dace15c7fc1465bb161c8e621750b1577282e0918f956212a57e864" +hash = "bd0e1bfaa16148cd114e33d11ec8f742979ec5b9372f6baa6a335a316659e70e" metafile = true [[files]] @@ -166,12 +162,12 @@ metafile = true [[files]] file = "mods/qsl.pw.toml" -hash = "bf1bab96c0cce9b115210004586ce9fc7e5cf55bc0fb695e055e7bee75432a01" +hash = "18b26119e3f855612785a9783a1c19a2fca076c763696565fe1015a90ff3d8c5" metafile = true [[files]] file = "mods/shoulder-surfing-reloaded.pw.toml" -hash = "c1950c6880c80e9a4301b81a0004ffece2f69a8035de637fc1648b4df0ec4018" +hash = "70d84a236b035b9974d8c791ce9dc17bd1a06bd1b6de26ea882b279960b20813" metafile = true [[files]] @@ -186,7 +182,7 @@ metafile = true [[files]] file = "mods/wynntils.pw.toml" -hash = "edbb4fadeb034bf5eb5c4ac1d735c5bb09a54075116131c150fd223dea6aa702" +hash = "c94b6a646ba1b7eca2ed69fd5a219d0846e19c46a1341d5d21e15f5db2dde4bc" metafile = true [[files]] diff --git a/main/mods/borderless-mining.pw.toml b/main/mods/borderless-mining.pw.toml deleted file mode 100644 index d6f6016..0000000 --- a/main/mods/borderless-mining.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Borderless Mining" -filename = "borderless-mining-1.1.9+1.20.2.jar" -side = "client" - -[download] -url = "https://cdn.modrinth.com/data/kYq5qkSL/versions/r2hHx4zB/borderless-mining-1.1.9%2B1.20.2.jar" -hash-format = "sha1" -hash = "cf26d4615041f2db6df6b6906c5475fac05030e0" - -[update] -[update.modrinth] -mod-id = "kYq5qkSL" -version = "r2hHx4zB" diff --git a/main/mods/cubes-without-borders.pw.toml b/main/mods/cubes-without-borders.pw.toml new file mode 100644 index 0000000..41a5bf4 --- /dev/null +++ b/main/mods/cubes-without-borders.pw.toml @@ -0,0 +1,13 @@ +name = "Cubes Without Borders" +filename = "cubes-without-borders-1.1.0+1.20.jar" +side = "client" + +[download] +url = "https://cdn.modrinth.com/data/ETlrkaYF/versions/IQtaUFAv/cubes-without-borders-1.1.0%2B1.20.jar" +hash-format = "sha1" +hash = "e54a2c4b4817efb93a2ce7cb78bf8a2d1136b6cd" + +[update] +[update.modrinth] +mod-id = "ETlrkaYF" +version = "IQtaUFAv" diff --git a/main/mods/fuy_gg.pw.toml b/main/mods/fuy_gg.pw.toml index 3d1d15e..2848829 100644 --- a/main/mods/fuy_gg.pw.toml +++ b/main/mods/fuy_gg.pw.toml @@ -1,13 +1,13 @@ name = "fuy.gg" -filename = "fuy_gg-1.3.5.jar" +filename = "fuy_gg-1.3.7.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/EMQzFaJ1/versions/SxOqTU1M/fuy_gg-1.3.5.jar" +url = "https://cdn.modrinth.com/data/EMQzFaJ1/versions/7XSk89tC/fuy_gg-1.3.7.jar" hash-format = "sha1" -hash = "a5e28839410d2bdb1bda625da9178930f8bb94f3" +hash = "af896625585cd5c1d98c0b2cd96c23698dc6b939" [update] [update.modrinth] mod-id = "EMQzFaJ1" -version = "SxOqTU1M" +version = "7XSk89tC" diff --git a/main/mods/immediatelyfast.pw.toml b/main/mods/immediatelyfast.pw.toml index 094c15a..8c3c034 100644 --- a/main/mods/immediatelyfast.pw.toml +++ b/main/mods/immediatelyfast.pw.toml @@ -1,13 +1,13 @@ name = "ImmediatelyFast" -filename = "ImmediatelyFast-Fabric-1.2.10+1.20.4.jar" +filename = "ImmediatelyFast-Fabric-1.2.11+1.20.4.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/5ZwdcRci/versions/59UuNTrz/ImmediatelyFast-Fabric-1.2.10%2B1.20.4.jar" +url = "https://cdn.modrinth.com/data/5ZwdcRci/versions/FEOsWs1E/ImmediatelyFast-Fabric-1.2.11%2B1.20.4.jar" hash-format = "sha1" -hash = "54b50a6231bbeb3bd58caaa7ea25510e5db205bc" +hash = "71cff4c39487def96292cd8f5bef37795fbfbc31" [update] [update.modrinth] mod-id = "5ZwdcRci" -version = "59UuNTrz" +version = "FEOsWs1E" diff --git a/main/mods/qsl.pw.toml b/main/mods/qsl.pw.toml index 4f95cbe..6d89d2f 100644 --- a/main/mods/qsl.pw.toml +++ b/main/mods/qsl.pw.toml @@ -1,13 +1,13 @@ name = "Quilted Fabric API (QFAPI) / Quilt Standard Libraries (QSL)" -filename = "quilted-fabric-api-8.0.0-alpha.4+0.91.6-1.20.2.jar" +filename = "quilted-fabric-api-8.0.0-alpha.5+0.91.6-1.20.2.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/qvIfYCYJ/versions/z7EhOm3D/quilted-fabric-api-8.0.0-alpha.4%2B0.91.6-1.20.2.jar" +url = "https://cdn.modrinth.com/data/qvIfYCYJ/versions/vZbU3nyq/quilted-fabric-api-8.0.0-alpha.5%2B0.91.6-1.20.2.jar" hash-format = "sha1" -hash = "6adfed59e5840256145eb96010ced7ea8ad5b382" +hash = "1a086a4a129546c9509f4ad18144bb291425c383" [update] [update.modrinth] mod-id = "qvIfYCYJ" -version = "z7EhOm3D" +version = "vZbU3nyq" diff --git a/main/mods/shoulder-surfing-reloaded.pw.toml b/main/mods/shoulder-surfing-reloaded.pw.toml index 7788f86..fedbaff 100644 --- a/main/mods/shoulder-surfing-reloaded.pw.toml +++ b/main/mods/shoulder-surfing-reloaded.pw.toml @@ -1,13 +1,13 @@ name = "Shoulder Surfing Reloaded" -filename = "ShoulderSurfing-Fabric-1.20.4-2.9.4.jar" +filename = "ShoulderSurfing-Fabric-1.20.4-2.9.6.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/kepjj2sy/versions/AKpMGpg6/ShoulderSurfing-Fabric-1.20.4-2.9.4.jar" +url = "https://cdn.modrinth.com/data/kepjj2sy/versions/shZkVeco/ShoulderSurfing-Fabric-1.20.4-2.9.6.jar" hash-format = "sha1" -hash = "582abd61920b4298f14e656d2c82aa3339fde2e9" +hash = "9497a94f2a6ae33cebe3f1b65a4b882968100c0c" [update] [update.modrinth] mod-id = "kepjj2sy" -version = "AKpMGpg6" +version = "shZkVeco" diff --git a/main/mods/wynntils.pw.toml b/main/mods/wynntils.pw.toml index afb8530..ab17325 100644 --- a/main/mods/wynntils.pw.toml +++ b/main/mods/wynntils.pw.toml @@ -1,13 +1,13 @@ name = "Wynntils" -filename = "wynntils-1.1.0-fabric+MC-1.20.2.jar" +filename = "wynntils-1.1.6-fabric+MC-1.20.2.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/dU5Gb9Ab/versions/Xoys2oOq/wynntils-1.1.0-fabric%2BMC-1.20.2.jar" +url = "https://cdn.modrinth.com/data/dU5Gb9Ab/versions/fmSMeCyp/wynntils-1.1.6-fabric%2BMC-1.20.2.jar" hash-format = "sha1" -hash = "9c4645e85f919f7d51fbc798dc8af19d7a6c872e" +hash = "2fefd0988c00d9fb96241bef5c7dbedf4021e6a6" [update] [update.modrinth] mod-id = "dU5Gb9Ab" -version = "Xoys2oOq" +version = "fmSMeCyp" diff --git a/main/pack.toml b/main/pack.toml index 45b8091..de12c04 100644 --- a/main/pack.toml +++ b/main/pack.toml @@ -1,12 +1,12 @@ name = "Wynncraft 101" author = "aninuscsalas" -version = "1.1.0" +version = "1.1.1" pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "e73204e90ce9739058ab95ab9173f8cd0d7838916a0ee42e976fe4baea6a6106" +hash = "00a310cd0bdf872fc2d40779f4044ce4c1dbee3fb8b13e6a6355baf3d16a9228" [versions] minecraft = "1.20.2" diff --git a/pre-commit-hooks.nix b/pre-commit-hooks.nix deleted file mode 100644 index 35ffd3f..0000000 --- a/pre-commit-hooks.nix +++ /dev/null @@ -1,15 +0,0 @@ -{inputs, ...}: { - imports = [inputs.pre-commit-hooks.flakeModule]; - - perSystem.pre-commit = { - settings.excludes = ["flake.lock"]; - - settings = { - hooks = { - alejandra.enable = true; - yamllint.enable = true; - }; - settings.yamllint.relaxed = true; - }; - }; -}