SergeantAcoustic/tinkers_tinkering
2
0
Fork 0
Code Issues Actions Releases 16 Activity

Compare commits

base: SergeantAcoustic:2.4.0
Branches Tags
SergeantAcoustic:1.21.1
SergeantAcoustic:main
SergeantAcoustic:2.5.0
SergeantAcoustic:2.4.0
SergeantAcoustic:2.3.0
SergeantAcoustic:2.2.0
SergeantAcoustic:2.1.0
SergeantAcoustic:2.0.0
SergeantAcoustic:1.3.0
SergeantAcoustic:1.2.0
SergeantAcoustic:1.1.3
SergeantAcoustic:1.1.2
SergeantAcoustic:1.1.1
SergeantAcoustic:1.1.0
SergeantAcoustic:1.0.3
SergeantAcoustic:1.0.2
SergeantAcoustic:1.0.1
SergeantAcoustic:1.0.0
..
compare: SergeantAcoustic:2.5.0
Branches Tags
SergeantAcoustic:1.21.1
SergeantAcoustic:main
SergeantAcoustic:2.5.0
SergeantAcoustic:2.4.0
SergeantAcoustic:2.3.0
SergeantAcoustic:2.2.0
SergeantAcoustic:2.1.0
SergeantAcoustic:2.0.0
SergeantAcoustic:1.3.0
SergeantAcoustic:1.2.0
SergeantAcoustic:1.1.3
SergeantAcoustic:1.1.2
SergeantAcoustic:1.1.1
SergeantAcoustic:1.1.0
SergeantAcoustic:1.0.3
SergeantAcoustic:1.0.2
SergeantAcoustic:1.0.1
SergeantAcoustic:1.0.0

7 commits
2.4.0 ... 2.5.0

Author SHA1 Message Date
Sergeant Acoustic ba88c10ade 2.5.0
All checks were successful
/ build-1.21 (push) Successful in 1m4s
Details
2026-07-22 23:23:08 +01:00
Sergeant Acoustic 2d327b446c Fix copper gear not having recipe advancements 
Also categorise copper boots/leggings as equipment, not misc
 2026-07-22 23:20:23 +01:00
Sergeant Acoustic 7ffebd59ed Update changelog 2026-07-04 17:09:11 +01:00
patience d0e42262cd
Bump version for mod
All checks were successful
/ build-1.21 (push) Successful in 3m0s
Details
2026-06-21 03:03:25 +01:00
Sergeant Acoustic 15d6204cd5 Update changelog 2026-06-21 01:35:06 +01:00
Sergeant Acoustic ea816a5600 Add basic error handling to the export-pack script 2026-06-17 20:00:03 +01:00
Sergeant Acoustic c8988595bd Fix copper bar/trapdoor recipe conflict
All checks were successful
/ build-1.21 (push) Successful in 49s
Details
2026-05-03 20:09:53 +01:00
17 changed files with 404 additions and 2 deletions
Show stats Expand all files Collapse all files

15
CHANGELOG.md
View file

@ -5,6 +5,18 @@ 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.5.0]
### Added
- Zombies sprint when within 12 blocks of their target
- Piglins deal less base damage (still higher than vanilla due to gold and axe changes)
### Fixed
- Copper bars and trapdoors had the same recipe
- Magma Cube melee attacks no longer apply every tick with no cooldown
- Fixed Blazes instantly killing players hanging around spawners.
- Copper gear wasn't being added to the recipe book
## [2.4.0]
### Added
@ -80,7 +92,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.4.0...HEAD
[unreleased]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.5.0...HEAD
[2.5.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.4.0...2.5.0
[2.4.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.3.0...2.4.0
[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

11
export-pack.sh
View file

@ -40,11 +40,21 @@ 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)
if [ $? -ne 0 ]; then
echo "Error during mod clone/update, do you have internet?"
exit 1
fi
# Compile the 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)
if [ $? -ne 0 ]; then
echo "Error during mod compilation"
exit 1
fi
# Clean up old mod files
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"
@ -90,4 +100,5 @@ if [ $? -eq 0 ]; then
echo "Successfully exported the client modpack to ${basedir}/release/MC_Rebalance_${version}.mrpack"
else
echo "An unknown error occured while zipping the pack"
exit 1
fi

2
modrinth.index.json
View file

@ -6,7 +6,7 @@
"formatVersion": 1,
"game": "minecraft",
"name": "MC Rebalanced",
"versionId": "2.4.0",
"versionId": "2.5.0",
"files": [
{
"downloads": [

32
overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/combat/copper_boots.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_copper_ingot": {
"conditions": {
"items": [
{
"items": "minecraft:copper_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:copper_boots"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_copper_ingot"
]
],
"rewards": {
"recipes": [
"minecraft:copper_boots"
]
}
}

32
overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/combat/copper_chestplate.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_copper_ingot": {
"conditions": {
"items": [
{
"items": "minecraft:copper_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:copper_chestplate"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_copper_ingot"
]
],
"rewards": {
"recipes": [
"minecraft:copper_chestplate"
]
}
}

32
overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/combat/copper_helmet.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_copper_ingot": {
"conditions": {
"items": [
{
"items": "minecraft:copper_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:copper_helmet"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_copper_ingot"
]
],
"rewards": {
"recipes": [
"minecraft:copper_helmet"
]
}
}

32
overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/combat/copper_leggings.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_copper_ingot": {
"conditions": {
"items": [
{
"items": "minecraft:copper_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:copper_leggings"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_copper_ingot"
]
],
"rewards": {
"recipes": [
"minecraft:copper_leggings"
]
}
}

32
overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/combat/copper_spear.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_copper_ingot": {
"conditions": {
"items": [
{
"items": "#minecraft:copper_tool_materials"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:copper_spear"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_copper_ingot"
]
],
"rewards": {
"recipes": [
"minecraft:copper_spear"
]
}
}

32
overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/combat/copper_sword.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_copper_ingot": {
"conditions": {
"items": [
{
"items": "#minecraft:copper_tool_materials"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:copper_sword"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_copper_ingot"
]
],
"rewards": {
"recipes": [
"minecraft:copper_sword"
]
}
}

32
overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/tools/copper_axe.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_copper_ingot": {
"conditions": {
"items": [
{
"items": "#minecraft:copper_tool_materials"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:copper_axe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_copper_ingot"
]
],
"rewards": {
"recipes": [
"minecraft:copper_axe"
]
}
}

32
overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/tools/copper_hoe.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_copper_ingot": {
"conditions": {
"items": [
{
"items": "#minecraft:copper_tool_materials"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:copper_hoe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_copper_ingot"
]
],
"rewards": {
"recipes": [
"minecraft:copper_hoe"
]
}
}

32
overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/tools/copper_pickaxe.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_copper_ingot": {
"conditions": {
"items": [
{
"items": "#minecraft:copper_tool_materials"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:copper_pickaxe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_copper_ingot"
]
],
"rewards": {
"recipes": [
"minecraft:copper_pickaxe"
]
}
}

32
overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/advancement/recipes/tools/copper_shovel.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_copper_ingot": {
"conditions": {
"items": [
{
"items": "#minecraft:copper_tool_materials"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:copper_shovel"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_copper_ingot"
]
],
"rewards": {
"recipes": [
"minecraft:copper_shovel"
]
}
}

18
overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/recipe/copper_bars.json Normal file
View file

@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"item": "minecraft:copper_ingot"
}
},
"pattern": [
"III",
"III",
"III"
],
"result": {
"count": 24,
"id": "minecraft:copper_bars"
}
}

17
overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/recipe/copper_boots.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"pattern": [
"C C",
"C C"
],
"key": {
"C": {
"item": "minecraft:copper_ingot"
}
},
"result": {
"id": "minecraft:copper_boots",
"count": 1
}
}

18
overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/recipe/copper_leggings.json Normal file
View file

@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"pattern": [
"CCC",
"C C",
"C C"
],
"key": {
"C": {
"item": "minecraft:copper_ingot"
}
},
"result": {
"id": "minecraft:copper_leggings",
"count": 1
}
}

5
overrides/resources/common/required/mc_rebalance_datapack/data/minecraft/tags/item/copper_tool_materials.json Normal file
View file

@ -0,0 +1,5 @@
{
"values": [
"minecraft:copper_ingot"
]
}