Combt mods (#3)

* New mods * Modrinth pack * Bring back clock; Bump version; Update readme; Update hash; Update flow; --------- Co-authored-by: Nikita Pedorich <[email protected]>
pedorich-n · Nov 12, 2023 · 1a2fe8c · 1a2fe8c
1 parent 334eeb0
commit 1a2fe8c
Show file tree

Hide file tree

Showing 12 changed files with 121 additions and 26 deletions.
diff --git a/.github/workflows/generate-mrpack.yaml b/.github/workflows/generate-mrpack.yaml
@@ -15,9 +15,9 @@ jobs:
       - name: Install Nix
         uses: cachix/install-nix-action@v23
       - name: Export modpack name
-        run: echo "PACK_NAME=$(nix develop .#builder --command yq '.name' pack.toml)" >> $GITHUB_ENV
-      - name: Add version to modpack name
-        run: echo "PACK_NAME_VERSION=${PACK_NAME}-${{ github.ref_name }}.mrpack" >> $GITHUB_ENV
+        run: |
+          PACK_NAME=$(nix develop .#builder --command yq '.name' pack.toml)
+          echo "PACK_NAME_VERSION=${PACK_NAME}-${{ github.ref_name }}.mrpack" >> $GITHUB_ENV
       - name: Create mrpack
         run: nix develop .#builder --command packwiz modrinth export --output $PACK_NAME_VERSION
       - name: Upload mrpack

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Modpack Info
 
 
 **Name**: Fabric_Modpack  
-**Version**: 2023.11.4  
+**Version**: 2023.11.5  
 **Minecraft Version**: 1.20.1  
 **Fabric Version**: 0.14.24  
 
@@ -13,8 +13,10 @@ Modpack Info
 - [**Applied Energistics 2**](https://modrinth.com/mod/ae2) (both, 15.0.14) - AE2: A popular automation and storage mod
 - [**Alternate Current**](https://modrinth.com/mod/alternate-current) (server, mc1.20-1.7.0) - An efficient and non-locational redstone dust implementation
 - [**Aquamirae**](https://modrinth.com/mod/aquamirae) (both, 6) - Ship graveyard with terrible deep sea creatures!
+- [**Architectury API**](https://modrinth.com/mod/architectury-api) (both, 9.1.12+fabric) - An intermediary api aimed to ease developing multiplatform mods.
 - [**Beautified Chat [Client]**](https://modrinth.com/mod/beautified-chat-client) (both, 1.20.1-2.3-forge+fabric) - 💬 A highly configurable mod to change the chat style and colour on the client.
 - [**Better Archeology**](https://modrinth.com/mod/better-archeology) (both, 1.0.2) - Discover artifacts & fossils by encountering new structures that'll enhance your adventure and exploration!
+- [**Better Combat**](https://modrinth.com/mod/better-combat) (both, 1.8.2+1.20.1-fabric) - ⚔️ Easy, spectacular and fun melee combat system from Minecraft Dungeons.
 - [**Botarium**](https://modrinth.com/mod/botarium) (both, 2.2.1) - A crossplatform API for devs that makes transfer and storage of items, fluids and energy easier, as well as some other helpful things
 - [**Concurrent Chunk Management Engine (Fabric)**](https://modrinth.com/mod/c2me-fabric) (both, 0.2.0+alpha.11.0+1.20.1) - A Fabric mod designed to improve the chunk performance of Minecraft.
 - [**CC: Tweaked**](https://modrinth.com/mod/cc-tweaked) (both, 1.108.4) - ComputerCraft fork adding programmable computers, turtles and more to Minecraft.
@@ -36,6 +38,7 @@ Modpack Info
 - [**EMI**](https://modrinth.com/mod/emi) (both, 1.0.24+1.20.1+fabric) - A featureful and accessible item and recipe viewer
 - [**Entity Culling**](https://modrinth.com/mod/entityculling) (client, 1.6.2-1.20.2) - Using async path-tracing to hide Block-/Entities that are not visible
 - [**Exordium**](https://modrinth.com/mod/exordium) (client, 1.2.1-1.20.1) - Render the GUI and screens at a lower framerate to speed up what's really important: the worldrendering.
+- [**Explorify**](https://modrinth.com/mod/explorify) (both, 1.3.0) - An integrated vanilla-friendly collection of new dungeons and structures
 - [**Create: Extended Cogwheels**](https://modrinth.com/mod/extended-cogwheels) (both, 2.1.0-1.20.1-0.5.1.c-fabric) - A small mod to add more cog types to create
 - [**Fabric API**](https://modrinth.com/mod/fabric-api) (both, 0.90.7+1.20.1) - Lightweight and modular API providing common hooks and intercompatibility measures utilized by mods using the Fabric toolchain.
 - [**Fabric Language Kotlin**](https://modrinth.com/mod/fabric-language-kotlin) (both, 1.10.13+kotlin.1.9.20) - This is a mod that enables usage of the Kotlin programming language for Fabric mods.
@@ -45,7 +48,6 @@ Modpack Info
 - [**Forge Config API Port**](https://modrinth.com/mod/forge-config-api-port) (both, v8.0.0-1.20.1-Fabric) - Forge's whole config system provided to the Fabric ecosystem. Designed for a multiloader architecture.
 - [**Galosphere**](https://modrinth.com/mod/galosphere) (both, 1.3.1) - An expansion for caves, including new biomes, mobs, and more.
 - [**GUI Clock**](https://modrinth.com/mod/gui-clock) (both, 1.20.1-4.3-forge+fabric) - ⏰ Shows the time/days played in the GUI/HUD with a clock in the inventory.
-- [**GUI Compass**](https://modrinth.com/mod/gui-compass) (both, 1.20.1-4.3-forge+fabric) - 🧭 Shows direction and coordinates in the GUI/HUD with a compass in the inventory.
 - [**ImmediatelyFast**](https://modrinth.com/mod/immediatelyfast) (client, 1.2.6+1.20.2) - Speed up immediate mode rendering in Minecraft
 - [**Incendium**](https://modrinth.com/mod/incendium) (both, 5.3.3) - Incendium is a datapack that completely revamps the nether, way more than what Minecraft did in the 1.16 Nether Update.
 - [**Indium**](https://modrinth.com/mod/indium) (client, 1.0.27+mc1.20.1) - Sodium addon providing support for the Fabric Rendering API, based on Indigo
@@ -64,8 +66,11 @@ Modpack Info
 - [**No Chat Reports**](https://modrinth.com/mod/no-chat-reports) (both, Fabric-1.20.1-v2.2.2) - Makes chat unreportable (where possible)
 - [**Nullscape**](https://modrinth.com/mod/nullscape) (both, 1.2.3) - Nullscape keeps the End as a barren, depressing, and bleak place: as it should be, and always will be.
 - [**Obscure API**](https://modrinth.com/mod/obscure-api) (both, 16) - Auxiliary Library
+- [**Patchouli**](https://modrinth.com/mod/patchouli) (both, 1.20.1-81-fabric) - Accessible, Data-Driven, Dependency-Free Documentation for Minecraft Modders and Pack Makers
+- [**playerAnimator**](https://modrinth.com/mod/playeranimator) (both, 1.0.2-rc1+1.20-fabric) - animate the player
 - [**Puzzles Lib**](https://modrinth.com/mod/puzzles-lib) (both, v8.1.8-1.20.1-Fabric) - Why's it called Puzzles you ask? That's the puzzle!
 - [**Reese's Sodium Options**](https://modrinth.com/mod/reeses-sodium-options) (client, mc1.20.1-1.6.5) - Alternative Options Menu for Sodium
+- [**Simply Swords**](https://modrinth.com/mod/simply-swords) (both, 1.51.5-1.20.1) - Adds Spears, Glaives, Chakrams, Katanas, Greathammer/axes, Rapiers, and many more weapons!
 - [**Sodium**](https://modrinth.com/mod/sodium) (client, mc1.20.1-0.5.3) - A modern rendering engine for Minecraft which greatly improves performance
 - [**spark**](https://modrinth.com/mod/spark) (both, 1.10.53-fabric) - spark is a performance profiler for Minecraft clients, servers and proxies.
 - [**squaremap**](https://modrinth.com/mod/squaremap) (server, 1.2.0) - squaremap is a minimalistic & lightweight world map viewer for Minecraft servers, using the vanilla map rendering style

diff --git a/flake.nix b/flake.nix
@@ -22,7 +22,7 @@
         {
           packwiz-server = packwiz2nixLib.fetchPackwizModpack {
             manifest = "${self}/pack.toml";
-            hash = "sha256-zBVfN7g5TI3UkhYx5li4hgOJcUa/UkQFtSp+DxkjA+4=";
+            hash = "sha256-bX0+Tp8ylyas7jtleOjwYy/ko7jkB3u/MBARu6y2W1M=";
             side = "server";
           };
 

diff --git a/index.toml b/index.toml
@@ -15,6 +15,11 @@ file = "mods/aquamirae.pw.toml"
 hash = "ea42747450c6c385925895e98de7c1347c6e24b034bbaee198d5dfda4bb8eb1d"
 metafile = true
 
+[[files]]
+file = "mods/architectury-api.pw.toml"
+hash = "a243675bc757485925b293932ee289b9fbcfb3b75bd3ba74eca7603f191cedad"
+metafile = true
+
 [[files]]
 file = "mods/beautified-chat-client.pw.toml"
 hash = "781f3a99d5e8a69b05698ecb8540caa250e332affde988d138bec7257a900882"
@@ -25,6 +30,11 @@ file = "mods/better-archeology.pw.toml"
 hash = "4ce8cd02fd6db139f101a9643068702bcc77dab491454e73a3bcf0638710a62a"
 metafile = true
 
+[[files]]
+file = "mods/better-combat.pw.toml"
+hash = "002a43d78a1164f15354b58a21566c8e6063fbd65390524a889bcee5895f203a"
+metafile = true
+
 [[files]]
 file = "mods/botarium.pw.toml"
 hash = "39c1c613510610ba17f1c40af55cbcf33cde14466f2f6ef9ab102fe67bf6cec5"
@@ -130,6 +140,11 @@ file = "mods/exordium.pw.toml"
 hash = "2b9b5a34a6f3cb5796b4e9996fe1da41d7b063b2727743aeed6c8d350d7cdbb6"
 metafile = true
 
+[[files]]
+file = "mods/explorify.pw.toml"
+hash = "9ec8d9ecfedbd3cc30dc19b91f37a540ff9340debf035cbb81a7103f65e086f1"
+metafile = true
+
 [[files]]
 file = "mods/extended-cogwheels.pw.toml"
 hash = "e5a66f936624909d847060c6aee2cded1300934c5ad1396db173275293dfbf86"
@@ -175,11 +190,6 @@ file = "mods/gui-clock.pw.toml"
 hash = "e588c87cac0431accdf0a94870173b41bf2ad8f6cf8af05ed57bbd160a64f49d"
 metafile = true
 
-[[files]]
-file = "mods/gui-compass.pw.toml"
-hash = "8254a82f567e6695d4a4960faea27221d2daf284533d283ced5516be71b07dab"
-metafile = true
-
 [[files]]
 file = "mods/immediatelyfast.pw.toml"
 hash = "7e9f6a5b564e4fbe92bff784eb13a2565eb5a631ed452cf9b8748e73935ae8b2"
@@ -270,6 +280,16 @@ file = "mods/obscure-api.pw.toml"
 hash = "5b96aa24048b1cea2e05b91954a25579f41c83c7008afd5c48426b579664288a"
 metafile = true
 
+[[files]]
+file = "mods/patchouli.pw.toml"
+hash = "cd1f0cf0ae2b6e1c14e3caa4685ae721cb590835110e076400cd986be1db9903"
+metafile = true
+
+[[files]]
+file = "mods/playeranimator.pw.toml"
+hash = "a3d67082a95f70155d68aec25d7ffba8a7c7bc48b342529e52005ddfc76f11ae"
+metafile = true
+
 [[files]]
 file = "mods/puzzles-lib.pw.toml"
 hash = "8ecb202cbaf851233c9b3ff1541f8c70af8334779d59e8046450d6bcd62edc67"
@@ -280,6 +300,11 @@ file = "mods/reeses-sodium-options.pw.toml"
 hash = "44b0a2294e1693230308e53b529d671a0303e94b623ba2c2650cdf5760a5a335"
 metafile = true
 
+[[files]]
+file = "mods/simply-swords.pw.toml"
+hash = "481554a4e059cda1be174d3942f0c0f0d7158fc8fc985ee332ccc4e2c74894b7"
+metafile = true
+
 [[files]]
 file = "mods/sodium.pw.toml"
 hash = "9a927c3e0830ba32e1b8a2e543597781724462595b8cce58f676962b442bb52b"

diff --git a/mods/architectury-api.pw.toml b/mods/architectury-api.pw.toml
@@ -0,0 +1,13 @@
+name = "Architectury API"
+filename = "architectury-9.1.12-fabric.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/lhGA9TYQ/versions/Sbew3kXe/architectury-9.1.12-fabric.jar"
+hash-format = "sha1"
+hash = "add0fffa445ee2959b0898484732704a15156553"
+
+[update]
+[update.modrinth]
+mod-id = "lhGA9TYQ"
+version = "Sbew3kXe"
diff --git a/mods/better-combat.pw.toml b/mods/better-combat.pw.toml
@@ -0,0 +1,13 @@
+name = "Better Combat"
+filename = "bettercombat-fabric-1.8.2+1.20.1.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/5sy6g3kz/versions/2Q8QpAR9/bettercombat-fabric-1.8.2%2B1.20.1.jar"
+hash-format = "sha1"
+hash = "5ea3b1bc56d8e6e7c7c252221b75f0f03ea5647b"
+
+[update]
+[update.modrinth]
+mod-id = "5sy6g3kz"
+version = "2Q8QpAR9"
diff --git a/mods/explorify.pw.toml b/mods/explorify.pw.toml
@@ -0,0 +1,13 @@
+name = "Explorify"
+filename = "explorify-v1.3.0-mc1.20.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/HSfsxuTo/versions/DFkIejTe/explorify-v1.3.0-mc1.20.jar"
+hash-format = "sha1"
+hash = "01b221413273cdf373a92499b8f0295dec1cd324"
+
+[update]
+[update.modrinth]
+mod-id = "HSfsxuTo"
+version = "DFkIejTe"
diff --git a/mods/gui-compass.pw.toml b/mods/gui-compass.pw.toml
diff --git a/mods/patchouli.pw.toml b/mods/patchouli.pw.toml
@@ -0,0 +1,13 @@
+name = "Patchouli"
+filename = "Patchouli-1.20.1-81-FABRIC.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/nU0bVIaL/versions/tzz6fEoj/Patchouli-1.20.1-81-FABRIC.jar"
+hash-format = "sha1"
+hash = "eaab83736fedfd7336c3b8429b08c6f56a4f5d69"
+
+[update]
+[update.modrinth]
+mod-id = "nU0bVIaL"
+version = "tzz6fEoj"
diff --git a/mods/playeranimator.pw.toml b/mods/playeranimator.pw.toml
@@ -0,0 +1,13 @@
+name = "playerAnimator"
+filename = "player-animation-lib-fabric-1.0.2-rc1+1.20.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/gedNE4y2/versions/yDqYTUaf/player-animation-lib-fabric-1.0.2-rc1%2B1.20.jar"
+hash-format = "sha1"
+hash = "9182c38bcf614d0ed7091b15f7e099a7f2fb3617"
+
+[update]
+[update.modrinth]
+mod-id = "gedNE4y2"
+version = "yDqYTUaf"
diff --git a/mods/simply-swords.pw.toml b/mods/simply-swords.pw.toml
@@ -0,0 +1,13 @@
+name = "Simply Swords"
+filename = "simplyswords-fabric-1.51.5-1.20.1.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/bK3Ubu9p/versions/bRyxkjAA/simplyswords-fabric-1.51.5-1.20.1.jar"
+hash-format = "sha1"
+hash = "a29c8224a2063f02d06879e4066de78e8d1c8ee1"
+
+[update]
+[update.modrinth]
+mod-id = "bK3Ubu9p"
+version = "bRyxkjAA"
diff --git a/pack.toml b/pack.toml
@@ -1,11 +1,11 @@
 name = "Fabric_Modpack"
-version = "2023.11.4"
+version = "2023.11.5"
 pack-format = "packwiz:1.1.0"
 
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "c9931fd4b2f6f86835caa25c45cbc07c9b2b1d9c1fffa24941d672cdbcd8a3dc"
+hash = "01fedd0fe5e5786eb80424c31a841ad4c46cee6168dae6fa85602a508820325f"
 
 [versions]
 fabric = "0.14.24"