Metallurgy 1.21: Lore Line Shrink #1078
Merged
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
added
feature-update
misode
reviewed
Dec 8, 2024
gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/clear_data.mcfunction
Show resolved
Hide resolved
Member
|
This is now waiting on some 1.21.5 changes. |
misode
added a commit
that referenced
this pull request
May 25, 2025
* Add 1.21.5 packtest workflow * Update wolf_variant files * Update biome extensions * Remove 1.21-1.21.4 support ans squash overlays * Update version numbers to 1.21.5 * Update pack format * generate new item model definitions * item-model merge policy * Generate 1.21.3 RP models into an overlay * Add CMD range padding into new item_def files * Replace manual predicate-entry into model data config (for end fishing elytra) * Manually provide end fishing elytra item model in overlay * Remove RP backports * Fix some more RP script issues * Re-add standard crafting guidebook recipes * Re-add biome extensions beet.yaml * Remove upgrade paths and optional tag entries * Split potion entity type into splash_ and lingering_ * Item component changes * Update type_specific predicates * Delete beehive inspector module * Add pale oak door sounds * Update hoverEvent and clickEvent * Update some guidebook text components * Update ArmorItems and HandItems to equipment + drop_chances * Update text components in custom_name and CustomName * Use mecha dev dependency * Update TranslationLinter to check SNBT * Update more text components * Update body_armor_item to equipment.body * Fix splash_potion entity type in mob curing tests * Fix potion swords tests with inventory predicates * Test timing fix: Metallurgy and Infinitas failing smoosh test activating piston too early * increase delay to confirm sneaking * Test timing fix: Animi and Fulcio also failing smoosh test activating piston too early * Update to stable beet and mecha versions * Update packtest version to v2.1 * Revert test timing commits This reverts commit 63cb12f. This reverts commit d209a7e. This reverts commit bdb8c86. * Rename FallDistance to fall_distance * Fix advancement background texture * Fix phantom field Size -> size * Fix turtle field HasEgg -> has_egg * Fix vex field LifeTicks -> life_ticks * Fix pig Saddle -> equipment.saddle * Fix chairs lightning reviving * Fix text components in gm4 reload logs * More text component unstringifying * Replace reliance on AstNbt.evaluate * Add 1.21.5 Plants to Blossoming Pots * Fix balloon animals lead lore to entity name * Pig tractors fix * Fix phantom scarecrows rocket having a particle * Discontinue auto crafting module * Discontinue record crafting module * Make lumos and shapeless portals tests optional * Fix tunnel bores creation particle + orb of ankou AEC name * Fix undead players drowned conversion copying player name * Update Blossoming Pots Guidebook * Add new blocks to base tag lists - also fix alphabetical sorting in no_collision * Add farm animal variants to Balloon Animals * Fix guidebook code for text component changes * Fix guidebook lecturn TOC * Recommended Changes from misode * Fixes because I didn't pay enough attention to what I was doing * Discontinue tinkering compressors module * Fix Block Compressors test, add additional BoO test checking against keeping the boots data * BAS aec's do not despawn, expected Duration:0 by default. 1.21.5 broke this * Run's misc 1.21.5 commits part 3 (#1115) * Fix pig tractors unresponsive (#1109) * Fix NBI area affect cloud showing particles * Fix DripleafLaunchers broken from "stepping_on" change * Fix Gemini Shamir extra farm animal baby not having same variant as other baby / parents * Fix Gemini Shamir extra wolf baby not having same variant as other baby / parents * Add pale oak log & wood to Arborenda Shamir * Fix modules using `Inventory` for armor or offhand * Fix wrong set_bees reference and bucket_entity_data component * Fix tinker shamir for offhand and armor slots * Change inventory.* to container.* in tinker predicates * Discontinue combat expanded module * Fix infinite AECs * 1.21.5 aec default fixes (#1118) * set default radius * set default particle * update predicate count to 64 (#1120) * Fix Tipped Arrows and Beehives (#1121) * Fix Lingering LiaB * fix soul glass removing beacon data (#1123) * Revert machines library armor stand change * Update shamir model/texture generation code for 1.21.4 * Add backwards compatibility for 1.21.3 metallurgy textures * Fix references to item references that only exist as block references * Add support for special-case vanilla tempates Covers player heads, which is used by metallurgy mould heads. NOTE: current implementation puts heads on an armor stand, bypassing the usual model rendering. If a custom block model is added to the moulds, migration to an item-display is required. * Add rename for guidebook broken elytra texture * [Incomplete] fixing missing advancement icon model forwarding * [Incomplete] Move item-def handling to Templates * VanillaTemplate pulls in default model settings * [Incomplete] progress from desktop * Advancement models inherit from VanillaTemplate * 1.21.5 heart canisters update (#1122) * update heart canisters * improve heart canisters counting * update heart canister tests * meaningless change to make tests run * allow tadpoles to be everstoned (#1125) * Metallurgy 1.21: Lore Line Shrink (#1078) * Reduces Metallurgy shamir items lore count from 3 to 2 * Remove failing test line * Use macro and spawn new instead of copying over data * Move item kill to inside macro for safety * Use Text Displays for Holographic Tags - Colors now represent wool colores - Glow Item Frames now cause the hologram to appear lit * Fix Holographic Tags Test * Fix Hologram Removal Not Respecting Item Frame Rotation * I have suffered enough * New Mysterious Midnights Sound (#1126) The previous sound (wolf howl) was removed by Mojang. * 1.21.5 Heart Canisters (& Crossbow Cartridges) (#1127) * make heart canisters use poisonous potato's * fix heart canister from recipe * remove duplicate from recipe (oops) * Fix Double Doors: Copper Doors and Trapdoors are Unaffected #1038 * 1.21.5 Blossoming Pots finalize features & up version number (#1129) * Use 100% Entity-Free Raycast Technique in Book Binders (Vegan) Disclaimer: I was not able to test these changes yet. * Move Legacy Smithed Upgrade Path in Shroomites to Reduce @e Count * Actually Remove an @e * Remove smithed_compat upgrades (after almost 3 years) * Update Minor Version Numbers (#1130) Minor version should be bumped on every supported Minecraft version change to avoid possible overlaps on backports. * Modernize Desire Lines (#1090) * Fix Desire Lines Converting Blocks Below Non-Full Blocks * Modernize Desire Lines * Slow Falling Prevents Desire Lines * Fix: Vibro Shockwave Should Ignore Slow Falling, Add Comment on $probability Usage * Actually Don't Affect Blocks Below Carpet Co-authored-by: Thanathor <[email protected]> * Hard-Overwrite Desire Lines if Slow Falling is Active Co-authored-by: Thanathor <[email protected]> * Update gm4_desire_lines/data/gm4_desire_lines/function/player.mcfunction Co-authored-by: Thanathor <[email protected]> * Include Slow Falling in is_affected.json * Remove Unused Predicate * Remove Reference to Removed Predicate * Decrease Jumping Penalty * Add Myself to the Updater List so People Can Blame Me * Ensure Player Does NOT Have slow_falling --------- Co-authored-by: Thanathor <[email protected]> * Remove Leftover Lines * Update lib_brewing Raycast * Update lib_trees Raycast * Update lib_custom_crafters Raycast * Prioritize Saplings on Looking Vector in lib_trees Raycast * Prioritize Brewing Stand on Looking Vector in lib_brewing Raycast * Standard Crafting 1.21.5 (#1132) * Fix Slab uncrafting overlapping with some Vanilla Recipes (#1113) - Fixes #1105 by changing slab uncrafting to 2x2 slabs -> 2 blocks - Updates custom crafter recipes to match - Adding custom crafter support for 1.21 - 1.21.4 blocks - Changes to generated function definitions and loot tables for the custom crafter * Change stair uncrafting recipe output count to 3 blocks * Fix Excessive Particles in Better Armor Stands * Add Resin Brick Support to Forming Press * Add heart canisters upgrade path and fix RP (#1133) * Orb of Ankou 1.21.5 (#1128) * fix attribute-based pneumas * fix blasting * fix dashing by using player motion library * fix feigning jump * use attribute for agile NOTE: breaks old agile items, need an upgrade path * fix typo in comment * fix pricking NOTE: breaks old pricking soul essence * fix soaring * make shard and orb equippable into offhand * fix beet.yaml formatting * add loot tables for shards * add smithed item ignore functionality * refactor some entity functions - inline functions that aren't called from multiple places - use random - shard and essence entities grab loot table item instead of copying exact item (to act as an upgrade path) - TODO: orb upgrade path using data from shard loot tables * fix spawn positions of entities * restore orb based on shard loot tables * set max stack size of shards and orb to 1 * fix formatting * fix function rename * fix weapon.mainhand slot call for loot command * keep pneuma order intact when restoring an orb * fix congealed shard data * implement lib_player_motion - adds the player motion library as a namespaced and versioned GM4 library with proper call function tags * implement custom version of player motion - basically a fork that is renamespaced, version-checked, and uses the GM4 forceloaded chunk - licensing might not be correct in the release download * fix ooa to use proper player motion version * prevent wither rose particle from generating on obsidian * update random position to use random command and macro * Move original player motion license to main license * properly remove rose particle markers * properly kill striding markers * make items fire resistant * fix withering pneuma * fix expeditious * fix soaring * actually fix soaring - no longer need to look up for the first no-gravity - picking up or dropping items no longer resets the no-gravity - first sneak when equipping will activate the no-gravity * Fix shield models being invisible * Sunken treasure chests and metallurgy elytra * Fix "missing particle texture" warning in block models * Fix metallurgy RP * Fix guidebook RP by removing spawn_egg texture reference in font * Update heart canisters guidebook * 1.21.5 hc and ooa guidebook text (#1135) * update heart cansisters guidebook * update ooa guidebook * Update beet to v0.110.1 --------- Co-authored-by: SpecialBuilder <[email protected]> Co-authored-by: EpyonProjects <[email protected]> Co-authored-by: runcows <[email protected]> Co-authored-by: runcows <[email protected]> Co-authored-by: BPR <[email protected]> Co-authored-by: Thanathor <[email protected]> Co-authored-by: Bloo <[email protected]>
github-actions bot
pushed a commit
that referenced
this pull request
May 25, 2025
* Add 1.21.5 packtest workflow * Update wolf_variant files * Update biome extensions * Remove 1.21-1.21.4 support ans squash overlays * Update version numbers to 1.21.5 * Update pack format * generate new item model definitions * item-model merge policy * Generate 1.21.3 RP models into an overlay * Add CMD range padding into new item_def files * Replace manual predicate-entry into model data config (for end fishing elytra) * Manually provide end fishing elytra item model in overlay * Remove RP backports * Fix some more RP script issues * Re-add standard crafting guidebook recipes * Re-add biome extensions beet.yaml * Remove upgrade paths and optional tag entries * Split potion entity type into splash_ and lingering_ * Item component changes * Update type_specific predicates * Delete beehive inspector module * Add pale oak door sounds * Update hoverEvent and clickEvent * Update some guidebook text components * Update ArmorItems and HandItems to equipment + drop_chances * Update text components in custom_name and CustomName * Use mecha dev dependency * Update TranslationLinter to check SNBT * Update more text components * Update body_armor_item to equipment.body * Fix splash_potion entity type in mob curing tests * Fix potion swords tests with inventory predicates * Test timing fix: Metallurgy and Infinitas failing smoosh test activating piston too early * increase delay to confirm sneaking * Test timing fix: Animi and Fulcio also failing smoosh test activating piston too early * Update to stable beet and mecha versions * Update packtest version to v2.1 * Revert test timing commits This reverts commit 63cb12f. This reverts commit d209a7e. This reverts commit bdb8c86. * Rename FallDistance to fall_distance * Fix advancement background texture * Fix phantom field Size -> size * Fix turtle field HasEgg -> has_egg * Fix vex field LifeTicks -> life_ticks * Fix pig Saddle -> equipment.saddle * Fix chairs lightning reviving * Fix text components in gm4 reload logs * More text component unstringifying * Replace reliance on AstNbt.evaluate * Add 1.21.5 Plants to Blossoming Pots * Fix balloon animals lead lore to entity name * Pig tractors fix * Fix phantom scarecrows rocket having a particle * Discontinue auto crafting module * Discontinue record crafting module * Make lumos and shapeless portals tests optional * Fix tunnel bores creation particle + orb of ankou AEC name * Fix undead players drowned conversion copying player name * Update Blossoming Pots Guidebook * Add new blocks to base tag lists - also fix alphabetical sorting in no_collision * Add farm animal variants to Balloon Animals * Fix guidebook code for text component changes * Fix guidebook lecturn TOC * Recommended Changes from misode * Fixes because I didn't pay enough attention to what I was doing * Discontinue tinkering compressors module * Fix Block Compressors test, add additional BoO test checking against keeping the boots data * BAS aec's do not despawn, expected Duration:0 by default. 1.21.5 broke this * Run's misc 1.21.5 commits part 3 (#1115) * Fix pig tractors unresponsive (#1109) * Fix NBI area affect cloud showing particles * Fix DripleafLaunchers broken from "stepping_on" change * Fix Gemini Shamir extra farm animal baby not having same variant as other baby / parents * Fix Gemini Shamir extra wolf baby not having same variant as other baby / parents * Add pale oak log & wood to Arborenda Shamir * Fix modules using `Inventory` for armor or offhand * Fix wrong set_bees reference and bucket_entity_data component * Fix tinker shamir for offhand and armor slots * Change inventory.* to container.* in tinker predicates * Discontinue combat expanded module * Fix infinite AECs * 1.21.5 aec default fixes (#1118) * set default radius * set default particle * update predicate count to 64 (#1120) * Fix Tipped Arrows and Beehives (#1121) * Fix Lingering LiaB * fix soul glass removing beacon data (#1123) * Revert machines library armor stand change * Update shamir model/texture generation code for 1.21.4 * Add backwards compatibility for 1.21.3 metallurgy textures * Fix references to item references that only exist as block references * Add support for special-case vanilla tempates Covers player heads, which is used by metallurgy mould heads. NOTE: current implementation puts heads on an armor stand, bypassing the usual model rendering. If a custom block model is added to the moulds, migration to an item-display is required. * Add rename for guidebook broken elytra texture * [Incomplete] fixing missing advancement icon model forwarding * [Incomplete] Move item-def handling to Templates * VanillaTemplate pulls in default model settings * [Incomplete] progress from desktop * Advancement models inherit from VanillaTemplate * 1.21.5 heart canisters update (#1122) * update heart canisters * improve heart canisters counting * update heart canister tests * meaningless change to make tests run * allow tadpoles to be everstoned (#1125) * Metallurgy 1.21: Lore Line Shrink (#1078) * Reduces Metallurgy shamir items lore count from 3 to 2 * Remove failing test line * Use macro and spawn new instead of copying over data * Move item kill to inside macro for safety * Use Text Displays for Holographic Tags - Colors now represent wool colores - Glow Item Frames now cause the hologram to appear lit * Fix Holographic Tags Test * Fix Hologram Removal Not Respecting Item Frame Rotation * I have suffered enough * New Mysterious Midnights Sound (#1126) The previous sound (wolf howl) was removed by Mojang. * 1.21.5 Heart Canisters (& Crossbow Cartridges) (#1127) * make heart canisters use poisonous potato's * fix heart canister from recipe * remove duplicate from recipe (oops) * Fix Double Doors: Copper Doors and Trapdoors are Unaffected #1038 * 1.21.5 Blossoming Pots finalize features & up version number (#1129) * Use 100% Entity-Free Raycast Technique in Book Binders (Vegan) Disclaimer: I was not able to test these changes yet. * Move Legacy Smithed Upgrade Path in Shroomites to Reduce @e Count * Actually Remove an @e * Remove smithed_compat upgrades (after almost 3 years) * Update Minor Version Numbers (#1130) Minor version should be bumped on every supported Minecraft version change to avoid possible overlaps on backports. * Modernize Desire Lines (#1090) * Fix Desire Lines Converting Blocks Below Non-Full Blocks * Modernize Desire Lines * Slow Falling Prevents Desire Lines * Fix: Vibro Shockwave Should Ignore Slow Falling, Add Comment on $probability Usage * Actually Don't Affect Blocks Below Carpet Co-authored-by: Thanathor <[email protected]> * Hard-Overwrite Desire Lines if Slow Falling is Active Co-authored-by: Thanathor <[email protected]> * Update gm4_desire_lines/data/gm4_desire_lines/function/player.mcfunction Co-authored-by: Thanathor <[email protected]> * Include Slow Falling in is_affected.json * Remove Unused Predicate * Remove Reference to Removed Predicate * Decrease Jumping Penalty * Add Myself to the Updater List so People Can Blame Me * Ensure Player Does NOT Have slow_falling --------- Co-authored-by: Thanathor <[email protected]> * Remove Leftover Lines * Update lib_brewing Raycast * Update lib_trees Raycast * Update lib_custom_crafters Raycast * Prioritize Saplings on Looking Vector in lib_trees Raycast * Prioritize Brewing Stand on Looking Vector in lib_brewing Raycast * Standard Crafting 1.21.5 (#1132) * Fix Slab uncrafting overlapping with some Vanilla Recipes (#1113) - Fixes #1105 by changing slab uncrafting to 2x2 slabs -> 2 blocks - Updates custom crafter recipes to match - Adding custom crafter support for 1.21 - 1.21.4 blocks - Changes to generated function definitions and loot tables for the custom crafter * Change stair uncrafting recipe output count to 3 blocks * Fix Excessive Particles in Better Armor Stands * Add Resin Brick Support to Forming Press * Add heart canisters upgrade path and fix RP (#1133) * Orb of Ankou 1.21.5 (#1128) * fix attribute-based pneumas * fix blasting * fix dashing by using player motion library * fix feigning jump * use attribute for agile NOTE: breaks old agile items, need an upgrade path * fix typo in comment * fix pricking NOTE: breaks old pricking soul essence * fix soaring * make shard and orb equippable into offhand * fix beet.yaml formatting * add loot tables for shards * add smithed item ignore functionality * refactor some entity functions - inline functions that aren't called from multiple places - use random - shard and essence entities grab loot table item instead of copying exact item (to act as an upgrade path) - TODO: orb upgrade path using data from shard loot tables * fix spawn positions of entities * restore orb based on shard loot tables * set max stack size of shards and orb to 1 * fix formatting * fix function rename * fix weapon.mainhand slot call for loot command * keep pneuma order intact when restoring an orb * fix congealed shard data * implement lib_player_motion - adds the player motion library as a namespaced and versioned GM4 library with proper call function tags * implement custom version of player motion - basically a fork that is renamespaced, version-checked, and uses the GM4 forceloaded chunk - licensing might not be correct in the release download * fix ooa to use proper player motion version * prevent wither rose particle from generating on obsidian * update random position to use random command and macro * Move original player motion license to main license * properly remove rose particle markers * properly kill striding markers * make items fire resistant * fix withering pneuma * fix expeditious * fix soaring * actually fix soaring - no longer need to look up for the first no-gravity - picking up or dropping items no longer resets the no-gravity - first sneak when equipping will activate the no-gravity * Fix shield models being invisible * Sunken treasure chests and metallurgy elytra * Fix "missing particle texture" warning in block models * Fix metallurgy RP * Fix guidebook RP by removing spawn_egg texture reference in font * Update heart canisters guidebook * 1.21.5 hc and ooa guidebook text (#1135) * update heart cansisters guidebook * update ooa guidebook * Update beet to v0.110.1 --------- Co-authored-by: SpecialBuilder <[email protected]> Co-authored-by: EpyonProjects <[email protected]> Co-authored-by: runcows <[email protected]> Co-authored-by: runcows <[email protected]> Co-authored-by: BPR <[email protected]> Co-authored-by: Thanathor <[email protected]> Co-authored-by: Bloo <[email protected]>
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.
Currently, Metallurgy shamir lore takes up 3 lines
This update removes that standalone "Shamir" line to only use 2 lines
This change is part of the larger Metallurgy redesign.
Existing items will not have " Shamir" appended to the end, but will function the same. This also means old unattached bands will not be stackable with shamirs created after this update.