Update README

Global Packs didn't support load order changing of required resource packs

.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,26 @@ 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).
 
+## [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 +44,7 @@ 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.2.0...HEAD
+[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).
+
+### Export script
+To create a release yourself, run [./export-pack.sh](export-pack.sh)
 
 * It will be generated in [release/Tinker's tinkering.mrpack](Tinker's%20tinkering.mrpack)

export-pack.sh

@@ -44,7 +44,7 @@ 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

modrinth.index.json

@@ -6,23 +6,8 @@
   "formatVersion": 1,
   "game": "minecraft",
   "name": "MC Rebalanced",
-  "versionId": "2.1.0",
+  "versionId": "2.2.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"
@@ -1147,6 +1132,36 @@
         "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"
     }
   ]
 }

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/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/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"
       },
       {

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

@@ -0,0 +1,23 @@
+{
+  "items": [
+    "minecraft:netherite_axe"
+  ],
+  "patch": {
+    "attribute_modifiers": [
+      {
+        "type": "generic.attack_damage",
+        "slot": "mainhand",
+        "id": "base_attack_damage",
+        "amount": 14,
+        "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/netherite/sword.json

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