diff --git a/data/lzstools/advancement/visible/chisel_diamond.json b/data/lzstools/advancement/visible/chisel_diamond.json index d61d825..ef0dce1 100644 --- a/data/lzstools/advancement/visible/chisel_diamond.json +++ b/data/lzstools/advancement/visible/chisel_diamond.json @@ -25,7 +25,7 @@ "": { "trigger": "minecraft:recipe_crafted", "conditions": { - "recipe_id": "lzstools_chisel:diamond" + "recipes": "lzstools_chisel:diamond" } } } diff --git a/data/lzstools/advancement/visible/chisel_iron.json b/data/lzstools/advancement/visible/chisel_iron.json index 99f8fd9..98e3bf7 100644 --- a/data/lzstools/advancement/visible/chisel_iron.json +++ b/data/lzstools/advancement/visible/chisel_iron.json @@ -25,7 +25,7 @@ "": { "trigger": "minecraft:recipe_crafted", "conditions": { - "recipe_id": "lzstools_chisel:iron" + "recipes": "lzstools_chisel:iron" } } } diff --git a/data/lzstools/advancement/visible/hammer.json b/data/lzstools/advancement/visible/hammer.json index eb5ec49..f47a400 100644 --- a/data/lzstools/advancement/visible/hammer.json +++ b/data/lzstools/advancement/visible/hammer.json @@ -25,7 +25,7 @@ "": { "trigger": "minecraft:recipe_crafted", "conditions": { - "recipe_id": "lzstools_hammer:hammer" + "recipes": "lzstools_hammer:hammer" } } } diff --git a/data/lzstools/advancement/visible/trowel_diamond.json b/data/lzstools/advancement/visible/trowel_diamond.json index 45eea26..dfa1ef3 100644 --- a/data/lzstools/advancement/visible/trowel_diamond.json +++ b/data/lzstools/advancement/visible/trowel_diamond.json @@ -25,7 +25,7 @@ "": { "trigger": "minecraft:recipe_crafted", "conditions": { - "recipe_id": "lzstools_trowel:diamond" + "recipes": "lzstools_trowel:diamond" } } } diff --git a/data/lzstools/advancement/visible/trowel_iron.json b/data/lzstools/advancement/visible/trowel_iron.json index fab173b..eed2631 100644 --- a/data/lzstools/advancement/visible/trowel_iron.json +++ b/data/lzstools/advancement/visible/trowel_iron.json @@ -25,7 +25,7 @@ "": { "trigger": "minecraft:recipe_crafted", "conditions": { - "recipe_id": "lzstools_trowel:iron" + "recipes": "lzstools_trowel:iron" } } } diff --git a/data/lzstools/advancement/visible/wrench.json b/data/lzstools/advancement/visible/wrench.json index aa95580..486862d 100644 --- a/data/lzstools/advancement/visible/wrench.json +++ b/data/lzstools/advancement/visible/wrench.json @@ -25,7 +25,7 @@ "": { "trigger": "minecraft:recipe_crafted", "conditions": { - "recipe_id": "lzstools_wrench:wrench" + "recipes": "lzstools_wrench:wrench" } } } diff --git a/data/lzstools/predicate/chisel/mainhand.json b/data/lzstools/predicate/chisel/mainhand.json index ba00385..b2b25db 100644 --- a/data/lzstools/predicate/chisel/mainhand.json +++ b/data/lzstools/predicate/chisel/mainhand.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools/predicate/hammer/mainhand.json b/data/lzstools/predicate/hammer/mainhand.json index aacc7d3..cfa685c 100644 --- a/data/lzstools/predicate/hammer/mainhand.json +++ b/data/lzstools/predicate/hammer/mainhand.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools/predicate/trowel/mainhand.json b/data/lzstools/predicate/trowel/mainhand.json index d6b22a0..8c3803c 100644 --- a/data/lzstools/predicate/trowel/mainhand.json +++ b/data/lzstools/predicate/trowel/mainhand.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools/predicate/trowel/offhand.json b/data/lzstools/predicate/trowel/offhand.json index e02967b..1c1f8c7 100644 --- a/data/lzstools/predicate/trowel/offhand.json +++ b/data/lzstools/predicate/trowel/offhand.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools/predicate/unbreaking/mainhand/1.json b/data/lzstools/predicate/unbreaking/mainhand/1.json index 7a6a828..ca625e4 100644 --- a/data/lzstools/predicate/unbreaking/mainhand/1.json +++ b/data/lzstools/predicate/unbreaking/mainhand/1.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools/predicate/unbreaking/mainhand/2.json b/data/lzstools/predicate/unbreaking/mainhand/2.json index 141c622..c3e720f 100644 --- a/data/lzstools/predicate/unbreaking/mainhand/2.json +++ b/data/lzstools/predicate/unbreaking/mainhand/2.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools/predicate/unbreaking/mainhand/3.json b/data/lzstools/predicate/unbreaking/mainhand/3.json index caf34a3..c40f24d 100644 --- a/data/lzstools/predicate/unbreaking/mainhand/3.json +++ b/data/lzstools/predicate/unbreaking/mainhand/3.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools/predicate/unbreaking/mainhand/all.json b/data/lzstools/predicate/unbreaking/mainhand/all.json index a08a685..c71b1ea 100644 --- a/data/lzstools/predicate/unbreaking/mainhand/all.json +++ b/data/lzstools/predicate/unbreaking/mainhand/all.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools/predicate/unbreaking/offhand/1.json b/data/lzstools/predicate/unbreaking/offhand/1.json index 4417b73..0e220bf 100644 --- a/data/lzstools/predicate/unbreaking/offhand/1.json +++ b/data/lzstools/predicate/unbreaking/offhand/1.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools/predicate/unbreaking/offhand/2.json b/data/lzstools/predicate/unbreaking/offhand/2.json index b976f9f..2b5edc0 100644 --- a/data/lzstools/predicate/unbreaking/offhand/2.json +++ b/data/lzstools/predicate/unbreaking/offhand/2.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools/predicate/unbreaking/offhand/3.json b/data/lzstools/predicate/unbreaking/offhand/3.json index ca476b6..16a2bc3 100644 --- a/data/lzstools/predicate/unbreaking/offhand/3.json +++ b/data/lzstools/predicate/unbreaking/offhand/3.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools/predicate/unbreaking/offhand/all.json b/data/lzstools/predicate/unbreaking/offhand/all.json index 5f858b1..dae1e4e 100644 --- a/data/lzstools/predicate/unbreaking/offhand/all.json +++ b/data/lzstools/predicate/unbreaking/offhand/all.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools/predicate/waterlogged.json b/data/lzstools/predicate/waterlogged.json index 592cc98..0ec3b18 100644 --- a/data/lzstools/predicate/waterlogged.json +++ b/data/lzstools/predicate/waterlogged.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:location_check", + "type": "minecraft:location_check", "predicate": { "fluid": { "fluids": "#minecraft:water" diff --git a/data/lzstools/predicate/wrench/mainhand.json b/data/lzstools/predicate/wrench/mainhand.json index d6dbd86..ce06e87 100644 --- a/data/lzstools/predicate/wrench/mainhand.json +++ b/data/lzstools/predicate/wrench/mainhand.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools/predicate/wrench/offhand.json b/data/lzstools/predicate/wrench/offhand.json index 36184dc..1a889bb 100644 --- a/data/lzstools/predicate/wrench/offhand.json +++ b/data/lzstools/predicate/wrench/offhand.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools_chisel/predicate/mainhand/diamond.json b/data/lzstools_chisel/predicate/mainhand/diamond.json index 1fee009..ea84da5 100644 --- a/data/lzstools_chisel/predicate/mainhand/diamond.json +++ b/data/lzstools_chisel/predicate/mainhand/diamond.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools_chisel/predicate/mainhand/iron.json b/data/lzstools_chisel/predicate/mainhand/iron.json index 88c1177..308efdd 100644 --- a/data/lzstools_chisel/predicate/mainhand/iron.json +++ b/data/lzstools_chisel/predicate/mainhand/iron.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools_hammer/predicate/hammer.json b/data/lzstools_hammer/predicate/hammer.json index aacc7d3..cfa685c 100644 --- a/data/lzstools_hammer/predicate/hammer.json +++ b/data/lzstools_hammer/predicate/hammer.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools_trowel/predicate/mainhand/diamond.json b/data/lzstools_trowel/predicate/mainhand/diamond.json index fc053bb..0787ae4 100644 --- a/data/lzstools_trowel/predicate/mainhand/diamond.json +++ b/data/lzstools_trowel/predicate/mainhand/diamond.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools_trowel/predicate/mainhand/iron.json b/data/lzstools_trowel/predicate/mainhand/iron.json index 0974fac..159c035 100644 --- a/data/lzstools_trowel/predicate/mainhand/iron.json +++ b/data/lzstools_trowel/predicate/mainhand/iron.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools_trowel/predicate/offhand/diamond.json b/data/lzstools_trowel/predicate/offhand/diamond.json index 64a24b3..7f87ed7 100644 --- a/data/lzstools_trowel/predicate/offhand/diamond.json +++ b/data/lzstools_trowel/predicate/offhand/diamond.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools_trowel/predicate/offhand/iron.json b/data/lzstools_trowel/predicate/offhand/iron.json index 9e68e1b..ba4398f 100644 --- a/data/lzstools_trowel/predicate/offhand/iron.json +++ b/data/lzstools_trowel/predicate/offhand/iron.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:entity_properties", + "type": "minecraft:entity_properties", "entity": "this", "predicate": { "equipment": { diff --git a/data/lzstools_wrench/item_modifier/default.json b/data/lzstools_wrench/item_modifier/default.json index 3aa2684..053662f 100644 --- a/data/lzstools_wrench/item_modifier/default.json +++ b/data/lzstools_wrench/item_modifier/default.json @@ -1,6 +1,6 @@ [ { - "function": "minecraft:set_lore", + "type": "minecraft:set_lore", "entity": "this", "lore": [ { @@ -10,7 +10,7 @@ "mode": "replace_all" }, { - "function": "minecraft:set_custom_model_data", + "type": "minecraft:set_custom_model_data", "strings": { "values": [ "lzstools:wrench_default" diff --git a/data/lzstools_wrench/item_modifier/face_click.json b/data/lzstools_wrench/item_modifier/face_click.json index 00be285..0ec3ba3 100644 --- a/data/lzstools_wrench/item_modifier/face_click.json +++ b/data/lzstools_wrench/item_modifier/face_click.json @@ -1,6 +1,6 @@ [ { - "function": "minecraft:set_lore", + "type": "minecraft:set_lore", "entity": "this", "lore": [ { @@ -10,7 +10,7 @@ "mode": "replace_all" }, { - "function": "minecraft:set_custom_model_data", + "type": "minecraft:set_custom_model_data", "strings": { "values": [ "lzstools:wrench_face_click" diff --git a/data/lzstools_wrench/item_modifier/face_player.json b/data/lzstools_wrench/item_modifier/face_player.json index a744213..6cdf9ca 100644 --- a/data/lzstools_wrench/item_modifier/face_player.json +++ b/data/lzstools_wrench/item_modifier/face_player.json @@ -1,6 +1,6 @@ [ { - "function": "minecraft:set_lore", + "type": "minecraft:set_lore", "entity": "this", "lore": [ { @@ -10,7 +10,7 @@ "mode": "replace_all" }, { - "function": "minecraft:set_custom_model_data", + "type": "minecraft:set_custom_model_data", "strings": { "values": [ "lzstools:wrench_face_player" diff --git a/data/lzstools_wrench/item_modifier/flip.json b/data/lzstools_wrench/item_modifier/flip.json index be50331..f89c92b 100644 --- a/data/lzstools_wrench/item_modifier/flip.json +++ b/data/lzstools_wrench/item_modifier/flip.json @@ -1,6 +1,6 @@ [ { - "function": "minecraft:set_lore", + "type": "minecraft:set_lore", "entity": "this", "lore": [ { @@ -10,7 +10,7 @@ "mode": "replace_all" }, { - "function": "minecraft:set_custom_model_data", + "type": "minecraft:set_custom_model_data", "strings": { "values": [ "lzstools:wrench_flip" diff --git a/data/lzstools_wrench/item_modifier/terracotta_east.json b/data/lzstools_wrench/item_modifier/terracotta_east.json index b783e28..0f5bbf2 100644 --- a/data/lzstools_wrench/item_modifier/terracotta_east.json +++ b/data/lzstools_wrench/item_modifier/terracotta_east.json @@ -1,6 +1,6 @@ [ { - "function": "minecraft:set_lore", + "type": "minecraft:set_lore", "entity": "this", "lore": [ { @@ -13,7 +13,7 @@ "mode": "replace_all" }, { - "function": "minecraft:set_custom_model_data", + "type": "minecraft:set_custom_model_data", "strings": { "values": [ "lzstools:wrench_terracotta" diff --git a/data/lzstools_wrench/item_modifier/terracotta_north.json b/data/lzstools_wrench/item_modifier/terracotta_north.json index 8eacd38..708de24 100644 --- a/data/lzstools_wrench/item_modifier/terracotta_north.json +++ b/data/lzstools_wrench/item_modifier/terracotta_north.json @@ -1,6 +1,6 @@ [ { - "function": "minecraft:set_lore", + "type": "minecraft:set_lore", "entity": "this", "lore": [ { @@ -13,7 +13,7 @@ "mode": "replace_all" }, { - "function": "minecraft:set_custom_model_data", + "type": "minecraft:set_custom_model_data", "strings": { "values": [ "lzstools:wrench_terracotta" diff --git a/data/lzstools_wrench/item_modifier/terracotta_south.json b/data/lzstools_wrench/item_modifier/terracotta_south.json index 27f8662..f45da54 100644 --- a/data/lzstools_wrench/item_modifier/terracotta_south.json +++ b/data/lzstools_wrench/item_modifier/terracotta_south.json @@ -1,6 +1,6 @@ [ { - "function": "minecraft:set_lore", + "type": "minecraft:set_lore", "entity": "this", "lore": [ { @@ -13,7 +13,7 @@ "mode": "replace_all" }, { - "function": "minecraft:set_custom_model_data", + "type": "minecraft:set_custom_model_data", "strings": { "values": [ "lzstools:wrench_terracotta" diff --git a/data/lzstools_wrench/item_modifier/terracotta_west.json b/data/lzstools_wrench/item_modifier/terracotta_west.json index c303926..620c536 100644 --- a/data/lzstools_wrench/item_modifier/terracotta_west.json +++ b/data/lzstools_wrench/item_modifier/terracotta_west.json @@ -1,6 +1,6 @@ [ { - "function": "minecraft:set_lore", + "type": "minecraft:set_lore", "entity": "this", "lore": [ { @@ -13,7 +13,7 @@ "mode": "replace_all" }, { - "function": "minecraft:set_custom_model_data", + "type": "minecraft:set_custom_model_data", "strings": { "values": [ "lzstools:wrench_terracotta" diff --git a/pack.mcmeta b/pack.mcmeta index b43e336..d5da232 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,7 +1,7 @@ { "pack": { - "min_format": [107, 1], - "max_format": [107, 1], + "min_format": [121, 0], + "max_format": [121, 0], "description": "LZs Tools: Useful tools for vanilla Minecraft" } } \ No newline at end of file