diff --git a/gm4_animi_shamir/data/gm4_animi_shamir/loot_table/band.json b/gm4_animi_shamir/data/gm4_animi_shamir/loot_table/band.json index 33a2115ddc..49088c8df8 100644 --- a/gm4_animi_shamir/data/gm4_animi_shamir/loot_table/band.json +++ b/gm4_animi_shamir/data/gm4_animi_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.animi", - "fallback": "Animi", + "fallback": "Animi Shamir", "italic": false, "color": "gray" } diff --git a/gm4_animi_shamir/translations.csv b/gm4_animi_shamir/translations.csv index a6c00c28e9..dd6d1d4a0e 100644 --- a/gm4_animi_shamir/translations.csv +++ b/gm4_animi_shamir/translations.csv @@ -1,5 +1,5 @@ key,en_us -item.gm4.shamir.animi,Animi +item.gm4.shamir.animi,Animi Shamir text.gm4.guidebook.module_desc.animi_shamir,Adds the Animi Shamir to Metallurgy. Items with Animi will respawn with you when you die! text.gm4.guidebook.animi_shamir.description,Animi allows items to return to their owner upon death. text.gm4.guidebook.animi_shamir.usage,"The Animi Shamir is found on Curie's Bismium Bands. It can be placed onto tools, armour, weapons, and elytra.\n\nAnimi items do not drop when the owner dies, instead appearing in their inventory upon respawning." diff --git a/gm4_audere_shamir/data/gm4_audere_shamir/loot_table/band.json b/gm4_audere_shamir/data/gm4_audere_shamir/loot_table/band.json index dd56cdbbb7..57ca9f122e 100644 --- a/gm4_audere_shamir/data/gm4_audere_shamir/loot_table/band.json +++ b/gm4_audere_shamir/data/gm4_audere_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.audere", - "fallback": "Audere", + "fallback": "Audere Shamir", "italic": false, "color": "gray" } diff --git a/gm4_audere_shamir/translations.csv b/gm4_audere_shamir/translations.csv index 4360cb8b79..c407ede922 100644 --- a/gm4_audere_shamir/translations.csv +++ b/gm4_audere_shamir/translations.csv @@ -1,5 +1,5 @@ key,en_us -item.gm4.shamir.audere,Audere +item.gm4.shamir.audere,Audere Shamir text.gm4.guidebook.module_desc.audere_shamir,Adds the shamir 'Audere' to Metallurgy. Gain Haste with low durability tools. text.gm4.guidebook.audere_shamir.description,"Audere buffs mining speed, as durability decreases." text.gm4.guidebook.audere_shamir.usage,The Audere Shamir is found on Barium Bands. It can be placed onto tools.\n\nHigher levels of Haste are awarded for lower durability (percentage-based).\n\nThe maximum level of Haste is IV. diff --git a/gm4_desire_lines/data/gm4_celaro_shamir/loot_table/band.json b/gm4_desire_lines/data/gm4_celaro_shamir/loot_table/band.json index 664dbae2dc..0b54fd9289 100644 --- a/gm4_desire_lines/data/gm4_celaro_shamir/loot_table/band.json +++ b/gm4_desire_lines/data/gm4_celaro_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.celaro", - "fallback": "Celaro", + "fallback": "Celaro Shamir", "italic": false, "color": "gray" } diff --git a/gm4_desire_lines/translations.csv b/gm4_desire_lines/translations.csv index 4f987ba5d3..4a14d62e16 100644 --- a/gm4_desire_lines/translations.csv +++ b/gm4_desire_lines/translations.csv @@ -1,5 +1,5 @@ key,en_us -item.gm4.shamir.celaro,Celaro +item.gm4.shamir.celaro,Celaro Shamir advancement.gm4.desire_lines.walk_8000.title,And I Would Walk 500 Chunks... advancement.gm4.desire_lines.walk_8000.description,Ruin 8000 blocks to coarse dirt; you'll find those oak planks advancement.gm4.desire_lines.walk_10000.title,That's a Lot of Damage diff --git a/gm4_fulcio_shamir/assets/translations.csv b/gm4_fulcio_shamir/assets/translations.csv index bcfea25b73..d92e096291 100644 --- a/gm4_fulcio_shamir/assets/translations.csv +++ b/gm4_fulcio_shamir/assets/translations.csv @@ -1,5 +1,5 @@ key,en_us -item.gm4.shamir.fulcio,Fulcio +item.gm4.shamir.fulcio,Fulcio Shamir text.gm4.guidebook.module_desc.fulcio_shamir,Adds the shamir 'Fulcio' to Metallurgy. It allows you to place blocks in mid-air! This also enables you to choose the orientation of blocks like logs without needing a supporting block. text.gm4.guidebook.fulcio_shamir.description,"Fulcio changes block placement. While sneaking, blocks can be placed in mid-air." text.gm4.guidebook.fulcio_shamir.usage,The Fulcio Shamir is found on Barimium Bands. It can be placed onto compasses.\n\nHolding the tool and sneaking will create a temporary space where blocks can be placed. diff --git a/gm4_fulcio_shamir/data/gm4_fulcio_shamir/loot_table/band.json b/gm4_fulcio_shamir/data/gm4_fulcio_shamir/loot_table/band.json index 24a6949090..0a3a2f98ab 100644 --- a/gm4_fulcio_shamir/data/gm4_fulcio_shamir/loot_table/band.json +++ b/gm4_fulcio_shamir/data/gm4_fulcio_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.fulcio", - "fallback": "Fulcio", + "fallback": "Fulcio Shamir", "italic": false, "color": "gray" } diff --git a/gm4_iacio_shamir/data/gm4_iacio_shamir/loot_table/band.json b/gm4_iacio_shamir/data/gm4_iacio_shamir/loot_table/band.json index 7407ff2cec..519d2840dc 100644 --- a/gm4_iacio_shamir/data/gm4_iacio_shamir/loot_table/band.json +++ b/gm4_iacio_shamir/data/gm4_iacio_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.iacio", - "fallback": "Iacio", + "fallback": "Iacio Shamir", "italic": false, "color": "gray" } diff --git a/gm4_iacio_shamir/translations.csv b/gm4_iacio_shamir/translations.csv index 44ca455eb0..a9ba81674f 100644 --- a/gm4_iacio_shamir/translations.csv +++ b/gm4_iacio_shamir/translations.csv @@ -1,5 +1,5 @@ key,en_us -item.gm4.shamir.iacio,Iacio +item.gm4.shamir.iacio,Iacio Shamir text.gm4.guidebook.module_desc.iacio_shamir,Adds the 'Iacio' shamir to Metallurgy. It lets you throw things further! Launch an Ender Pearl into orbit or simply throw your Trident exceptionally far. text.gm4.guidebook.iacio_shamir.description,Iacio strengthens the throw of projectiles and items. text.gm4.guidebook.iacio_shamir.usage,"The Iacio Shamir is found on Barium Bands. It can be placed onto chestplates.\n\nItems, Tridents, Ender Pearls, Splash and Lingering Potions, Snowballs, and Eggs will fly farther when thrown." diff --git a/gm4_lumos_shamir/assets/translations.csv b/gm4_lumos_shamir/assets/translations.csv index 82e7f52a0c..8638fdb46e 100644 --- a/gm4_lumos_shamir/assets/translations.csv +++ b/gm4_lumos_shamir/assets/translations.csv @@ -1,5 +1,5 @@ key,en_us -item.gm4.shamir.lumos,Lumos +item.gm4.shamir.lumos,Lumos Shamir text.gm4.guidebook.module_desc.lumos_shamir,Adds the shamir 'Lumos' to Metallurgy. It places torches when it is dark. text.gm4.guidebook.lumos_shamir.description,Lumos takes torches from the inventory and places them if the light level is too low. text.gm4.guidebook.lumos_shamir.usage,The Lumos Shamir is found on Curie's Bismium Bands. It can be placed onto pickaxes and shovels.\n\nHolding the tool will cause torches to be placed when standing in low light levels. diff --git a/gm4_lumos_shamir/data/gm4_lumos_shamir/loot_table/band.json b/gm4_lumos_shamir/data/gm4_lumos_shamir/loot_table/band.json index d1155f5345..8ff5a0c994 100644 --- a/gm4_lumos_shamir/data/gm4_lumos_shamir/loot_table/band.json +++ b/gm4_lumos_shamir/data/gm4_lumos_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.lumos", - "fallback": "Lumos", + "fallback": "Lumos Shamir", "italic": false, "color": "gray" } diff --git a/gm4_metallurgy/assets/translations.csv b/gm4_metallurgy/assets/translations.csv index df7a279f50..ea910394e0 100644 --- a/gm4_metallurgy/assets/translations.csv +++ b/gm4_metallurgy/assets/translations.csv @@ -16,26 +16,26 @@ item.gm4.metallurgy.obsidian_cast,Obsidian Cast item.gm4.metallurgy.shamir,Shamir item.gm4.metallurgy.thorianite_lump,Thorianite Lump item.gm4.metallurgy.thorium,Thorium -item.gm4.shamir.arborenda,Arborenda -item.gm4.shamir.defuse,Defuse -item.gm4.shamir.ender_bolt,Ender Bolt -item.gm4.shamir.forterra,Forterra -item.gm4.shamir.gemini,Gemini -item.gm4.shamir.hypexperia,Hypexperia -item.gm4.shamir.moneo,Moneo -item.gm4.shamir.musical,Musical -item.gm4.shamir.sensus,Sensus -item.gm4.shamir.tinker,Tinker +item.gm4.shamir.arborenda,Arborenda Shamir +item.gm4.shamir.defuse,Defuse Shamir +item.gm4.shamir.ender_bolt,Ender Bolt Shamir +item.gm4.shamir.forterra,Forterra Shamir +item.gm4.shamir.gemini,Gemini Shamir +item.gm4.shamir.hypexperia,Hypexperia Shamir +item.gm4.shamir.moneo,Moneo Shamir +item.gm4.shamir.musical,Musical Shamir +item.gm4.shamir.sensus,Sensus Shamir +item.gm4.shamir.tinker,Tinker Shamir item.gm4.slightly_damaged_obsidian,Slightly Damaged Obsidian item.gm4.slightly_overheated_obsidian,Slightly Overheated Obsidian text.gm4.metallurgy.aluminium,Aluminium text.gm4.metallurgy.barium,Barium text.gm4.metallurgy.contains,Contains text.gm4.metallurgy.thorium,Thorium -item.gm4.shamir.vibro,Vibro +item.gm4.shamir.vibro,Vibro Shamir text.gm4.metallurgy.copper,Copper item.gm4.metallurgy.malachite_lump,Malachite Lump -item.gm4.shamir.infinitas,Infinitas +item.gm4.shamir.infinitas,Infinitas Shamir item.gm4.metallurgy.curies_bismium,Curie's Bismium item.gm4.metallurgy.bismuth.red,B item.gm4.metallurgy.bismuth.orange,i diff --git a/gm4_metallurgy/data/gm4_arborenda_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_arborenda_shamir/loot_table/band.json index e89471ab3a..c8a8f99d5d 100644 --- a/gm4_metallurgy/data/gm4_arborenda_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_arborenda_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.arborenda", - "fallback": "Arborenda", + "fallback": "Arborenda Shamir", "italic": false, "color": "gray" } diff --git a/gm4_metallurgy/data/gm4_defuse_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_defuse_shamir/loot_table/band.json index e6699e7c3f..248c8915ca 100644 --- a/gm4_metallurgy/data/gm4_defuse_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_defuse_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.defuse", - "fallback": "Defuse", + "fallback": "Defuse Shamir", "italic": false, "color": "gray" } diff --git a/gm4_metallurgy/data/gm4_ender_bolt_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_ender_bolt_shamir/loot_table/band.json index a54efb5a88..70693cdfb8 100644 --- a/gm4_metallurgy/data/gm4_ender_bolt_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_ender_bolt_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.ender_bolt", - "fallback": "Ender Bolt", + "fallback": "Ender Bolt Shamir", "italic": false, "color": "gray" } diff --git a/gm4_metallurgy/data/gm4_forterra_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_forterra_shamir/loot_table/band.json index 05f2f63b17..fc4d91f8e7 100644 --- a/gm4_metallurgy/data/gm4_forterra_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_forterra_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.forterra", - "fallback": "Forterra", + "fallback": "Forterra Shamir", "italic": false, "color": "gray" } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_gemini_shamir/loot_table/band.json index 25f691a30f..77672b5ec7 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.gemini", - "fallback": "Gemini", + "fallback": "Gemini Shamir", "italic": false, "color": "gray" } diff --git a/gm4_metallurgy/data/gm4_hypexperia_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_hypexperia_shamir/loot_table/band.json index 55942781df..331bad4662 100644 --- a/gm4_metallurgy/data/gm4_hypexperia_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_hypexperia_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.hypexperia", - "fallback": "Hypexperia", + "fallback": "Hypexperia Shamir", "italic": false, "color": "gray" } diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/item_modifier/restore_shamir.json b/gm4_metallurgy/data/gm4_infinitas_shamir/item_modifier/restore_shamir.json index 7daa17446b..828edb3bee 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/item_modifier/restore_shamir.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/item_modifier/restore_shamir.json @@ -26,15 +26,9 @@ "italic": false, "color": "#467A1B" }, - { - "translate": "item.gm4.metallurgy.shamir", - "fallback": "Shamir", - "italic": false, - "color": "aqua" - }, { "translate": "item.gm4.shamir.infinitas", - "fallback": "Infinitas", + "fallback": "Infinitas Shamir", "italic": false, "color": "gray" } diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_infinitas_shamir/loot_table/band.json index aeff5972e6..ca77625fb9 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.infinitas", - "fallback": "Infinitas", + "fallback": "Infinitas Shamir", "italic": false, "color": "gray" } diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/test/check_unsmoosh_after_use.mcfunction b/gm4_metallurgy/data/gm4_infinitas_shamir/test/check_unsmoosh_after_use.mcfunction index d18026a3c4..3ef8160d05 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/test/check_unsmoosh_after_use.mcfunction +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/test/check_unsmoosh_after_use.mcfunction @@ -33,4 +33,3 @@ setblock ~1 ~4 ~1 redstone_block await items entity @e[type=item,distance=..6] contents minecraft:player_head[custom_data~{gm4_metallurgy:{stored_shamir:"infinitas"}}] execute as @e[type=item,distance=..6] if items entity @s contents minecraft:player_head unless data entity @s Item.components."minecraft:custom_data".gm4_metallurgy.stored_shamir run fail "Unsmooshed shamir did not properly transfer shamir to cast" -execute as @e[type=item,distance=..6] if items entity @s contents minecraft:player_head unless data entity @s Item.components."minecraft:lore"[2] run fail "Unsmooshed shamir is missing the lore line containing the shamir name" diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/check.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/check.mcfunction index 4755f320e8..acee015ec1 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/check.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/check.mcfunction @@ -1,8 +1,10 @@ +# @s = item being crushed by a piston that has a shamir +# run from smooshing/prepare_transfer #check whether the other item is an obsidian block -scoreboard players set valid_obsidian gm4_ml_data 0 -execute as @e[type=item,dx=0,predicate=gm4_metallurgy:is_obsidian,limit=1] run function gm4_metallurgy:smooshing/remove_band/found_obsidian +scoreboard players set $valid_obsidian gm4_ml_data 0 +execute if entity @e[type=item,dx=0,predicate=gm4_metallurgy:is_obsidian,limit=1] run function gm4_metallurgy:smooshing/remove_band/found_obsidian #if both custom model data tags are the same, then we can delete it execute store success score custom_model_data gm4_ml_data run data modify entity @s Item.components."minecraft:custom_data".gm4_metallurgy.custom_model_data set from entity @s Item.components."minecraft:custom_model_data" -execute if score valid_obsidian gm4_ml_data matches 1 run function gm4_metallurgy:smooshing/remove_band/clear_data +execute if score $valid_obsidian gm4_ml_data matches 1 run function gm4_metallurgy:smooshing/remove_band/clear_data diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/clear_data.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/clear_data.mcfunction index 19a3921c9a..4d28d04732 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/clear_data.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/clear_data.mcfunction @@ -2,12 +2,34 @@ # run from smooshing/remove_band/check execute if score custom_model_data gm4_ml_data matches 0 run data remove entity @s Item.components."minecraft:custom_model_data" +# Line 8 only clears custom data, while max stack size is its own component +execute if items entity @s contents *[custom_data~{gm4_metallurgy:{active_shamir:"infinitas"}}] run data remove entity @s Item.components."minecraft:max_stack_size" data remove entity @s Item.components."minecraft:custom_data".gm4_metallurgy +execute if items entity @s contents *[custom_data={}] run data remove entity @s Item.components."minecraft:custom_data" # use lib_lore to remove the correct lines of lore data modify storage gm4_lore:temp Source set from entity @s Item.components."minecraft:lore" -## NOTE: gm4_lore:temp Target is still "Shamir" from finish_item -scoreboard players set $start gm4_lore -1 -scoreboard players set $extra gm4_lore 2 +# check legacy Metallurgy lore +data modify storage gm4_lore:temp Target set value '{"color":"aqua","fallback":"Shamir","italic":false,"translate":"item.gm4.metallurgy.shamir"}' + +scoreboard players set $start gm4_lore 0 +function #gm4_lore:search +execute unless score $index gm4_lore matches -1 run return run function gm4_metallurgy:smooshing/remove_band/clear_legacy_lore + +# use lib_lore to remove the correct lines of lore +data modify storage gm4_lore:temp Target set from entity @s Item.components."minecraft:lore"[0] +scoreboard players set $start gm4_lore 0 +scoreboard players set $extra gm4_lore 1 function #gm4_lore:remove data modify entity @s Item.components."minecraft:lore" set from storage gm4_lore:temp Source + +## Metallurgy lore 1.21+ +# Name: Obsidian Cast +# Lore: Band +# Shamir + +## Old Metallurgy lore (pre 1.21) +# Name: Obsidian Cast +# Lore: Band +# Shamir +# diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/clear_legacy_lore.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/clear_legacy_lore.mcfunction new file mode 100644 index 0000000000..77ce0a7c83 --- /dev/null +++ b/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/clear_legacy_lore.mcfunction @@ -0,0 +1,9 @@ +# @s = armor/tool with the band +# run from smooshing/remove_band/clear_data + +# use lib_lore to remove the correct lines of lore +## NOTE: gm4_lore:temp Target is still "Shamir" from clear_data search +scoreboard players set $start gm4_lore -1 +scoreboard players set $extra gm4_lore 2 +function #gm4_lore:remove +data modify entity @s Item.components."minecraft:lore" set from storage gm4_lore:temp Source diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/finish_item.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/finish_item.mcfunction deleted file mode 100644 index 5e3a72dd17..0000000000 --- a/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/finish_item.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# @s = new band item -# run from smooshing/remove_band/found_obsidian - -# use lib_lore to get the correct line of lore -## get the line after the line "Shamir" from the tool/armor piece -data modify storage gm4_lore:temp Source set from entity @e[type=item,tag=gm4_ml_source,dx=0,limit=1] Item.components."minecraft:lore" -data modify storage gm4_lore:temp Target set from entity @s Item.components."minecraft:lore"[1] -scoreboard players set $start gm4_lore 1 -function #gm4_lore:remove -## add the Shamir name to the band lore -data modify entity @s Item.components."minecraft:lore" append from storage gm4_lore:temp Dump[] - -data modify entity @s Item.components."minecraft:custom_data".gm4_metallurgy.stored_shamir set from entity @e[type=item,tag=gm4_ml_source,dx=0,limit=1] Item.components."minecraft:custom_data".gm4_metallurgy.active_shamir -data modify entity @s Item.components."minecraft:custom_model_data" set from entity @e[type=item,tag=gm4_ml_source,dx=0,limit=1] Item.components."minecraft:custom_data".gm4_metallurgy.custom_model_data - -tag @s add gm4_ml_smooshed diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/found_obsidian.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/found_obsidian.mcfunction index 8b7961a2d0..b86d37a3fe 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/found_obsidian.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/found_obsidian.mcfunction @@ -1,23 +1,7 @@ -# obtain metal type -execute store success score has_modern_nbt_version gm4_ml_data run data modify entity @s Item.components."minecraft:custom_data".gm4_metallurgy.metal.type set from entity @e[type=item,tag=gm4_ml_source,dx=0,limit=1] Item.components."minecraft:custom_data".gm4_metallurgy.metal.type -# obtain metal type from legacy items -execute unless score has_modern_nbt_version gm4_ml_data matches 1 run data modify entity @s Item.components."minecraft:custom_data".gm4_metallurgy.metal.type set from entity @e[type=item,tag=gm4_ml_source,dx=0,limit=1] Item.components."minecraft:custom_data".gm4_metallurgy.ore_type -scoreboard players reset has_modern_nbt_version gm4_ml_data +# @s = item being crushed by a piston that has a shamir +# run from smooshing/remove_band/check -execute if items entity @s contents *[custom_data~{gm4_metallurgy:{metal:{type:"aluminium"}}}] run loot spawn ~ ~ ~ loot gm4_metallurgy:aluminium_band -execute if items entity @s contents *[custom_data~{gm4_metallurgy:{metal:{type:"barimium"}}}] run loot spawn ~ ~ ~ loot gm4_metallurgy:barimium_band -execute if items entity @s contents *[custom_data~{gm4_metallurgy:{metal:{type:"barium"}}}] run loot spawn ~ ~ ~ loot gm4_metallurgy:barium_band -execute if items entity @s contents *[custom_data~{gm4_metallurgy:{metal:{type:"bismuth"}}}] run loot spawn ~ ~ ~ loot gm4_metallurgy:bismuth_band -execute if items entity @s contents *[custom_data~{gm4_metallurgy:{metal:{type:"copper"}}}] run loot spawn ~ ~ ~ loot gm4_metallurgy:bismuth_band -execute if items entity @s contents *[custom_data~{gm4_metallurgy:{metal:{type:"curies_bismium"}}}] run loot spawn ~ ~ ~ loot gm4_metallurgy:curies_bismium_band -execute if items entity @s contents *[custom_data~{gm4_metallurgy:{metal:{type:"thorium_brass"}}}] run loot spawn ~ ~ ~ loot gm4_metallurgy:curies_bismium_band -execute if items entity @s contents *[custom_data~{gm4_metallurgy:{metal:{type:"thorium"}}}] run loot spawn ~ ~ ~ loot gm4_metallurgy:thorium_band - -execute as @e[type=item,tag=!gm4_ml_smooshed,distance=0,limit=1] run function gm4_metallurgy:smooshing/remove_band/finish_item - -scoreboard players set valid_obsidian gm4_ml_data 1 - -kill @s[type=item] +function gm4_metallurgy:smooshing/remove_band/spawn_band with entity @s Item.components."minecraft:custom_data".gm4_metallurgy # use anvil durability function gm4_metallurgy:smooshing/anvil/use diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/spawn_band.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/spawn_band.mcfunction new file mode 100644 index 0000000000..0a9af05604 --- /dev/null +++ b/gm4_metallurgy/data/gm4_metallurgy/function/smooshing/remove_band/spawn_band.mcfunction @@ -0,0 +1,5 @@ +$execute store result score $valid_obsidian gm4_ml_data run loot spawn ~ ~ ~ loot gm4_$(active_shamir)_shamir:band + +tag @n[type=item,nbt={Age:0s}] add gm4_ml_smooshed + +kill @e[type=item,dx=0,predicate=gm4_metallurgy:is_obsidian,limit=1] diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/aluminium_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/aluminium_band.json index b4466c234a..811e7a9d59 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/aluminium_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/aluminium_band.json @@ -40,12 +40,6 @@ ], "italic": false, "color": "#F47989" - }, - { - "translate": "item.gm4.metallurgy.shamir", - "fallback": "Shamir", - "italic": false, - "color": "aqua" } ] } diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/barimium_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/barimium_band.json index caef3b6e7e..2658c100c7 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/barimium_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/barimium_band.json @@ -40,12 +40,6 @@ ], "italic": false, "color": "#D18A8A" - }, - { - "translate": "item.gm4.metallurgy.shamir", - "fallback": "Shamir", - "italic": false, - "color": "aqua" } ] } diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/barium_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/barium_band.json index 3a9e2edfda..1d23678cb5 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/barium_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/barium_band.json @@ -40,12 +40,6 @@ ], "italic": false, "color": "#F0EAD6" - }, - { - "translate": "item.gm4.metallurgy.shamir", - "fallback": "Shamir", - "italic": false, - "color": "aqua" } ] } diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/bismuth_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/bismuth_band.json index 7d114518d4..dd5f2f602f 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/bismuth_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/bismuth_band.json @@ -72,13 +72,7 @@ "italic": false, "color": "#D579F5" } - ], - { - "translate": "item.gm4.metallurgy.shamir", - "fallback": "Shamir", - "italic": false, - "color": "aqua" - } + ] ] } ] diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/copper_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/copper_band.json index 3728cab07b..51518e6b2e 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/copper_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/copper_band.json @@ -40,12 +40,6 @@ ], "italic": false, "color": "gold" - }, - { - "translate": "item.gm4.metallurgy.shamir", - "fallback": "Shamir", - "italic": false, - "color": "aqua" } ] } diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/curies_bismium_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/curies_bismium_band.json index d517204d16..efe7dedea5 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/curies_bismium_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/curies_bismium_band.json @@ -40,12 +40,6 @@ ], "italic": false, "color": "#467A1B" - }, - { - "translate": "item.gm4.metallurgy.shamir", - "fallback": "Shamir", - "italic": false, - "color": "aqua" } ] } diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_band.json index 391161fcde..3679f6a46a 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_band.json @@ -40,12 +40,6 @@ ], "italic": false, "color": "#767676" - }, - { - "translate": "item.gm4.metallurgy.shamir", - "fallback": "Shamir", - "italic": false, - "color": "aqua" } ] } diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_brass_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_brass_band.json index 858cfc6c30..76f87225ca 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_brass_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_brass_band.json @@ -40,12 +40,6 @@ ], "italic": false, "color": "dark_green" - }, - { - "translate": "item.gm4.metallurgy.shamir", - "fallback": "Shamir", - "italic": false, - "color": "aqua" } ] } diff --git a/gm4_metallurgy/data/gm4_moneo_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_moneo_shamir/loot_table/band.json index c5ec9e3da8..fe10f565d8 100644 --- a/gm4_metallurgy/data/gm4_moneo_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_moneo_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.moneo", - "fallback": "Moneo", + "fallback": "Moneo Shamir", "italic": false, "color": "gray" } diff --git a/gm4_metallurgy/data/gm4_musical_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_musical_shamir/loot_table/band.json index 7ec5b60d48..1cc531328c 100644 --- a/gm4_metallurgy/data/gm4_musical_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_musical_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.musical", - "fallback": "Musical", + "fallback": "Musical Shamir", "italic": false, "color": "gray" } diff --git a/gm4_metallurgy/data/gm4_sensus_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_sensus_shamir/loot_table/band.json index 96c72b4836..50fc9713a7 100644 --- a/gm4_metallurgy/data/gm4_sensus_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_sensus_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.sensus", - "fallback": "Sensus", + "fallback": "Sensus Shamir", "italic": false, "color": "gray" } diff --git a/gm4_metallurgy/data/gm4_tinker_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_tinker_shamir/loot_table/band.json index 48614dff23..1dde91865c 100644 --- a/gm4_metallurgy/data/gm4_tinker_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_tinker_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.tinker", - "fallback": "Tinker", + "fallback": "Tinker Shamir", "italic": false, "color": "gray" } diff --git a/gm4_metallurgy/data/gm4_vibro_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_vibro_shamir/loot_table/band.json index 545281c659..2c24d8f498 100644 --- a/gm4_metallurgy/data/gm4_vibro_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_vibro_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.vibro", - "fallback": "Vibro", + "fallback": "Vibro Shamir", "italic": false, "color": "gray" } diff --git a/gm4_orb_of_ankou/assets/translations.csv b/gm4_orb_of_ankou/assets/translations.csv index d8d0d74d3f..bdebb61999 100644 --- a/gm4_orb_of_ankou/assets/translations.csv +++ b/gm4_orb_of_ankou/assets/translations.csv @@ -19,7 +19,7 @@ entity.gm4.severed_soul,Severed Soul\u00A7 entity.gm4.wandering_tear,Wandering Tear\u00A7 entity.gm4.withering_magic,Withering Magic item.gm4.orb_of_ankou,Orb of Ankou -item.gm4.shamir.corripio,Corripio +item.gm4.shamir.corripio,Corripio Shamir item.gm4.soul_essence,Soul Essence item.gm4.soul_shard,Soul Shard text.gm4.orb_of_ankou.empty,Empty diff --git a/gm4_orb_of_ankou/data/gm4_corripio_shamir/loot_table/band.json b/gm4_orb_of_ankou/data/gm4_corripio_shamir/loot_table/band.json index d4b3884172..fb5f403783 100644 --- a/gm4_orb_of_ankou/data/gm4_corripio_shamir/loot_table/band.json +++ b/gm4_orb_of_ankou/data/gm4_corripio_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.corripio", - "fallback": "Corripio", + "fallback": "Corripio Shamir", "italic": false, "color": "gray" } diff --git a/gm4_percurro_shamir/assets/translations.csv b/gm4_percurro_shamir/assets/translations.csv index fdb40f40c2..6501f8ba45 100644 --- a/gm4_percurro_shamir/assets/translations.csv +++ b/gm4_percurro_shamir/assets/translations.csv @@ -1,5 +1,5 @@ key,en_us -item.gm4.shamir.percurro,Percurro +item.gm4.shamir.percurro,Percurro Shamir text.gm4.guidebook.module_desc.percurro_shamir,Adds the 'Percurro' Shamir to Metallurgy! Weapons with Percurro let you teleport past your enemies in the blink of an eye! text.gm4.guidebook.percurro_shamir.description,Percurro teleports the user behind their target when attacking. text.gm4.guidebook.percurro_shamir.usage,"The Percurro Shamir is found on Curie's Bismium Bands. It can be placed onto swords, axes, and tridents.\n\nAttacking a mob teleports the user up to 6 blocks behind the target, turning to face the target." diff --git a/gm4_percurro_shamir/data/gm4_percurro_shamir/loot_table/band.json b/gm4_percurro_shamir/data/gm4_percurro_shamir/loot_table/band.json index 50913305f3..2b3cf6ad8a 100644 --- a/gm4_percurro_shamir/data/gm4_percurro_shamir/loot_table/band.json +++ b/gm4_percurro_shamir/data/gm4_percurro_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.percurro", - "fallback": "Percurro", + "fallback": "Percurro Shamir", "italic": false, "color": "gray" } diff --git a/gm4_vecto_shamir/data/gm4_vecto_shamir/loot_table/band.json b/gm4_vecto_shamir/data/gm4_vecto_shamir/loot_table/band.json index 07ae396274..732fd1e358 100644 --- a/gm4_vecto_shamir/data/gm4_vecto_shamir/loot_table/band.json +++ b/gm4_vecto_shamir/data/gm4_vecto_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.vecto", - "fallback": "Vecto", + "fallback": "Vecto Shamir", "italic": false, "color": "gray" } diff --git a/gm4_vecto_shamir/translations.csv b/gm4_vecto_shamir/translations.csv index 2ef2e95438..35dcc7f586 100644 --- a/gm4_vecto_shamir/translations.csv +++ b/gm4_vecto_shamir/translations.csv @@ -1,5 +1,5 @@ key,en_us -item.gm4.shamir.vecto,Vecto +item.gm4.shamir.vecto,Vecto Shamir text.gm4.guidebook.module_desc.vecto_shamir,"Adds the 'Vecto' Shamir to Metallury. Summon a Boat or Minecart out of thin air when in need, no more wasting an inventory slot!" text.gm4.guidebook.vecto_shamir.description,Vecto creates temporary boats and minecarts for easy travel. text.gm4.guidebook.vecto_shamir.usage,"The Vecto Shamir is found on Bismuth Bands. It can be placed onto boots.\n\nSneak on top of water, ice, or rails to summon a temporary boat or minecart.\nThis vehicle disappears once the owner is not nearby." diff --git a/gm4_vigere_shamir/data/gm4_vigere_shamir/loot_table/band.json b/gm4_vigere_shamir/data/gm4_vigere_shamir/loot_table/band.json index 292b279f78..f310322bc2 100644 --- a/gm4_vigere_shamir/data/gm4_vigere_shamir/loot_table/band.json +++ b/gm4_vigere_shamir/data/gm4_vigere_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.vigere", - "fallback": "Vigere", + "fallback": "Vigere Shamir", "italic": false, "color": "gray" } diff --git a/gm4_vigere_shamir/translations.csv b/gm4_vigere_shamir/translations.csv index aa85f53920..c966673e87 100644 --- a/gm4_vigere_shamir/translations.csv +++ b/gm4_vigere_shamir/translations.csv @@ -1,5 +1,5 @@ key,en_us -item.gm4.shamir.vigere,Vigere +item.gm4.shamir.vigere,Vigere Shamir text.gm4.guidebook.module_desc.vigere_shamir,Adds the shamir 'Vigere' to Metallurgy. It heals you when you block with a shield. text.gm4.guidebook.vigere_shamir.description,Vigere alters shields to heal the user upon blocking an attack. text.gm4.guidebook.vigere_shamir.usage,The Vigere Shamir is found on Barimium Bands. It can be placed onto shields.\n\nBlocking an attack will heal the user 1.5 hearts and apply Mining Fatigue VI for 3 seconds.\nHealing damages the shield more. diff --git a/gm4_weighted_armour/assets/translations.csv b/gm4_weighted_armour/assets/translations.csv index c0642e0fb0..168454d3fd 100644 --- a/gm4_weighted_armour/assets/translations.csv +++ b/gm4_weighted_armour/assets/translations.csv @@ -1,5 +1,5 @@ key,en_us -item.gm4.shamir.helious,Helious +item.gm4.shamir.helious,Helious Shamir text.gm4.guidebook.module_desc.helious_shamir,"Perfect for UHCs, this module forces you to balance protection with speed." text.gm4.guidebook.helious_shamir.description,"Helious hinders weighted armour, allowing users to wear more armour without slowing down." text.gm4.guidebook.helious_shamir.usage,The Helious Shamir is found on Aluminium Bands. It can be placed onto armour.\n\nEach Helious piece will reduce weighted armour by one slowness level. Too little of weight will cause levitation and wither effects. diff --git a/gm4_weighted_armour/data/gm4_helious_shamir/loot_table/band.json b/gm4_weighted_armour/data/gm4_helious_shamir/loot_table/band.json index 3cda3c2bbd..44139c383e 100644 --- a/gm4_weighted_armour/data/gm4_helious_shamir/loot_table/band.json +++ b/gm4_weighted_armour/data/gm4_helious_shamir/loot_table/band.json @@ -23,7 +23,7 @@ "lore": [ { "translate": "item.gm4.shamir.helious", - "fallback": "Helious", + "fallback": "Helious Shamir", "italic": false, "color": "gray" }