diff --git a/addon/anthrax_cat_BP/entities/anthrax_cat.json b/addon/anthrax_cat_BP/entities/anthrax_cat.json index dbb96ae..de6f222 100644 --- a/addon/anthrax_cat_BP/entities/anthrax_cat.json +++ b/addon/anthrax_cat_BP/entities/anthrax_cat.json @@ -12,9 +12,13 @@ "minecraft:interact": { "interactions": [ { + "on_interact": { + "filters": { "test": "is_family", "subject": "other", "value": "player" }, + "event": "silverlabs:interacted", + "target": "self" + }, "interact_text": "action.interact.fortune", - "play_sounds": "note.bell", - "event": "silverlabs:interacted" + "play_sounds": "note.bell" } ] } diff --git a/addon/anthrax_cat_BP/items/anthrax_cat.json b/addon/anthrax_cat_BP/items/anthrax_cat.json index 6a0e47d..bf82794 100644 --- a/addon/anthrax_cat_BP/items/anthrax_cat.json +++ b/addon/anthrax_cat_BP/items/anthrax_cat.json @@ -10,9 +10,7 @@ }, "components": { "minecraft:max_stack_size": 16, - "minecraft:icon": { - "texture": "anthrax_cat" - }, + "minecraft:icon": "anthrax_cat", "minecraft:entity_placer": { "entity": "silverlabs:anthrax_cat" } diff --git a/addon/heyhe_pet_BP/items/heyhe_egg.json b/addon/heyhe_pet_BP/items/heyhe_egg.json index ef80685..e41f20a 100644 --- a/addon/heyhe_pet_BP/items/heyhe_egg.json +++ b/addon/heyhe_pet_BP/items/heyhe_egg.json @@ -3,13 +3,11 @@ "minecraft:item": { "description": { "identifier": "silverlabs:heyhe_egg", - "category": "Nature" + "menu_category": { "category": "nature" } }, "components": { "minecraft:max_stack_size": 16, - "minecraft:icon": { - "texture": "heyhe_egg" - }, + "minecraft:icon": "heyhe_egg", "minecraft:entity_placer": { "entity": "silverlabs:heyhe_egg", "dispense_on": [ diff --git a/addon/spark_pet_BP/entities/spark_dragon.json b/addon/spark_pet_BP/entities/spark_dragon.json index ad43dce..787a5a7 100644 --- a/addon/spark_pet_BP/entities/spark_dragon.json +++ b/addon/spark_pet_BP/entities/spark_dragon.json @@ -190,15 +190,14 @@ "reselect_targets": true }, "minecraft:entity_sensor": { - "sensor_range": 500, - "relative_range": false, - "minimum_count": 1, - "event_filters": { - "test": "is_family", - "subject": "other", - "value": "whistle_signal" - }, - "event": "silverlabs:whistle_called" + "subsensors": [ + { + "range": [500, 500], + "minimum_count": 1, + "event": "silverlabs:whistle_called", + "event_filters": { "test": "is_family", "subject": "other", "value": "whistle_signal" } + } + ] }, "minecraft:behavior.melee_attack": { "priority": 2, diff --git a/addon/spark_pet_BP/recipes/dragon_basket.json b/addon/spark_pet_BP/recipes/dragon_basket.json index 65df0f5..2434eea 100644 --- a/addon/spark_pet_BP/recipes/dragon_basket.json +++ b/addon/spark_pet_BP/recipes/dragon_basket.json @@ -4,6 +4,7 @@ "description": { "identifier": "silverlabs:dragon_basket_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "pattern": [ "S S", diff --git a/addon/spark_pet_BP/recipes/dragon_egg.json b/addon/spark_pet_BP/recipes/dragon_egg.json index 8704d18..f45160a 100644 --- a/addon/spark_pet_BP/recipes/dragon_egg.json +++ b/addon/spark_pet_BP/recipes/dragon_egg.json @@ -4,6 +4,7 @@ "description": { "identifier": "silverlabs:dragon_egg" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "pattern": [ " B ", diff --git a/addon/spark_pet_BP/recipes/dragon_egg_crimson.json b/addon/spark_pet_BP/recipes/dragon_egg_crimson.json index 8521ece..c4156f7 100644 --- a/addon/spark_pet_BP/recipes/dragon_egg_crimson.json +++ b/addon/spark_pet_BP/recipes/dragon_egg_crimson.json @@ -2,6 +2,7 @@ "format_version": "1.21.0", "minecraft:recipe_shapeless": { "description": { "identifier": "silverlabs:dragon_egg_crimson_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "ingredients": [ { "item": "silverlabs:dragon_egg" }, diff --git a/addon/spark_pet_BP/recipes/dragon_egg_jungle.json b/addon/spark_pet_BP/recipes/dragon_egg_jungle.json index d49d262..73f81ec 100644 --- a/addon/spark_pet_BP/recipes/dragon_egg_jungle.json +++ b/addon/spark_pet_BP/recipes/dragon_egg_jungle.json @@ -2,6 +2,7 @@ "format_version": "1.21.0", "minecraft:recipe_shapeless": { "description": { "identifier": "silverlabs:dragon_egg_jungle_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "ingredients": [ { "item": "silverlabs:dragon_egg" }, diff --git a/addon/spark_pet_BP/recipes/dragon_egg_oak.json b/addon/spark_pet_BP/recipes/dragon_egg_oak.json index dc7d792..8909145 100644 --- a/addon/spark_pet_BP/recipes/dragon_egg_oak.json +++ b/addon/spark_pet_BP/recipes/dragon_egg_oak.json @@ -2,6 +2,7 @@ "format_version": "1.21.0", "minecraft:recipe_shapeless": { "description": { "identifier": "silverlabs:dragon_egg_oak_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "ingredients": [ { "item": "silverlabs:dragon_egg" }, diff --git a/addon/spark_pet_BP/recipes/dragon_egg_obsidian.json b/addon/spark_pet_BP/recipes/dragon_egg_obsidian.json index 7350d3b..f92ae8e 100644 --- a/addon/spark_pet_BP/recipes/dragon_egg_obsidian.json +++ b/addon/spark_pet_BP/recipes/dragon_egg_obsidian.json @@ -2,6 +2,7 @@ "format_version": "1.21.0", "minecraft:recipe_shapeless": { "description": { "identifier": "silverlabs:dragon_egg_obsidian_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "ingredients": [ { "item": "silverlabs:dragon_egg" }, diff --git a/addon/spark_pet_BP/recipes/dragon_egg_spruce.json b/addon/spark_pet_BP/recipes/dragon_egg_spruce.json index d9b707d..805f01d 100644 --- a/addon/spark_pet_BP/recipes/dragon_egg_spruce.json +++ b/addon/spark_pet_BP/recipes/dragon_egg_spruce.json @@ -2,6 +2,7 @@ "format_version": "1.21.0", "minecraft:recipe_shapeless": { "description": { "identifier": "silverlabs:dragon_egg_spruce_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "ingredients": [ { "item": "silverlabs:dragon_egg" }, diff --git a/addon/spark_pet_BP/recipes/dragon_egg_warped.json b/addon/spark_pet_BP/recipes/dragon_egg_warped.json index b49c894..5e2d491 100644 --- a/addon/spark_pet_BP/recipes/dragon_egg_warped.json +++ b/addon/spark_pet_BP/recipes/dragon_egg_warped.json @@ -2,6 +2,7 @@ "format_version": "1.21.0", "minecraft:recipe_shapeless": { "description": { "identifier": "silverlabs:dragon_egg_warped_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "ingredients": [ { "item": "silverlabs:dragon_egg" }, diff --git a/addon/spark_pet_BP/recipes/dragon_nest_crimson.json b/addon/spark_pet_BP/recipes/dragon_nest_crimson.json index ba2d9a6..26bd2ed 100644 --- a/addon/spark_pet_BP/recipes/dragon_nest_crimson.json +++ b/addon/spark_pet_BP/recipes/dragon_nest_crimson.json @@ -2,6 +2,7 @@ "format_version": "1.21.0", "minecraft:recipe_shaped": { "description": { "identifier": "silverlabs:dragon_nest_crimson_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "pattern": [ "S S", diff --git a/addon/spark_pet_BP/recipes/dragon_nest_jungle.json b/addon/spark_pet_BP/recipes/dragon_nest_jungle.json index 6206fc1..91cab29 100644 --- a/addon/spark_pet_BP/recipes/dragon_nest_jungle.json +++ b/addon/spark_pet_BP/recipes/dragon_nest_jungle.json @@ -2,6 +2,7 @@ "format_version": "1.21.0", "minecraft:recipe_shaped": { "description": { "identifier": "silverlabs:dragon_nest_jungle_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "pattern": [ "S S", diff --git a/addon/spark_pet_BP/recipes/dragon_nest_oak.json b/addon/spark_pet_BP/recipes/dragon_nest_oak.json index 6eb6c75..4c843bb 100644 --- a/addon/spark_pet_BP/recipes/dragon_nest_oak.json +++ b/addon/spark_pet_BP/recipes/dragon_nest_oak.json @@ -2,6 +2,7 @@ "format_version": "1.21.0", "minecraft:recipe_shaped": { "description": { "identifier": "silverlabs:dragon_nest_oak_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "pattern": [ "S S", diff --git a/addon/spark_pet_BP/recipes/dragon_nest_obsidian.json b/addon/spark_pet_BP/recipes/dragon_nest_obsidian.json index 82e49a2..5fc786d 100644 --- a/addon/spark_pet_BP/recipes/dragon_nest_obsidian.json +++ b/addon/spark_pet_BP/recipes/dragon_nest_obsidian.json @@ -2,6 +2,7 @@ "format_version": "1.21.0", "minecraft:recipe_shaped": { "description": { "identifier": "silverlabs:dragon_nest_obsidian_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "pattern": [ "O O", diff --git a/addon/spark_pet_BP/recipes/dragon_nest_spruce.json b/addon/spark_pet_BP/recipes/dragon_nest_spruce.json index 50b11d1..b2893c5 100644 --- a/addon/spark_pet_BP/recipes/dragon_nest_spruce.json +++ b/addon/spark_pet_BP/recipes/dragon_nest_spruce.json @@ -2,6 +2,7 @@ "format_version": "1.21.0", "minecraft:recipe_shaped": { "description": { "identifier": "silverlabs:dragon_nest_spruce_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "pattern": [ "S S", diff --git a/addon/spark_pet_BP/recipes/dragon_nest_warped.json b/addon/spark_pet_BP/recipes/dragon_nest_warped.json index a0f8165..e0ab60d 100644 --- a/addon/spark_pet_BP/recipes/dragon_nest_warped.json +++ b/addon/spark_pet_BP/recipes/dragon_nest_warped.json @@ -2,6 +2,7 @@ "format_version": "1.21.0", "minecraft:recipe_shaped": { "description": { "identifier": "silverlabs:dragon_nest_warped_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "pattern": [ "S S", diff --git a/addon/spark_pet_BP/recipes/dragon_toy.json b/addon/spark_pet_BP/recipes/dragon_toy.json index f03b6f9..ca8fd04 100644 --- a/addon/spark_pet_BP/recipes/dragon_toy.json +++ b/addon/spark_pet_BP/recipes/dragon_toy.json @@ -4,6 +4,7 @@ "description": { "identifier": "silverlabs:dragon_toy" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "pattern": [ " S ", diff --git a/lobby-addon/lobby_transfer_BP/recipes/portal_frame.json b/lobby-addon/lobby_transfer_BP/recipes/portal_frame.json index f9dfc30..11f130f 100644 --- a/lobby-addon/lobby_transfer_BP/recipes/portal_frame.json +++ b/lobby-addon/lobby_transfer_BP/recipes/portal_frame.json @@ -4,6 +4,7 @@ "description": { "identifier": "silverlabs:portal_frame_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "pattern": [ " O ", diff --git a/lobby-addon/lobby_transfer_BP/recipes/portal_jamie.json b/lobby-addon/lobby_transfer_BP/recipes/portal_jamie.json index 66cdb7a..da1823a 100644 --- a/lobby-addon/lobby_transfer_BP/recipes/portal_jamie.json +++ b/lobby-addon/lobby_transfer_BP/recipes/portal_jamie.json @@ -4,6 +4,7 @@ "description": { "identifier": "silverlabs:portal_jamie_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "ingredients": [ { "item": "silverlabs:portal_frame" }, diff --git a/lobby-addon/lobby_transfer_BP/recipes/portal_lyla.json b/lobby-addon/lobby_transfer_BP/recipes/portal_lyla.json index 1e22313..198c060 100644 --- a/lobby-addon/lobby_transfer_BP/recipes/portal_lyla.json +++ b/lobby-addon/lobby_transfer_BP/recipes/portal_lyla.json @@ -4,6 +4,7 @@ "description": { "identifier": "silverlabs:portal_lyla_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "ingredients": [ { "item": "silverlabs:portal_frame" }, diff --git a/lobby-addon/lobby_transfer_BP/recipes/portal_mya.json b/lobby-addon/lobby_transfer_BP/recipes/portal_mya.json index 65fefbe..13902e7 100644 --- a/lobby-addon/lobby_transfer_BP/recipes/portal_mya.json +++ b/lobby-addon/lobby_transfer_BP/recipes/portal_mya.json @@ -4,6 +4,7 @@ "description": { "identifier": "silverlabs:portal_mya_recipe" }, + "unlock": { "context": "always_unlocked" }, "tags": ["crafting_table"], "ingredients": [ { "item": "silverlabs:portal_frame" }, diff --git a/postal-service-addon/postal_service_BP/blocks/mailbox.json b/postal-service-addon/postal_service_BP/blocks/mailbox.json index 4a7a3ca..67521c8 100644 --- a/postal-service-addon/postal_service_BP/blocks/mailbox.json +++ b/postal-service-addon/postal_service_BP/blocks/mailbox.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.0", + "format_version": "1.21.60", "minecraft:block": { "description": { "identifier": "silverlabs:mailbox", diff --git a/smart-crafting-addon/smart_crafting_BP/blocks/smart_crafting_table.json b/smart-crafting-addon/smart_crafting_BP/blocks/smart_crafting_table.json index 448bcea..ebb5628 100644 --- a/smart-crafting-addon/smart_crafting_BP/blocks/smart_crafting_table.json +++ b/smart-crafting-addon/smart_crafting_BP/blocks/smart_crafting_table.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.0", + "format_version": "1.21.60", "minecraft:block": { "description": { "identifier": "silverlabs:smart_crafting_table",