Update changelog

Fixes issue with BKI being loaded above the mc_rebalance datapack when
updating an existing world to a version with the BKI datapack

.forgejo/workflows/build-1.21.yaml

@@ -0,0 +1,69 @@
+on:
+  push:
+    paths:
+      - 'overrides/**/*'
+      - 'modrinth.index.json'
+      - '.forgejo/workflows/build-1.21.yaml'
+jobs:
+  build-1.21:
+    runs-on: docker
+    container:
+      image: alpine:3.23.3
+    steps:
+      - name: Install dependencies
+        run: apk -U add git nodejs openjdk21 tar zstd
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Download mod
+        run: |
+          mkdir deps
+          wget --directory-prefix deps https://patience.nearmisses.xyz/patience/mc_rebalance/archive/1.21.tar.gz
+          tar xf deps/1.21.tar.gz --directory deps/
+
+      - name: Restore cached files
+        id: cache-files-restore
+        uses: actions/cache/restore@v5
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            deps/mc_rebalance/.gradle
+            deps/mc_rebalance/build
+          key: Gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            Gradle-
+
+      - name: Execute Gradle build
+        run: |
+          cd "deps/mc_rebalance/"
+          ./gradlew build
+
+      - name: Save cached files
+        if: always() && steps.cache-files-restore.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v5
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            deps/mc_rebalance/.gradle
+            deps/mc_rebalance/build
+          key: ${{ steps.cache-files-restore.outputs.cache-primary-key }}
+
+      - name: Save mod to pack
+        run: |
+          mkdir -p deps overrides/mods
+          cp "deps/mc_rebalance/build/libs/mc_rebalance-"[0-9].[0-9].[0-9]".jar" "overrides/mods"
+
+          cd "overrides/resources/common/required/mc_rebalance_datapack/assets/minecraft/lang/"
+          ./gen-langs.sh
+
+      - name: Upload release
+        uses: https://data.forgejo.org/forgejo/upload-artifact@v4
+        with:
+          name: MC_Rebalance_2.mrpack
+          path: |
+            overrides
+            modrinth.index.json
+            !**/*.sh

.gitignore

@@ -1,9 +1,9 @@
 release
 deps
 overrides/mods/mc_rebalance-*.jar
-overrides/global_packs/mc_rebalance_datapack/assets/minecraft/lang/en_au.json
+overrides/resources/common/required/mc_rebalance_datapack/assets/minecraft/lang/en_au.json
-overrides/global_packs/mc_rebalance_datapack/assets/minecraft/lang/en_ca.json
+overrides/resources/common/required/mc_rebalance_datapack/assets/minecraft/lang/en_ca.json
-overrides/global_packs/mc_rebalance_datapack/assets/minecraft/lang/en_gb.json
+overrides/resources/common/required/mc_rebalance_datapack/assets/minecraft/lang/en_gb.json
-overrides/global_packs/mc_rebalance_datapack/assets/minecraft/lang/en_nz.json
+overrides/resources/common/required/mc_rebalance_datapack/assets/minecraft/lang/en_nz.json
-overrides/global_packs/mc_rebalance_datapack/assets/minecraft/lang/en_pt.json
+overrides/resources/common/required/mc_rebalance_datapack/assets/minecraft/lang/en_pt.json
-overrides/global_packs/mc_rebalance_datapack/assets/minecraft/lang/en_ud.json
+overrides/resources/common/required/mc_rebalance_datapack/assets/minecraft/lang/en_ud.json

CHANGELOG.md

@@ -5,6 +5,53 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+- Trimmable tool support for paxels
+
+### Fixed
+- The paxel recipes are now correctly unlocked when finding (most of) their relevant resources
+
+## [2.3.0]
+
+### Added
+
+- Added enchantment's exclusive sets to their descriptions
+- Added [Better Keep Inventory](https://modrinth.com/datapack/better-keep-inventory-datapack)
+	- On death you'll now drop everything besides your tools and armour
+	- The item spread is also off
+- Added [Language Reload](https://modrinth.com/mod/language-reload), [Trimmable Tools](https://modrinth.com/datapack/trimmable-tools), [Boat Break Fix](https://modrinth.com/mod/boat-break-fix), [Simple Snowy Fix](https://modrinth.com/mod/simple-snowy-fix-\(forge-fabric\)), [Volume Fix](https://modrinth.com/mod/volume-fix), [HRTF Fix](https://modrinth.com/mod/hrtffix), [Dragon Movement Fix](https://modrinth.com/datapack/dragon-movement-fix)
+- Ported cheaper rails recipes from 1.20 modpack
+
+### Changed
+
+- Updated Vanilla backport, Platform lib, and Enderpearl Backport
+
+### Fixed
+
+- Fixed Ender Dragon melee attack damage applying every tick with no cooldown
+
+## [2.2.0]
+
+### Added
+
+- Added logical iframes
+
+### Changed
+
+- Ported axe/sword attack damage changes from 1.20 modpack
+- Lowered crop growth rate (it's still faster than vanilla)
+
+### Removed
+
+- Removed power enchantment
+
+### Fixed
+
+- Fixed copper pickaxe advancement
+- Lowered minimum attack damage from cooldown (a fix for autoclickers with logical iframes)
+
 ## [2.1.0]
 
 ### Added
@@ -24,6 +71,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Initial 2.0.0 release
 
-[unreleased]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.1.0...HEAD
+[unreleased]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.3.0...HEAD
+[2.3.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.2.0...2.3.0
+[2.2.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.1.0...2.2.0
 [2.1.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.0.0...2.1.0
 [2.0.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/releases/tag/2.0.0

README.md

@@ -1,4 +1,4 @@
-## Minecraft Rebalanced 2.0.0 - [Changelog](CHANGELOG.md)
+# Minecraft Rebalanced 2 - [Changelog](CHANGELOG.md)
 
 A modpack intended to rework almost every feature in the game with a focus on the vanilla progression.
 
@@ -9,12 +9,15 @@ Some details on what the modpack changes can be found in the mod's README.
 
 Packed in Modrinth format, because [Modrinth](https://modrinth.com) is the superior mod hosting platform.
 
-# Installing
+## Installing
 1. Download the latest version [here](https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/releases/)
 2. Drag into your mod loader of choice
 
-# Development
+## Development
-## Export script
+### Forgejo actions
-To create a release, run [./export-pack.sh](export-pack.sh)
+Every time a commit is pushed to this repo, a version of the pack is automatically generated, which can be found [here](https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/actions/workflows/build-1.21.yaml/runs/latest) (`MC_Rebalance_2.mrpack` below Artifacts).
 
-* It will be generated in [release/Tinker's tinkering.mrpack](Tinker's%20tinkering.mrpack)
+### Export script
+* To create a release yourself, run [./export-pack.sh](export-pack.sh)
+* This is also generate a server pack
+* When it's done both can be found in `release/`

export-pack.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
 ## Dependencies (arch/debian package names, may differ elsewhere):
-## bash, coreutils (dirname, mkdir, rm, cp), git, zip, findutils (find)
+## bash, coreutils (dirname, mkdir, rm, cp), git, zip, findutils (find), curl, wget, jq
-## jq is optional
 check_dep() {
 	if ! [ -x "$(command -v $1)" ]; then
 		echo "You need to install ${2:-$1}"
@@ -14,6 +13,9 @@ check_dep dirname coreutils
 check_dep git
 check_dep zip
 check_dep find findutils
+check_dep curl
+check_dep wget
+check_dep jq
 
 # Navigate to main modpack project directory
 cd "$(dirname "$0")"
@@ -22,20 +24,24 @@ basedir="$PWD"
 # Location for downloading/updating the mc_rebalance mod
 if [ ! -d deps ]; then
 	mkdir deps
-fi;
+fi
 
 # Location for saving the mc_rebalance mod
 if [ ! -d overrides/mods ]; then
 	mkdir -p overrides/mods
-fi;
+fi
+
+# Location for saving all other mods
+rm -rf deps/mods
+mkdir -p deps/mods
 
 # Clone the mod repo, if it already exists then update it
-echo "# Cloning/updating mod"
+echo "# Cloning/updating MC Rebalance mod"
 git clone --single-branch --branch 1.21 "https://patience.nearmisses.xyz/patience/mc_rebalance.git" "${basedir}/deps/mc_rebalance" 2> /dev/null || \
 	(cd "${basedir}/deps/mc_rebalance"; git pull > /dev/null)
 
 # Compile the mod
-echo "# Compiling mod"
+echo "# Compiling MC Rebalance mod"
 rm -f "${basedir}/deps/mc_rebalance/build/libs/mc_rebalance-"*".jar"
 (cd "${basedir}/deps/mc_rebalance/" && ./gradlew build > /dev/null)
 
@@ -44,24 +50,44 @@ rm -f "${basedir}/overrides/mods/mc_rebalance-"*".jar"
 cp "$(find "${basedir}/deps/mc_rebalance/build/libs" -regex "${basedir}/deps\/mc_rebalance\/build\/libs\/mc_rebalance-[0-9\.]+\.jar")" "${basedir}/overrides/mods"
 
 # Generate language files
-(cd "$basedir/overrides/global_packs/mc_rebalance_datapack/assets/minecraft/lang/" && ./gen-langs.sh)
+(cd "$basedir/overrides/resources/common/required/mc_rebalance_datapack/assets/minecraft/lang/" && ./gen-langs.sh)
 
 # Final path for the modpack
 if [ ! -d release ]; then
 	mkdir release
-fi;
+fi
 
 # Get version from the mrpack file
 version="$(jq -r ".versionId" modrinth.index.json)"
 version="${version:-dev}"
 
-# Export release to file
+# Download fabric server
-echo "# Zipping mod"
+if [ ! -e "${basedir}/deps/fabric-server.jar" ]; then
+	echo "# Downloading fabric server"
+	(cd deps && curl --silent --output fabric-server.jar https://meta.fabricmc.net/v2/versions/loader/1.21.1/0.19.2/1.1.1/server/jar)
+fi
+
+# Download all mods
+echo "# Downloading mods from modrinth.index.json for modpack"
+(cd deps/mods && wget --quiet --input-file <(jq -r '.files[] | select(.env.server=="required") | .downloads[]' ../../modrinth.index.json))
+
+# Export client release to file
+echo "# Zipping client modpack"
 zip --filesync --recurse-paths --quiet "${basedir}/release/MC_Rebalance_${version}.mrpack" overrides modrinth.index.json -x "*.git*" -x "*.sh"
 
+# Export server release to file
+echo "# Zipping server modpack"
+if [ -e "${basedir}/release/MC_Rebalance_${version}_server.zip" ]; then
+	rm -rf "${basedir}/release/MC_Rebalance_${version}_server.zip"
+fi
+(cd deps && zip --recurse-paths --quiet "${basedir}/release/MC_Rebalance_${version}_server.zip" mods fabric-server.jar)
+(cd server-files && zip --recurse-paths --quiet "${basedir}/release/MC_Rebalance_${version}_server.zip" .)
+(cd overrides && zip --recurse-paths --quiet "${basedir}/release/MC_Rebalance_${version}_server.zip" . -x "*.git*" -x "*.sh")
+
 echo
 if [ $? -eq 0 ]; then
-	echo "Successfully exported the modpack to ${basedir}/release/MC_Rebalance_${version}.mrpack"
+	echo "Successfully exported the server modpack to ${basedir}/release/MC_Rebalance_${version}_server.zip"
+	echo "Successfully exported the client modpack to ${basedir}/release/MC_Rebalance_${version}.mrpack"
 else
 	echo "An unknown error occured while zipping the pack"
 fi

modrinth.index.json

@@ -6,23 +6,8 @@
   "formatVersion": 1,
   "game": "minecraft",
   "name": "MC Rebalanced",
-  "versionId": "2.1.0",
+  "versionId": "2.3.0",
   "files": [
-    {
-      "downloads": [
-        "https://cdn.modrinth.com/data/NRLPy2mk/versions/ErTctr3A/globalpacks-fabric-1.21.1-21.0.6.jar"
-      ],
-      "env": {
-        "client": "required",
-        "server": "required"
-      },
-      "fileSize": 394707,
-      "hashes": {
-        "sha1": "6a0c4ccf2a8bc916173defc3c49c8e95285e66b9",
-        "sha512": "f49f202900e2753f154a06a48a40c57bdcd85e70bb265f80794f1b74f5924302d9109bb80c58dabf99944b15ed7031ba8156f4231fc6743e4008758f00be1840"
-      },
-      "path": "mods/globalpacks-fabric-1.21.1-21.0.6.jar"
-    },
     {
       "downloads": [
         "https://cdn.modrinth.com/data/hg77g4Pw/versions/cBEkQM9c/no-telemetry-1.10.0.jar"
@@ -85,33 +70,33 @@
     },
     {
       "downloads": [
-        "https://cdn.modrinth.com/data/6xwxDTgf/versions/dQd9n3aB/VanillaBackport-fabric-1.21.1-1.1.5.4.2.jar"
+        "https://cdn.modrinth.com/data/6xwxDTgf/versions/wAeQBuFY/VanillaBackport-fabric-1.21.1-1.1.6.3.jar"
       ],
       "env": {
         "client": "required",
         "server": "required"
       },
-      "fileSize": 28549222,
+      "fileSize": 27541846,
       "hashes": {
-        "sha1": "a1d7396d5ab9b22dfbf7d18e125a8a7e8f57a968",
+        "sha1": "39564fc06204353c24c22d26cd362af0732c147c",
-        "sha512": "9623f846019e236583f4791cf8a9062089d62c3b67b89f478c918aaf09dce735ef2857021b9c1500cf6fa1557b6fea760dfef834056ed77643d0fec26601c21f"
+        "sha512": "e75b73eda047e4d4b3504985aadcacf951944c27f523d0bc17b139b19a3b6170f745fd285790fe6a0e215bfa0f06b862095c160b6c79bc026aa0cd5d4f3277e0"
       },
-      "path": "mods/VanillaBackport-fabric-1.21.1-1.1.5.4.2.jar"
+      "path": "mods/VanillaBackport-fabric-1.21.1-1.1.6.3.jar"
     },
     {
       "downloads": [
-        "https://cdn.modrinth.com/data/i6fiqm5y/versions/gV5SV031/Platform-fabric-1.21.1-1.2.11.5.jar"
+        "https://cdn.modrinth.com/data/i6fiqm5y/versions/WeSu6O41/Platform-fabric-1.21.1-1.3.jar"
       ],
       "env": {
         "client": "required",
         "server": "required"
       },
-      "fileSize": 731829,
+      "fileSize": 719170,
       "hashes": {
-        "sha1": "355c4ddaf0e9362c570ccd8d1576c6fae9290071",
+        "sha1": "abc57a537cd2f2f5613d43455a31264095198154",
-        "sha512": "d08fdbef9148e38f306c951d03c8382308bccca65c4d269ed2901f9e838b8e62bdbdcc8f86e6f02429a52184163653b4914f47eaaf8e90a72370080201a55700"
+        "sha512": "b519abb4623fb2b986371d8d0c54bd29a4cfec02c04d4e2d7edc46a9cc0d045257ba5c479ea43aef32ef8dda79a2a8de9b03cc06ca90d6114d48ccc2e7a21a7c"
       },
-      "path": "mods/Platform-fabric-1.21.1-1.2.11.5.jar"
+      "path": "mods/Platform-fabric-1.21.1-1.3.jar"
     },
     {
       "downloads": [
@@ -389,7 +374,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 9907,
       "hashes": {
@@ -404,7 +389,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 83422,
       "hashes": {
@@ -449,7 +434,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 12432,
       "hashes": {
@@ -475,18 +460,18 @@
     },
     {
       "downloads": [
-        "https://cdn.modrinth.com/data/tfgqelN2/versions/y3X6z96U/enderpearl-backport-1.21-1.1.3.jar"
+        "https://cdn.modrinth.com/data/tfgqelN2/versions/iNDHgEJS/enderpearl-backport-1.21-1.1.5.jar"
       ],
       "env": {
         "client": "required",
         "server": "required"
       },
-      "fileSize": 26196,
+      "fileSize": 27102,
       "hashes": {
-        "sha1": "77a42ae4844bd607a066e983b3fd5ccbad76c401",
+        "sha1": "a14530c22f7826c5e48b883cce0755e110b67d46",
-        "sha512": "a1456b480953adb08e688cc55d951d3d034a4505658ffdf0855bdc709a55d52782ce35a4598234accb922a44bfa56801c01e5070fa6ca28c95e81f0ef1fe6822"
+        "sha512": "b3ab735981ed6df9471a7ddbe1b2f859227dcf4120005a89670d1145f3da21e71324347c1c30eacec7d151fb4a305b088980b1e1ece8982b905553ff111126d3"
       },
-      "path": "mods/enderpearl-backport-1.21-1.1.3.jar"
+      "path": "mods/enderpearl-backport-1.21-1.1.5.jar"
     },
     {
       "downloads": [
@@ -524,7 +509,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 100151,
       "hashes": {
@@ -584,7 +569,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 31382,
       "hashes": {
@@ -629,7 +614,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 1297761,
       "hashes": {
@@ -644,7 +629,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 373661,
       "hashes": {
@@ -659,7 +644,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 81067,
       "hashes": {
@@ -689,7 +674,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 84035,
       "hashes": {
@@ -704,7 +689,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 102285,
       "hashes": {
@@ -719,7 +704,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 1560675,
       "hashes": {
@@ -779,7 +764,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 863192,
       "hashes": {
@@ -794,7 +779,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 83679,
       "hashes": {
@@ -809,7 +794,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 79531,
       "hashes": {
@@ -914,7 +899,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 62761,
       "hashes": {
@@ -929,7 +914,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 496342,
       "hashes": {
@@ -944,7 +929,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 728221,
       "hashes": {
@@ -959,7 +944,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 75984,
       "hashes": {
@@ -974,7 +959,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 217532,
       "hashes": {
@@ -1004,7 +989,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 274019,
       "hashes": {
@@ -1094,7 +1079,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 98232,
       "hashes": {
@@ -1124,7 +1109,7 @@
       ],
       "env": {
         "client": "required",
-        "server": "required"
+        "server": "unsupported"
       },
       "fileSize": 17456,
       "hashes": {
@@ -1147,6 +1132,171 @@
         "sha512": "8653a751eb2ad1ad70da38017ccad0ee2bda5448ffe405d28049f09a61936765303f63ba4fcff798f32bb1e6b4645e892c275515b69c98c1730e24caab0ba7e0"
       },
       "path": "mods/c2me-fabric-mc1.21.1-0.3.0+alpha.0.362.jar"
+    },
+    {
+      "downloads": [
+        "https://cdn.modrinth.com/data/5e65FGXQ/versions/IEbD337h/simpleresourceloader-1.0.0%2B1.21.1.jar"
+      ],
+      "env": {
+        "client": "required",
+        "server": "required"
+      },
+      "fileSize": 15235,
+      "hashes": {
+        "sha1": "faa2a9b25f3a3e1e6c6ed8ab860a5b10cec303ff",
+        "sha512": "e1912941d38bd43019aeff3707e0d9fffbaffd768f774bea54b17f64d27a9a9c3d27102b555a798a7036b6c1a9cdad08d069c0639a8b4452346f9e6d21440c04"
+      },
+      "path": "mods/simpleresourceloader-1.0.0+1.21.1.jar"
+    },
+    {
+      "downloads": [
+        "https://cdn.modrinth.com/data/6sYYcZFx/versions/Vf0oWYOW/logical-iframes-1.1.1.jar"
+      ],
+      "env": {
+        "client": "required",
+        "server": "required"
+      },
+      "fileSize": 24380,
+      "hashes": {
+        "sha1": "064dc01534d98afdc4a5ead62eb1838dc0ade817",
+        "sha512": "4fdb6a9bfd5706299114810751b43b22fa1e8565f2666ba07bca24c5c9b09af2ae2a311ac02062a7453f4c6a38001525868486a111134335a0e60392759202cc"
+      },
+      "path": "mods/logical-iframes-1.1.1.jar"
+    },
+    {
+      "downloads": [
+        "https://cdn.modrinth.com/data/OVb8ZE5p/versions/Uf9jCC3m/BoatBreakFix-Universal-1.0.2.jar"
+      ],
+      "env": {
+        "client": "required",
+        "server": "required"
+      },
+      "fileSize": 6866,
+      "hashes": {
+        "sha1": "f0bc583479532b7a83cded5ac86f0b3622c69558",
+        "sha512": "7dedce72e959a05db469ff7e6175d7bc7189ed012ecb4bbbf299f0ee2b1876c67753731e05928ba8743b294cf5b208da01056d65ca51c27ad14b2313addcea92"
+      },
+      "path": "mods/BoatBreakFix-Universal-1.0.2.jar"
+    },
+    {
+      "downloads": [
+        "https://cdn.modrinth.com/data/P1Kv5EAO/versions/O6odCETu/Necronomicon-Fabric-1.6.0%2B1.21.jar"
+      ],
+      "env": {
+        "client": "required",
+        "server": "required"
+      },
+      "fileSize": 37055,
+      "hashes": {
+        "sha1": "b6ac70d9ecac570f56e75db81d8281976fea1357",
+        "sha512": "0deeb7ed7914994bf274547d7c665be460a27a2526adc00f3708b257bab8b51204dc6c8b3b2259440c57b3ebfeaa3d8ca9e9c4308f0265a041233dbeb5eae2af"
+      },
+      "path": "mods/Necronomicon-Fabric-1.6.0+1.21.jar"
+    },
+    {
+      "downloads": [
+        "https://cdn.modrinth.com/data/3WP3HZRG/versions/K637FjjR/simple_snowy_fix-1.21.1-1.21.11-2.1.9-fabric.jar"
+      ],
+      "env": {
+        "client": "required",
+        "server": "required"
+      },
+      "fileSize": 120154,
+      "hashes": {
+        "sha1": "08dd6c0de036c17e6843e16e780dd9396855651d",
+        "sha512": "d5f0a7db96e2c6cb3bf1a59b19a98fc21be856a9add8f8decaae913160d4dbd3f628194ece57aa36397e307a327d8f2fc351310e25e9e54193e912cc409f0a41"
+      },
+      "path": "mods/simple_snowy_fix-1.21.1-1.21.11-2.1.9-fabric.jar"
+    },
+    {
+      "downloads": [
+        "https://cdn.modrinth.com/data/Iywe4QI4/versions/6UZ5mKrA/volumefix-1.2.0%2B1.21.jar"
+      ],
+      "env": {
+        "client": "required",
+        "server": "unsupported"
+      },
+      "fileSize": 9136,
+      "hashes": {
+        "sha1": "7346203754a7201daa1c924f50bc22b9a279d560",
+        "sha512": "7b51002618bef61c5a0210f9570365395f8dcc8e172a66d6373e81fae46de328bce931b9d66b0ab4caff0405885ff019cc9ace11d3479aeee9c978c99db9d74e"
+      },
+      "path": "mods/volumefix-1.2.0+1.21.jar"
+    },
+    {
+      "downloads": [
+        "https://cdn.modrinth.com/data/Y3o9dZWX/versions/u3JPxrCm/hrtffix-fabric-1.0.0.jar"
+      ],
+      "env": {
+        "client": "required",
+        "server": "unsupported"
+      },
+      "fileSize": 9862,
+      "hashes": {
+        "sha1": "f31754f2cdcd28a42283b9d3a25909b98cd59064",
+        "sha512": "5a12f200aec2ff8f07aae25f7212b76b24386c7c979d2c5658a6ee68cb0bfa895b0b35b09f55a9e2f28e8f6f5a91293c85dea071bc6786f74224f28f091dd32f"
+      },
+      "path": "mods/hrtffix-fabric-1.0.0.jar"
+    },
+    {
+      "downloads": [
+        "https://cdn.modrinth.com/data/6E5wF2bY/versions/LRjqWIC2/dragon-movement-fix-1.1.6.jar"
+      ],
+      "env": {
+        "client": "required",
+        "server": "required"
+      },
+      "fileSize": 12984,
+      "hashes": {
+        "sha1": "8d269a801c8aa4328dd1db61dedd2c11a7afd912",
+        "sha512": "a51f1c5931c5729b665e30af7d91d8a91962137224ac1a0d36d15ea8cff3c67eeec7899632ea14913605e00dd11ced71f4e6edcea454b507d6de58973e8bce21"
+      },
+      "path": "mods/dragon-movement-fix-1.1.6.jar"
+    },
+    {
+      "downloads": [
+        "https://cdn.modrinth.com/data/uLbm7CG6/versions/lLMGPiZe/language-reload-1.7.6%2B1.21.1.jar"
+      ],
+      "env": {
+        "client": "required",
+        "server": "unsupported"
+      },
+      "fileSize": 75091,
+      "hashes": {
+        "sha1": "95c1266f43e330d4848dcf2e11a6be98a8990ce5",
+        "sha512": "39dfb0490a26baea1f79e0e86116f89ff85213df1e528c2727ea84c64f6e6b889817089d5faa4b15a4648393787ec5305b96eed29ce506d9129aa4b7a50b66b1"
+      },
+      "path": "mods/language-reload-1.7.6+1.21.1.jar"
+    },
+    {
+      "downloads": [
+        "https://cdn.modrinth.com/data/WzVQCdgr/versions/5VkorMHZ/bKeepInv_1.3_1.20.5-26.1.zip"
+      ],
+      "env": {
+        "client": "required",
+        "server": "required"
+      },
+      "fileSize": 87114,
+      "hashes": {
+        "sha1": "060e9f774f3f9a26012f4dee6937e45112444fc8",
+        "sha512": "7bc3e0d6dbbd660775d1eb6364911deed8b8385cd3160317842cbed8be57f4a8b4bec0c4c558f4bb15936067af96dbca924d11a6c4d7da41f8b1ccf9e48aedab"
+      },
+      "path": "resources/datapack/required/bKeepInv_1.3_1.20.5-26.1.zip"
+    },
+    {
+      "downloads": [
+        "https://cdn.modrinth.com/data/MJu3fF3K/versions/d0JX71gl/trimmable_tools-fabric-1.21.1-2.0.5.jar"
+      ],
+      "env": {
+        "client": "required",
+        "server": "required"
+      },
+      "fileSize": 171136,
+      "hashes": {
+        "sha1": "cd328ce2fc4daf510f2448af6a9f05ac3648d6bc",
+        "sha512": "143848039931aff35c0e56ebbddb55a4dcbc59beb5040972daca8cf71dfaf842d29895babd5bbd3803956f9185469c4eee01fb28c14a9400d48572a11edc318e"
+      },
+      "path": "mods/trimmable_tools-fabric-1.21.1-2.0.5.jar"
     }
   ]
 }

overrides/config/global_packs.toml

@@ -1,24 +0,0 @@
-# Auto Generated, do not touch
-config_version = 4
-# If set to true, the mod creates a new global folder, that is global for your user on your computer.
-# The created folders will be:
-# <user_home>/.minecraft_global_packs/<version>/required_datapacks
-# <user_home>/.minecraft_global_packs/<version>/optional_datapacks
-# <user_home>/.minecraft_global_packs/<version>/required_resourcepacks
-# <user_home>/.minecraft_global_packs/<version>/optional_resourcepacks
-enable_system_global_packs = false
-# This prints Pack IDs into the logs, using this you can force enable builtin resourcepacks from mods, further down in the config.
-log_pack_ids = false
-
-# This config allows you to add or remove folders or single files as Data-/Resourcepacks
-# For that simply specify the file path to the folder/file relative to your <instance> folder
-[resourcepacks]
-	required = ["global_packs/"]
-	# Check game log if log_pack_ids is set to true, you need to add the full IDs listed in there.
-	# Search for "# Listing Resource Packs #" inside the log
-	enable_builtin = []
-
-[datapacks]
-	required = ["global_packs/"]
-	optional = []
-	enable_builtin = []

overrides/config/trimmable_tools.json

@@ -0,0 +1,46 @@
+{
+  "tool_types": {
+    "trimmable_tools:sword": "#minecraft:swords",
+    "trimmable_tools:axe": "#minecraft:axes",
+    "trimmable_tools:shovel": "#minecraft:shovels",
+    "trimmable_tools:hoe": "#minecraft:hoes",
+    "trimmable_tools:pickaxe": "#minecraft:pickaxes",
+    "trimmable_tools:paxel": "#mc_rebalance:paxels"
+  },
+  "darker_materials": {
+    "diamond": [
+      "minecraft:diamond_axe",
+      "minecraft:diamond_hoe",
+      "minecraft:diamond_pickaxe",
+      "minecraft:diamond_shovel",
+      "minecraft:diamond_sword",
+      "mc_rebalance:diamond_paxel"
+    ],
+    "netherite": [
+      "minecraft:netherite_axe",
+      "minecraft:netherite_hoe",
+      "minecraft:netherite_pickaxe",
+      "minecraft:netherite_shovel",
+      "minecraft:netherite_sword",
+      "mc_rebalance:netherite_paxel"
+    ],
+    "gold": [
+      "minecraft:golden_axe",
+      "minecraft:golden_hoe",
+      "minecraft:golden_pickaxe",
+      "minecraft:golden_shovel",
+      "minecraft:golden_sword",
+      "mc_rebalance:golden_paxel"
+    ],
+    "iron": [
+      "minecraft:iron_axe",
+      "minecraft:iron_hoe",
+      "minecraft:iron_pickaxe",
+      "minecraft:iron_shovel",
+      "minecraft:iron_sword",
+      "mc_rebalance:iron_paxel"
+    ]
+  },
+  "extra_patterns": [],
+  "extra_materials": []
+}

overrides/global_packs/mc_rebalance_datapack/data/c/utils/inverse-tags/enchantment/weapon_damage_enhancements.json

@@ -1,3 +0,0 @@
-[
-	"minecraft:sharpness"
-]

overrides/global_packs/mc_rebalance_datapack/data/minecraft/advancement/story/upgrade_tools.json.patch

@@ -1,12 +0,0 @@
-[
-	{
-		"op": "add",
-		"path": "/parent",
-		"value": "mc_rebalance:story/wooden_paxel"
-	},
-	{
-		"op": "add",
-		"path": "/display/icon/id",
-		"value": "minecraft:copper_pickaxe"
-	}
-]

overrides/global_packs/mc_rebalance_datapack/data/minecraft/utils/inverse-tags/enchantment/non_treasure.json

@@ -1,4 +0,0 @@
-[
-	"minecraft:protection",
-	"minecraft:sharpness"
-]

overrides/resources/common/required/mc_rebalance_datapack/assets/minecraft/lang/gen-langs.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Simply copies en_us.json to other standard english variants
 

overrides/resources/common/required/mc_rebalance_datapack/data/c/utils/inverse-tags/enchantment/weapon_damage_enhancements.json

@@ -1,4 +1,4 @@
 [
 	"minecraft:sharpness",
-	"minecraft:protection"
+	"minecraft:power"
 ]

overrides/resources/common/required/mc_rebalance_datapack/data/dragonfix/function/load.mcfunction

@@ -0,0 +1,11 @@
+scoreboard objectives add Settings dummy
+scoreboard objectives add Temp dummy
+scoreboard objectives add YPos dummy
+scoreboard objectives add PrevY dummy
+scoreboard objectives add YDiff dummy
+scoreboard objectives add YVel dummy
+scoreboard objectives add DMFSettings dummy
+#reference in case i need it
+scoreboard objectives add DragonPhase dummy
+
+scoreboard players set Loaded Temp 1

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/story/upgrade_tools.json.patch

@@ -0,0 +1,17 @@
+[
+	{
+		"op": "replace",
+		"path": "/parent",
+		"value": "mc_rebalance:story/wooden_paxel"
+	},
+	{
+		"op": "replace",
+		"path": "/display/icon/id",
+		"value": "minecraft:copper_pickaxe"
+	},
+	{
+		"op": "replace",
+		"path": "/criteria/stone_pickaxe/conditions/items/0/items",
+		"value": "minecraft:copper_pickaxe"
+	}
+]

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/diamond/axe.json

@@ -0,0 +1,23 @@
+{
+  "items": [
+    "minecraft:diamond_axe"
+  ],
+  "patch": {
+    "attribute_modifiers": [
+      {
+        "type": "generic.attack_damage",
+        "slot": "mainhand",
+        "id": "base_attack_damage",
+        "amount": 11,
+        "operation": "add_value"
+      },
+      {
+        "type": "minecraft:generic.attack_speed",
+        "id": "minecraft:base_attack_speed",
+        "amount": -3,
+        "operation": "add_value",
+        "slot": "mainhand"
+      }
+    ]
+  }
+}

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/diamond/sword.json

@@ -0,0 +1,23 @@
+{
+  "items": [
+    "minecraft:diamond_sword"
+  ],
+  "patch": {
+    "attribute_modifiers": [
+      {
+        "type": "generic.attack_damage",
+        "slot": "mainhand",
+        "id": "base_attack_damage",
+        "amount": 7,
+        "operation": "add_value"
+      },
+      {
+        "type": "minecraft:generic.attack_speed",
+        "id": "minecraft:base_attack_speed",
+        "amount": -2.4000000953674316,
+        "operation": "add_value",
+        "slot": "mainhand"
+      }
+    ]
+  }
+}

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/axe.json

@@ -14,7 +14,7 @@
         "type": "generic.attack_damage",
         "slot": "mainhand",
         "id": "base_attack_damage",
-        "amount": 8,
+        "amount": 9,
         "operation": "add_value"
       },
       {

overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/sword.json

@@ -8,7 +8,7 @@
         "type": "generic.attack_damage",
         "slot": "mainhand",
         "id": "base_attack_damage",
-        "amount": 5.5,
+        "amount": 6,
         "operation": "add_value"
       },
       {