Skip to content

Conversation

@runcows
Copy link
Contributor

@runcows runcows commented Oct 12, 2025

This PR

  • removes CanDuplicate nbt field from Gemini Shamir, this field was removed in MC 1.21.5
  • adds copper torch to Crossbow Cartridges
  • Updates Metallurgy and its expansions for copper tools and armor
  • Replaces #gm4:boots with #minecraft:foot_armor
  • Swaps most 1.21.9 overlays to backport_81
    • left out from this is Disassemblers (since_88 contents are generated) and Standard Crafting

Copy link
Member

@misode misode left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We prefer backwards/negative overlays, for example backport_81. This makes it easier to remove these overlays in the future and ensures that the data folder is always the latest version.

@runcows

This comment was marked as outdated.

runcows and others added 8 commits October 31, 2025 09:43
- 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
Metallurgy Expansions - Update `modeldata_registry` with copper
@runcows

This comment was marked as outdated.

@runcows runcows mentioned this pull request Oct 31, 2025
Copy link
Member

@TheThanathor TheThanathor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Left two comments but they're not really blocking anything

We should maybe look at updating Metallurgy at some point to also accept custom items or items with custom durability, but for now it's fine.

Comment on lines +7 to +8
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
# | MaxDamage is set by gm4_moneo_shamir:store_maximum
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this mean Audere is now reliant on Moneo? While that's technically fine while Moneo is in base Metallurgy it might cause problems if Moneo is ever updated / removed since it's unlikely this would be thought of then

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, although this is a change from #1167 which is only mixed in here because I needed to handle overlays of the same files for copper tools. We can definitely move the store_maximum function into the metallurgy namespace if needed though

execute unless block ~ ~ ~ #gm4_crossbow_cartridges:torch run loot spawn ~ ~ ~ loot minecraft:blocks/copper_torch

# place block sound
playsound minecraft:block.wood.place block @a[distance=..15]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also for the other materials, but I feel like this shouldn't play if the torch didn't actually place

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh huh, yeah. Likely a change for a different PR though so I'll make an issue to track it

@misode misode merged commit b8fe6b3 into Gamemode4Dev:update-1.21.9 Nov 3, 2025
4 checks passed
@runcows runcows deleted the 1.21.9-again branch November 4, 2025 01:21
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants