Metallurgy adjust gold max damage + remove redundancy #1167
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
misode
approved these changes
Oct 13, 2025
| data modify storage gm4_audere_shamir:temp/player/tool SelectedItem set from entity @s SelectedItem | ||
| execute store result score $tool_current_damage gm4_ml_data run data get storage gm4_audere_shamir:temp/player/tool SelectedItem.components."minecraft:damage" | ||
| execute store result score $tool_max_damage gm4_ml_data run data get storage gm4_audere_shamir:temp/player/tool SelectedItem.components."minecraft:custom_data".gm4_audere_shamir.max_durability | ||
| execute store result score $tool_max_damage gm4_ml_data run data get storage gm4_audere_shamir:temp/player/tool SelectedItem.components."minecraft:custom_data".MaxDurability |
Member
There was a problem hiding this comment.
It seemed like this was not a backwards compatible change, but I realize that moneo is always installed, and thus the MaxDurability tag should be present on all tools. (I think?)
The comment in moneo's store_maximum function could probably make it clear that it runs for all shamirs.
Related, I think right now infinitas' make_unstackable runs for every shamir, not only for infinitas, which maybe isn't a problem, but still weird.
runcows
added a commit
to runcows/GM4_Datapacks
that referenced
this pull request
Oct 26, 2025
runcows
added a commit
to runcows/GM4_Datapacks
that referenced
this pull request
Oct 31, 2025
misode
pushed a commit
that referenced
this pull request
Nov 3, 2025
* Remove deprecated `CanDuplicate` nbt from Gemini Shamir breed allay - This data field was removed in 1.21.5 * Add copper torch to Crossbow Cartridges * Metallurgy Copper Tools (not RP) * Replace `#gm4:boots` with `#minecraft:foot_armor` * Update `shamir_model_template.py` with copper * Adjust gold max damage + remove redundancy (#1167) * Update overlays with gold arborenda PR changes * Swap most overlays to `backport_81` - Disassemblers was left as `since_88` as the contents are generated - Standard Crafting was left as `since_88` because inverting it is not easy without errors in prior versions * More resource pack stuff? * Update `modeldata_registry` with copper Metallurgy Expansions - Update `modeldata_registry` with copper
EpyonProjects
pushed a commit
to EpyonProjects/GM4_Datapacks
that referenced
this pull request
Nov 20, 2025
* Remove deprecated `CanDuplicate` nbt from Gemini Shamir breed allay - This data field was removed in 1.21.5 * Add copper torch to Crossbow Cartridges * Metallurgy Copper Tools (not RP) * Replace `#gm4:boots` with `#minecraft:foot_armor` * Update `shamir_model_template.py` with copper * Adjust gold max damage + remove redundancy (Gamemode4Dev#1167) * Update overlays with gold arborenda PR changes * Swap most overlays to `backport_81` - Disassemblers was left as `since_88` as the contents are generated - Standard Crafting was left as `since_88` because inverting it is not easy without errors in prior versions * More resource pack stuff? * Update `modeldata_registry` with copper Metallurgy Expansions - Update `modeldata_registry` with copper
misode
added a commit
that referenced
this pull request
Nov 29, 2025
* Update beet and pack format * Update flash particle * Update chain -> icon_chain * Update noise router * Try to fix backwards plugin * Add min_format and max_format to overlays * runcows misc 1.21.9 commits (#1165) * Add copper weapons and armor to SR * Add copper golem to Reeling Rods * Disassembler copper tools and armor - untested overlay because beet is still broken * Update base tag lists * Add copper horse armor to Standard Crafting - overlay may be broken due to beet not being fully updated * Add mannequin to Reeling Rods steal_equipment * Lively Lily Pads 1.21.9 Feature Update (#1181) * Lively Lily Pads 1.21.9 * comments lie * Micro optimization * Metallurgy, desire lines, crossbow cartridges (#1168) * Remove deprecated `CanDuplicate` nbt from Gemini Shamir breed allay - This data field was removed in 1.21.5 * Add copper torch to Crossbow Cartridges * Metallurgy Copper Tools (not RP) * Replace `#gm4:boots` with `#minecraft:foot_armor` * Update `shamir_model_template.py` with copper * Adjust gold max damage + remove redundancy (#1167) * Update overlays with gold arborenda PR changes * Swap most overlays to `backport_81` - Disassemblers was left as `since_88` as the contents are generated - Standard Crafting was left as `since_88` because inverting it is not easy without errors in prior versions * More resource pack stuff? * Update `modeldata_registry` with copper Metallurgy Expansions - Update `modeldata_registry` with copper * Lightning in a Bottle 1.21.9 (#1188) * logic updating * attempt at connector textures + auto skin cache * Collapse overlay with block tags * Fix format fields for `beet dev` resource pack * [1.21.9] Fix overlay validation & beet (#1205) * Fix overlay validation by adding empty overlays * Update beet to 0.112.0 - Dev still broken * Readd empty space * Add 1.21.10 to supported (#1203) * Fix waterloggable tag order (#1202) * Fix (#1201) * Revert "Merge branch 'update-1.21.9' of https://github.com/Gamemode4Dev/GM4_Datapacks into update-1.21.9" This reverts commit 58097ab, reversing changes made to 6c297d2. * Revert "Merge remote-tracking branch 'upstream/master' into update-1.21.9" This reverts commit 6c297d2, reversing changes made to ccc5926. * Reapply "Merge remote-tracking branch 'upstream/master' into update-1.21.9" This reverts commit 93f767d. * Reapply "Merge branch 'update-1.21.9' of https://github.com/Gamemode4Dev/GM4_Datapacks into update-1.21.9" This reverts commit c790085. * Soul Glass - change recipe to normal furnace (#1211) * change recipe to use normal furnace * up module minor version * runcows comments * reduce desire line chance (#1212) * Vibro Shamir - use attributes (#1209) * let vibro use attributes note: this does not apply the safe fall distance from jump boost effect, but that is normally gone on landing anyway * add function header * Update packtest * Update beet to edayot's PR * Hex numbers are not supported by mecha yet * Update beet to fix worldgen in overlays * Fix metallurgy and lively lily pads overlays * Switch back to edayot's PR * Update beet to v0.112.1 * Make some failing tests optional --------- Co-authored-by: runcows <124551271+runcows@users.noreply.github.com> Co-authored-by: SpecialBuilder <specialbuilder32@gmail.com> Co-authored-by: Thanathor <73304324+TheThanathor@users.noreply.github.com>
github-actions bot
pushed a commit
that referenced
this pull request
Nov 29, 2025
* Update beet and pack format * Update flash particle * Update chain -> icon_chain * Update noise router * Try to fix backwards plugin * Add min_format and max_format to overlays * runcows misc 1.21.9 commits (#1165) * Add copper weapons and armor to SR * Add copper golem to Reeling Rods * Disassembler copper tools and armor - untested overlay because beet is still broken * Update base tag lists * Add copper horse armor to Standard Crafting - overlay may be broken due to beet not being fully updated * Add mannequin to Reeling Rods steal_equipment * Lively Lily Pads 1.21.9 Feature Update (#1181) * Lively Lily Pads 1.21.9 * comments lie * Micro optimization * Metallurgy, desire lines, crossbow cartridges (#1168) * Remove deprecated `CanDuplicate` nbt from Gemini Shamir breed allay - This data field was removed in 1.21.5 * Add copper torch to Crossbow Cartridges * Metallurgy Copper Tools (not RP) * Replace `#gm4:boots` with `#minecraft:foot_armor` * Update `shamir_model_template.py` with copper * Adjust gold max damage + remove redundancy (#1167) * Update overlays with gold arborenda PR changes * Swap most overlays to `backport_81` - Disassemblers was left as `since_88` as the contents are generated - Standard Crafting was left as `since_88` because inverting it is not easy without errors in prior versions * More resource pack stuff? * Update `modeldata_registry` with copper Metallurgy Expansions - Update `modeldata_registry` with copper * Lightning in a Bottle 1.21.9 (#1188) * logic updating * attempt at connector textures + auto skin cache * Collapse overlay with block tags * Fix format fields for `beet dev` resource pack * [1.21.9] Fix overlay validation & beet (#1205) * Fix overlay validation by adding empty overlays * Update beet to 0.112.0 - Dev still broken * Readd empty space * Add 1.21.10 to supported (#1203) * Fix waterloggable tag order (#1202) * Fix (#1201) * Revert "Merge branch 'update-1.21.9' of https://github.com/Gamemode4Dev/GM4_Datapacks into update-1.21.9" This reverts commit 58097ab, reversing changes made to 6c297d2. * Revert "Merge remote-tracking branch 'upstream/master' into update-1.21.9" This reverts commit 6c297d2, reversing changes made to ccc5926. * Reapply "Merge remote-tracking branch 'upstream/master' into update-1.21.9" This reverts commit 93f767d. * Reapply "Merge branch 'update-1.21.9' of https://github.com/Gamemode4Dev/GM4_Datapacks into update-1.21.9" This reverts commit c790085. * Soul Glass - change recipe to normal furnace (#1211) * change recipe to use normal furnace * up module minor version * runcows comments * reduce desire line chance (#1212) * Vibro Shamir - use attributes (#1209) * let vibro use attributes note: this does not apply the safe fall distance from jump boost effect, but that is normally gone on landing anyway * add function header * Update packtest * Update beet to edayot's PR * Hex numbers are not supported by mecha yet * Update beet to fix worldgen in overlays * Fix metallurgy and lively lily pads overlays * Switch back to edayot's PR * Update beet to v0.112.1 * Make some failing tests optional --------- Co-authored-by: runcows <124551271+runcows@users.noreply.github.com> Co-authored-by: SpecialBuilder <specialbuilder32@gmail.com> Co-authored-by: Thanathor <73304324+TheThanathor@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Gold tools had the wrong max damage (33 instead of 32) causing an off by 1 error
Both Audere Shamir and Moneo Shamir set a max durability custom data on tools, this redundancy has been eliminated, favoring just the function from Moneo Shamir.
However, there is potentially an open question of if we should move this function into the
gm4_metallurgynamespace, since it's common functionality. That has not been done here yet, but can be.