Closed misode closed 3 months ago
Preview download for testing: https://github.com/Gamemode4Dev/GM4_Datapacks/actions/runs/9099290404/artifacts/1505990608
Continued from #978
Initial steps:
Fixing JSON resource load errors:
minecraft:scute
minecraft:turtle_scute
"biome"
"structure"
"biomes"
"structures"
("type": ?"(?:minecraft:)?loot_table",\n\s+(?:"weight": \d+,\n\s+)?)"name"
$1"value"
gm4_end_fishing:gameplay/fish/scattered_treasure
gm4_end_fishing:gameplay/fish/valuables
replace
lore.json
copy.json
update_sips.json
,\n\s+"replace": (false|true)
("function": "(?:minecraft:)?set_lore",(\n\s+))
$1"mode": "append",$2
append
replace_all
("block": \{\n\s+)"tag": "([a-z])
$1"blocks": "#$2
("fluid": \{\n\s+)"tag": "([a-z])
$1"fluids": "#$2
("(?:mainhand|offhand|head|chest|legs|feet)": \{\n\s+)"tag": "([a-z])
$1"items": "#$2
"tag": "[a-z]
"tag"
"blocks"
has_beam.json
"addition"
"add_value"
"multiply_base"
"add_multiplied_base"
"multiply" ->
"potion"
\n(\s+)"enchantments": \[\n(\s+)\{\n(\s+)"enchantment": "([a-z_:]+)"\n(\s+)\}\n(\s+)\]
\n$1"predicates": {\n$2"minecraft:enchantments": [\n$2 {\n$3 "enchantment": "$4"\n$5 }\n$6 ]\n$1}
\n(\s+)"enchantments": \[\n(\s+)\{\n(\s+)"enchantment": "([a-z_:]+)",\n(\s+)"levels": (\d+)\n(\s+)\}\n(\s+)\]
\n$1"predicates": {\n$2"minecraft:enchantments": [\n$2 {\n$3 "enchantment": "$4",\n$5 "levels": $6\n$7 }\n$8 ]\n$1}
"enchantments": \[\n\s+\{
"durability"
"icon": \{\n(\s+)"item"
"icon": {\n$1"id"
minecraft:sweeping
minecraft:sweeping_edge
set_nbt
set_nbt",\n(\s+)"tag": "\{StoredEnchantments:\[\{lvl:(\d+)s,id:\\"([a-z_:]+)\\"\}\]\}"
set_components",\n$1"components": {\n$1 "minecraft:stored_enchantments": {\n$1 "$3": $2\n$1 }\n$1}
set_nbt",\n(\s+)"tag": "\{CustomModelData:'([a-z0-9_/]+)'\}"
set_components",\n$1"components": {\n$1 "minecraft:custom_model_data": "$2"\n$1}
copy_nbt
Fixing mcfunction files:
(attribute .*) add$
$1 add_value
(attribute .*) multiply_base$
$1 add_multiplied_base
(attribute .*) multiply$
$1 add_multiplied_total
Count:(\d+)b?
count:$1
\.Count
.count
(^particle| run particle) (minecraft:)?(block|block_marker|falling_dust|dust_pillar) (minecraft:)?([a-z0-9_:]+)
$1 minecraft:$3{block_state:"minecraft:$5"}
(^particle| run particle) (minecraft:)?(dust) ([\d.]+) ([\d.]+) ([\d.]+) ([\d.]+)
$1 minecraft:$3{color:[$4,$5,$6],scale:$7}
(^particle| run particle) (minecraft:)?(entity_effect) ([\d~^.-]+ [\d~^.-]+ [\d~^.-]+) ([\d.]+) ([\d.]+) ([\d.]+)
$1 minecraft:$3{color:[$5,$6,$7,$8]} $4 0 0 0 $8
(^particle| run particle) (minecraft:)?(dust_color_transition|sculk_charge|vibration|shriek)
\.tag|tag\.|tag:\{
gm4_trapped_signs.json
gm4_recipes
lingering_bottle_of_lightning.json
Particle
RadiusOnUse
spore.json
malachite_lump.json
new_skis
place_down
charged_projectiles
shoot_crossbow
Preview download for testing: https://github.com/Gamemode4Dev/GM4_Datapacks/actions/runs/9099290404/artifacts/1505990608
Continued from #978
Steps taken
Initial steps:
Fixing JSON resource load errors:
minecraft:scute
->minecraft:turtle_scute
"biome"
and"structure"
->"biomes"
and"structures"
("type": ?"(?:minecraft:)?loot_table",\n\s+(?:"weight": \d+,\n\s+)?)"name"
->$1"value"
gm4_end_fishing:gameplay/fish/scattered_treasure
andgm4_end_fishing:gameplay/fish/valuables
manuallyreplace
true cases in fileslore.json
,copy.json
andupdate_sips.json
,\n\s+"replace": (false|true)
-> (empty replacement)("function": "(?:minecraft:)?set_lore",(\n\s+))
->$1"mode": "append",$2
append
->replace_all
("block": \{\n\s+)"tag": "([a-z])
->$1"blocks": "#$2
("fluid": \{\n\s+)"tag": "([a-z])
->$1"fluids": "#$2
("(?:mainhand|offhand|head|chest|legs|feet)": \{\n\s+)"tag": "([a-z])
->$1"items": "#$2
"tag": "[a-z]
and manually fix the 3 item predicates in advancements + 1 in match tool predicate"tag"
->"blocks"
inhas_beam.json
"addition"
->"add_value"
"multiply_base"
->"add_multiplied_base"
"multiply" ->
"add_multiplied_total"` (doesn't appear in our repo)"potion"
and fix the 2 cases manually\n(\s+)"enchantments": \[\n(\s+)\{\n(\s+)"enchantment": "([a-z_:]+)"\n(\s+)\}\n(\s+)\]
->\n$1"predicates": {\n$2"minecraft:enchantments": [\n$2 {\n$3 "enchantment": "$4"\n$5 }\n$6 ]\n$1}
\n(\s+)"enchantments": \[\n(\s+)\{\n(\s+)"enchantment": "([a-z_:]+)",\n(\s+)"levels": (\d+)\n(\s+)\}\n(\s+)\]
->\n$1"predicates": {\n$2"minecraft:enchantments": [\n$2 {\n$3 "enchantment": "$4",\n$5 "levels": $6\n$7 }\n$8 ]\n$1}
"enchantments": \[\n\s+\{
and fix the remaining 10 cases manually"durability"
, we don't have any in our repo"icon": \{\n(\s+)"item"
->"icon": {\n$1"id"
minecraft:sweeping
->minecraft:sweeping_edge
set_nbt
set_nbt",\n(\s+)"tag": "\{StoredEnchantments:\[\{lvl:(\d+)s,id:\\"([a-z_:]+)\\"\}\]\}"
->set_components",\n$1"components": {\n$1 "minecraft:stored_enchantments": {\n$1 "$3": $2\n$1 }\n$1}
set_nbt",\n(\s+)"tag": "\{CustomModelData:'([a-z0-9_/]+)'\}"
->set_components",\n$1"components": {\n$1 "minecraft:custom_model_data": "$2"\n$1}
copy_nbt
TODOFixing mcfunction files:
(attribute .*) add$
->$1 add_value
(attribute .*) multiply_base$
->$1 add_multiplied_base
(attribute .*) multiply$
->$1 add_multiplied_total
Count:(\d+)b?
->count:$1
\.Count
->.count
(^particle| run particle) (minecraft:)?(block|block_marker|falling_dust|dust_pillar) (minecraft:)?([a-z0-9_:]+)
->$1 minecraft:$3{block_state:"minecraft:$5"}
(^particle| run particle) (minecraft:)?(dust) ([\d.]+) ([\d.]+) ([\d.]+) ([\d.]+)
->$1 minecraft:$3{color:[$4,$5,$6],scale:$7}
(^particle| run particle) (minecraft:)?(entity_effect) ([\d~^.-]+ [\d~^.-]+ [\d~^.-]+) ([\d.]+) ([\d.]+) ([\d.]+)
->$1 minecraft:$3{color:[$5,$6,$7,$8]} $4 0 0 0 $8
(^particle| run particle) (minecraft:)?(dust_color_transition|sculk_charge|vibration|shriek)
\.tag|tag\.|tag:\{
Issues found while updating
gm4_trapped_signs.json
needs to be moved into agm4_recipes
folderlingering_bottle_of_lightning.json
tried to set tagsParticle
andRadiusOnUse
, were these ever applied?spore.json
andmalachite_lump.json
use raw custom model datanew_skis
used the existing data of the first iron nugget, instead of the iron bootsplace_down
uses raw custom model dataNotes
charged_projectiles
componentshoot_crossbow
advancement no longer works with multishotPossible feature changes