From 2697fa1d9f4e58c2d720f8b810553550a151bb0a Mon Sep 17 00:00:00 2001 From: SysAdmin Date: Wed, 25 Mar 2026 03:56:42 +0000 Subject: [PATCH] fix(spark_pet): egg auto-hatch, repeated spawning, taming, despawn, and nest selection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove auto-advance timers from egg cold (180s) and warming (120s) stages so eggs only progress via player interaction (bonemeal → blaze powder) - Remove fire/lava damage sensors from cold and warming stages to prevent fire-tick re-triggering advance_to_hatching on every tick (caused dragon spam) - Shorten egg hatching despawn timer from 60-90s to 3s so egg disappears promptly after dragon spawns - Fix taming: change tame_items "fish" → "cod" (pre-1.13 ID was broken; only salmon worked before) - Change egg colour recipes from egg+nest_item to egg+dye (simpler UX): white_dye=white, brown_dye=brown, lime_dye=green, red_dye=red, cyan_dye=teal, black_dye=black - Increase nest block selection_box height from 5px to 14px to match visible basket geometry so right-click entity_placer works on nest blocks Co-Authored-By: Claude Sonnet 4.6 --- .../blocks/dragon_nest_crimson.json | 2 +- .../blocks/dragon_nest_jungle.json | 2 +- .../spark_pet_BP/blocks/dragon_nest_oak.json | 2 +- .../blocks/dragon_nest_obsidian.json | 2 +- .../blocks/dragon_nest_spruce.json | 2 +- .../blocks/dragon_nest_warped.json | 2 +- addon/spark_pet_BP/entities/dragon_egg.json | 69 +++---------------- .../entities/dragon_egg_color_0.json | 34 ++------- .../entities/dragon_egg_color_1.json | 30 ++------ .../entities/dragon_egg_color_2.json | 34 ++------- .../entities/dragon_egg_color_3.json | 34 ++------- .../entities/dragon_egg_color_4.json | 34 ++------- .../entities/dragon_egg_color_5.json | 34 ++------- addon/spark_pet_BP/entities/spark_dragon.json | 2 +- .../recipes/dragon_egg_crimson.json | 2 +- .../recipes/dragon_egg_jungle.json | 2 +- .../spark_pet_BP/recipes/dragon_egg_oak.json | 2 +- .../recipes/dragon_egg_obsidian.json | 2 +- .../recipes/dragon_egg_spruce.json | 2 +- .../recipes/dragon_egg_warped.json | 2 +- 20 files changed, 62 insertions(+), 233 deletions(-) diff --git a/addon/spark_pet_BP/blocks/dragon_nest_crimson.json b/addon/spark_pet_BP/blocks/dragon_nest_crimson.json index 6defb5d..6222691 100644 --- a/addon/spark_pet_BP/blocks/dragon_nest_crimson.json +++ b/addon/spark_pet_BP/blocks/dragon_nest_crimson.json @@ -11,7 +11,7 @@ "*": { "texture": "dragon_nest_crimson", "render_method": "alpha_test" } }, "minecraft:collision_box": { "origin": [-7, 0, -7], "size": [14, 5, 14] }, - "minecraft:selection_box": { "origin": [-7, 0, -7], "size": [14, 5, 14] }, + "minecraft:selection_box": { "origin": [-7, 0, -7], "size": [14, 14, 14] }, "minecraft:destructible_by_mining": { "seconds_to_destroy": 1.0 }, "minecraft:destructible_by_explosion": { "explosion_resistance": 2.0 }, "minecraft:map_color": "#9B2323" diff --git a/addon/spark_pet_BP/blocks/dragon_nest_jungle.json b/addon/spark_pet_BP/blocks/dragon_nest_jungle.json index 0b85d5f..d23dc72 100644 --- a/addon/spark_pet_BP/blocks/dragon_nest_jungle.json +++ b/addon/spark_pet_BP/blocks/dragon_nest_jungle.json @@ -11,7 +11,7 @@ "*": { "texture": "dragon_nest_jungle", "render_method": "alpha_test" } }, "minecraft:collision_box": { "origin": [-7, 0, -7], "size": [14, 5, 14] }, - "minecraft:selection_box": { "origin": [-7, 0, -7], "size": [14, 5, 14] }, + "minecraft:selection_box": { "origin": [-7, 0, -7], "size": [14, 14, 14] }, "minecraft:destructible_by_mining": { "seconds_to_destroy": 1.0 }, "minecraft:destructible_by_explosion": { "explosion_resistance": 2.0 }, "minecraft:map_color": "#5A8A3C" diff --git a/addon/spark_pet_BP/blocks/dragon_nest_oak.json b/addon/spark_pet_BP/blocks/dragon_nest_oak.json index e562303..3f7d069 100644 --- a/addon/spark_pet_BP/blocks/dragon_nest_oak.json +++ b/addon/spark_pet_BP/blocks/dragon_nest_oak.json @@ -11,7 +11,7 @@ "*": { "texture": "dragon_nest_oak", "render_method": "alpha_test" } }, "minecraft:collision_box": { "origin": [-7, 0, -7], "size": [14, 5, 14] }, - "minecraft:selection_box": { "origin": [-7, 0, -7], "size": [14, 5, 14] }, + "minecraft:selection_box": { "origin": [-7, 0, -7], "size": [14, 14, 14] }, "minecraft:destructible_by_mining": { "seconds_to_destroy": 1.0 }, "minecraft:destructible_by_explosion": { "explosion_resistance": 2.0 }, "minecraft:map_color": "#C8A87A" diff --git a/addon/spark_pet_BP/blocks/dragon_nest_obsidian.json b/addon/spark_pet_BP/blocks/dragon_nest_obsidian.json index 2b365fb..7965969 100644 --- a/addon/spark_pet_BP/blocks/dragon_nest_obsidian.json +++ b/addon/spark_pet_BP/blocks/dragon_nest_obsidian.json @@ -11,7 +11,7 @@ "*": { "texture": "dragon_nest_obsidian", "render_method": "alpha_test" } }, "minecraft:collision_box": { "origin": [-7, 0, -7], "size": [14, 5, 14] }, - "minecraft:selection_box": { "origin": [-7, 0, -7], "size": [14, 5, 14] }, + "minecraft:selection_box": { "origin": [-7, 0, -7], "size": [14, 14, 14] }, "minecraft:destructible_by_mining": { "seconds_to_destroy": 3.0 }, "minecraft:destructible_by_explosion": { "explosion_resistance": 6.0 }, "minecraft:map_color": "#1A1022" diff --git a/addon/spark_pet_BP/blocks/dragon_nest_spruce.json b/addon/spark_pet_BP/blocks/dragon_nest_spruce.json index 7092a4b..5680ee6 100644 --- a/addon/spark_pet_BP/blocks/dragon_nest_spruce.json +++ b/addon/spark_pet_BP/blocks/dragon_nest_spruce.json @@ -11,7 +11,7 @@ "*": { "texture": "dragon_nest_spruce", "render_method": "alpha_test" } }, "minecraft:collision_box": { "origin": [-7, 0, -7], "size": [14, 5, 14] }, - "minecraft:selection_box": { "origin": [-7, 0, -7], "size": [14, 5, 14] }, + "minecraft:selection_box": { "origin": [-7, 0, -7], "size": [14, 14, 14] }, "minecraft:destructible_by_mining": { "seconds_to_destroy": 1.0 }, "minecraft:destructible_by_explosion": { "explosion_resistance": 2.0 }, "minecraft:map_color": "#7B5B3A" diff --git a/addon/spark_pet_BP/blocks/dragon_nest_warped.json b/addon/spark_pet_BP/blocks/dragon_nest_warped.json index 7bad4ba..a86e242 100644 --- a/addon/spark_pet_BP/blocks/dragon_nest_warped.json +++ b/addon/spark_pet_BP/blocks/dragon_nest_warped.json @@ -11,7 +11,7 @@ "*": { "texture": "dragon_nest_warped", "render_method": "alpha_test" } }, "minecraft:collision_box": { "origin": [-7, 0, -7], "size": [14, 5, 14] }, - "minecraft:selection_box": { "origin": [-7, 0, -7], "size": [14, 5, 14] }, + "minecraft:selection_box": { "origin": [-7, 0, -7], "size": [14, 14, 14] }, "minecraft:destructible_by_mining": { "seconds_to_destroy": 1.0 }, "minecraft:destructible_by_explosion": { "explosion_resistance": 2.0 }, "minecraft:map_color": "#2A8A7B" diff --git a/addon/spark_pet_BP/entities/dragon_egg.json b/addon/spark_pet_BP/entities/dragon_egg.json index 0594391..af501fa 100644 --- a/addon/spark_pet_BP/entities/dragon_egg.json +++ b/addon/spark_pet_BP/entities/dragon_egg.json @@ -23,21 +23,6 @@ }, "component_groups": { "silverlabs:egg_cold": { - "minecraft:damage_sensor": { - "triggers": [ - { "cause": "fire", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "fire_tick", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "lava", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "magma", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "entity_attack", "deals_damage": true }, - { "cause": "all", "deals_damage": false } - ] - }, - "minecraft:timer": { - "time": 180, - "looping": false, - "time_down_event": { "event": "silverlabs:advance_to_warming", "target": "self" } - }, "minecraft:interact": { "interactions": [ { @@ -69,21 +54,6 @@ }, "silverlabs:egg_warming": { - "minecraft:damage_sensor": { - "triggers": [ - { "cause": "fire", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "fire_tick", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "lava", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "magma", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "entity_attack", "deals_damage": true }, - { "cause": "all", "deals_damage": false } - ] - }, - "minecraft:timer": { - "time": 120, - "looping": false, - "time_down_event": { "event": "silverlabs:advance_to_hatching", "target": "self" } - }, "minecraft:interact": { "interactions": [ { @@ -132,7 +102,7 @@ ] }, "minecraft:timer": { - "time": [60, 90], + "time": 3, "looping": false, "time_down_event": { "event": "silverlabs:despawn_egg", "target": "self" } } @@ -144,37 +114,16 @@ }, "components": { - "minecraft:type_family": { - "family": ["dragon_egg"] - }, + "minecraft:type_family": { "family": ["dragon_egg"] }, "minecraft:physics": {}, - "minecraft:collision_box": { - "width": 0.5, - "height": 0.6 - }, - "minecraft:pushable": { - "is_pushable": false, - "is_pushable_by_piston": false - }, - "minecraft:knockback_resistance": { - "value": 1.0 - }, + "minecraft:collision_box": { "width": 0.5, "height": 0.6 }, + "minecraft:pushable": { "is_pushable": false, "is_pushable_by_piston": false }, + "minecraft:knockback_resistance": { "value": 1.0 }, "minecraft:persistent": {}, - "minecraft:scale": { - "value": 1.0 - }, - "minecraft:health": { - "value": 4, - "max": 4 - }, - "minecraft:loot": { - "table": "loot_tables/gameplay/egg_pickup.json" - }, - "minecraft:behavior.look_at_player": { - "priority": 7, - "look_distance": 6.0, - "probability": 0.02 - } + "minecraft:scale": { "value": 1.0 }, + "minecraft:health": { "value": 4, "max": 4 }, + "minecraft:loot": { "table": "loot_tables/gameplay/egg_pickup.json" }, + "minecraft:behavior.look_at_player": { "priority": 7, "look_distance": 6.0, "probability": 0.02 } }, "events": { diff --git a/addon/spark_pet_BP/entities/dragon_egg_color_0.json b/addon/spark_pet_BP/entities/dragon_egg_color_0.json index 33ae27b..5656a4a 100644 --- a/addon/spark_pet_BP/entities/dragon_egg_color_0.json +++ b/addon/spark_pet_BP/entities/dragon_egg_color_0.json @@ -25,27 +25,17 @@ }, "event": "silverlabs:advance_to_warming", "target": "self" }, - "use_item": true, "interact_text": "Warm with Bonemeal", "play_sounds": "block.bone_block.place" + "use_item": true, "interact_text": "Warm Egg (Bonemeal)", "play_sounds": "block.bone_block.place" }, { "on_interact": { "filters": { "all_of": [{ "test": "is_family", "subject": "other", "value": "player" }] }, "event": "", "target": "self" }, - "use_item": false, "interact_text": "The egg feels cold... (use Bonemeal)" + "use_item": false, "interact_text": "The egg glows soft white... (use Bonemeal)" } ] - }, - "minecraft:damage_sensor": { - "triggers": [ - { "cause": "fire", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "fire_tick", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "lava", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "entity_attack", "deals_damage": true }, - { "cause": "all", "deals_damage": false } - ] - }, - "minecraft:timer": { "time": 180, "looping": false, "time_down_event": { "event": "silverlabs:advance_to_warming", "target": "self" } } + } }, "silverlabs:egg_warming": { "minecraft:interact": { @@ -60,27 +50,17 @@ }, "event": "silverlabs:advance_to_hatching", "target": "self" }, - "use_item": true, "interact_text": "Ignite with Blaze Powder", "play_sounds": "fire.fire" + "use_item": true, "interact_text": "Ignite Egg (Blaze Powder)", "play_sounds": "fire.fire" }, { "on_interact": { "filters": { "all_of": [{ "test": "is_family", "subject": "other", "value": "player" }] }, "event": "", "target": "self" }, - "use_item": false, "interact_text": "The egg is warming up... (use Blaze Powder)" + "use_item": false, "interact_text": "The egg pulses with warmth... (use Blaze Powder)" } ] - }, - "minecraft:damage_sensor": { - "triggers": [ - { "cause": "fire", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "fire_tick", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "lava", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "entity_attack", "deals_damage": true }, - { "cause": "all", "deals_damage": false } - ] - }, - "minecraft:timer": { "time": 120, "looping": false, "time_down_event": { "event": "silverlabs:advance_to_hatching", "target": "self" } } + } }, "silverlabs:egg_hatching": { "minecraft:damage_sensor": { "triggers": [{ "cause": "all", "deals_damage": false }] }, @@ -93,7 +73,7 @@ "num_to_spawn": 1, "single_use": true }] }, - "minecraft:timer": { "time": [60, 90], "looping": false, "time_down_event": { "event": "silverlabs:despawn_egg", "target": "self" } } + "minecraft:timer": { "time": 3, "looping": false, "time_down_event": { "event": "silverlabs:despawn_egg", "target": "self" } } }, "silverlabs:egg_despawning": { "minecraft:instant_despawn": {} } }, diff --git a/addon/spark_pet_BP/entities/dragon_egg_color_1.json b/addon/spark_pet_BP/entities/dragon_egg_color_1.json index cdb7ba5..78229b3 100644 --- a/addon/spark_pet_BP/entities/dragon_egg_color_1.json +++ b/addon/spark_pet_BP/entities/dragon_egg_color_1.json @@ -25,7 +25,7 @@ }, "event": "silverlabs:advance_to_warming", "target": "self" }, - "use_item": true, "interact_text": "Warm with Bonemeal", "play_sounds": "block.bone_block.place" + "use_item": true, "interact_text": "Warm Egg (Bonemeal)", "play_sounds": "block.bone_block.place" }, { "on_interact": { @@ -35,17 +35,7 @@ "use_item": false, "interact_text": "The egg has a warm brown glow... (use Bonemeal)" } ] - }, - "minecraft:damage_sensor": { - "triggers": [ - { "cause": "fire", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "fire_tick", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "lava", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "entity_attack", "deals_damage": true }, - { "cause": "all", "deals_damage": false } - ] - }, - "minecraft:timer": { "time": 180, "looping": false, "time_down_event": { "event": "silverlabs:advance_to_warming", "target": "self" } } + } }, "silverlabs:egg_warming": { "minecraft:interact": { @@ -60,7 +50,7 @@ }, "event": "silverlabs:advance_to_hatching", "target": "self" }, - "use_item": true, "interact_text": "Ignite with Blaze Powder", "play_sounds": "fire.fire" + "use_item": true, "interact_text": "Ignite Egg (Blaze Powder)", "play_sounds": "fire.fire" }, { "on_interact": { @@ -70,17 +60,7 @@ "use_item": false, "interact_text": "The egg is warming to brown... (use Blaze Powder)" } ] - }, - "minecraft:damage_sensor": { - "triggers": [ - { "cause": "fire", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "fire_tick", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "lava", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "entity_attack", "deals_damage": true }, - { "cause": "all", "deals_damage": false } - ] - }, - "minecraft:timer": { "time": 120, "looping": false, "time_down_event": { "event": "silverlabs:advance_to_hatching", "target": "self" } } + } }, "silverlabs:egg_hatching": { "minecraft:damage_sensor": { "triggers": [{ "cause": "all", "deals_damage": false }] }, @@ -93,7 +73,7 @@ "num_to_spawn": 1, "single_use": true }] }, - "minecraft:timer": { "time": [60, 90], "looping": false, "time_down_event": { "event": "silverlabs:despawn_egg", "target": "self" } } + "minecraft:timer": { "time": 3, "looping": false, "time_down_event": { "event": "silverlabs:despawn_egg", "target": "self" } } }, "silverlabs:egg_despawning": { "minecraft:instant_despawn": {} } }, diff --git a/addon/spark_pet_BP/entities/dragon_egg_color_2.json b/addon/spark_pet_BP/entities/dragon_egg_color_2.json index ec9d25a..ee028d9 100644 --- a/addon/spark_pet_BP/entities/dragon_egg_color_2.json +++ b/addon/spark_pet_BP/entities/dragon_egg_color_2.json @@ -25,27 +25,17 @@ }, "event": "silverlabs:advance_to_warming", "target": "self" }, - "use_item": true, "interact_text": "Warm with Bonemeal", "play_sounds": "block.bone_block.place" + "use_item": true, "interact_text": "Warm Egg (Bonemeal)", "play_sounds": "block.bone_block.place" }, { "on_interact": { "filters": { "all_of": [{ "test": "is_family", "subject": "other", "value": "player" }] }, "event": "", "target": "self" }, - "use_item": false, "interact_text": "The egg glows with forest green... (use Bonemeal)" + "use_item": false, "interact_text": "The egg has a mossy green hue... (use Bonemeal)" } ] - }, - "minecraft:damage_sensor": { - "triggers": [ - { "cause": "fire", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "fire_tick", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "lava", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "entity_attack", "deals_damage": true }, - { "cause": "all", "deals_damage": false } - ] - }, - "minecraft:timer": { "time": 180, "looping": false, "time_down_event": { "event": "silverlabs:advance_to_warming", "target": "self" } } + } }, "silverlabs:egg_warming": { "minecraft:interact": { @@ -60,27 +50,17 @@ }, "event": "silverlabs:advance_to_hatching", "target": "self" }, - "use_item": true, "interact_text": "Ignite with Blaze Powder", "play_sounds": "fire.fire" + "use_item": true, "interact_text": "Ignite Egg (Blaze Powder)", "play_sounds": "fire.fire" }, { "on_interact": { "filters": { "all_of": [{ "test": "is_family", "subject": "other", "value": "player" }] }, "event": "", "target": "self" }, - "use_item": false, "interact_text": "The egg shimmers greener... (use Blaze Powder)" + "use_item": false, "interact_text": "The egg glows green... (use Blaze Powder)" } ] - }, - "minecraft:damage_sensor": { - "triggers": [ - { "cause": "fire", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "fire_tick", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "lava", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "entity_attack", "deals_damage": true }, - { "cause": "all", "deals_damage": false } - ] - }, - "minecraft:timer": { "time": 120, "looping": false, "time_down_event": { "event": "silverlabs:advance_to_hatching", "target": "self" } } + } }, "silverlabs:egg_hatching": { "minecraft:damage_sensor": { "triggers": [{ "cause": "all", "deals_damage": false }] }, @@ -93,7 +73,7 @@ "num_to_spawn": 1, "single_use": true }] }, - "minecraft:timer": { "time": [60, 90], "looping": false, "time_down_event": { "event": "silverlabs:despawn_egg", "target": "self" } } + "minecraft:timer": { "time": 3, "looping": false, "time_down_event": { "event": "silverlabs:despawn_egg", "target": "self" } } }, "silverlabs:egg_despawning": { "minecraft:instant_despawn": {} } }, diff --git a/addon/spark_pet_BP/entities/dragon_egg_color_3.json b/addon/spark_pet_BP/entities/dragon_egg_color_3.json index 9308bb3..16c73bb 100644 --- a/addon/spark_pet_BP/entities/dragon_egg_color_3.json +++ b/addon/spark_pet_BP/entities/dragon_egg_color_3.json @@ -25,27 +25,17 @@ }, "event": "silverlabs:advance_to_warming", "target": "self" }, - "use_item": true, "interact_text": "Warm with Bonemeal", "play_sounds": "block.bone_block.place" + "use_item": true, "interact_text": "Warm Egg (Bonemeal)", "play_sounds": "block.bone_block.place" }, { "on_interact": { "filters": { "all_of": [{ "test": "is_family", "subject": "other", "value": "player" }] }, "event": "", "target": "self" }, - "use_item": false, "interact_text": "The egg pulses deep red... (use Bonemeal)" + "use_item": false, "interact_text": "The egg shimmers crimson... (use Bonemeal)" } ] - }, - "minecraft:damage_sensor": { - "triggers": [ - { "cause": "fire", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "fire_tick", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "lava", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "entity_attack", "deals_damage": true }, - { "cause": "all", "deals_damage": false } - ] - }, - "minecraft:timer": { "time": 180, "looping": false, "time_down_event": { "event": "silverlabs:advance_to_warming", "target": "self" } } + } }, "silverlabs:egg_warming": { "minecraft:interact": { @@ -60,27 +50,17 @@ }, "event": "silverlabs:advance_to_hatching", "target": "self" }, - "use_item": true, "interact_text": "Ignite with Blaze Powder", "play_sounds": "fire.fire" + "use_item": true, "interact_text": "Ignite Egg (Blaze Powder)", "play_sounds": "fire.fire" }, { "on_interact": { "filters": { "all_of": [{ "test": "is_family", "subject": "other", "value": "player" }] }, "event": "", "target": "self" }, - "use_item": false, "interact_text": "The egg grows hotter red... (use Blaze Powder)" + "use_item": false, "interact_text": "The egg blazes red... (use Blaze Powder)" } ] - }, - "minecraft:damage_sensor": { - "triggers": [ - { "cause": "fire", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "fire_tick", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "lava", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "entity_attack", "deals_damage": true }, - { "cause": "all", "deals_damage": false } - ] - }, - "minecraft:timer": { "time": 120, "looping": false, "time_down_event": { "event": "silverlabs:advance_to_hatching", "target": "self" } } + } }, "silverlabs:egg_hatching": { "minecraft:damage_sensor": { "triggers": [{ "cause": "all", "deals_damage": false }] }, @@ -93,7 +73,7 @@ "num_to_spawn": 1, "single_use": true }] }, - "minecraft:timer": { "time": [60, 90], "looping": false, "time_down_event": { "event": "silverlabs:despawn_egg", "target": "self" } } + "minecraft:timer": { "time": 3, "looping": false, "time_down_event": { "event": "silverlabs:despawn_egg", "target": "self" } } }, "silverlabs:egg_despawning": { "minecraft:instant_despawn": {} } }, diff --git a/addon/spark_pet_BP/entities/dragon_egg_color_4.json b/addon/spark_pet_BP/entities/dragon_egg_color_4.json index a065905..7186ee5 100644 --- a/addon/spark_pet_BP/entities/dragon_egg_color_4.json +++ b/addon/spark_pet_BP/entities/dragon_egg_color_4.json @@ -25,27 +25,17 @@ }, "event": "silverlabs:advance_to_warming", "target": "self" }, - "use_item": true, "interact_text": "Warm with Bonemeal", "play_sounds": "block.bone_block.place" + "use_item": true, "interact_text": "Warm Egg (Bonemeal)", "play_sounds": "block.bone_block.place" }, { "on_interact": { "filters": { "all_of": [{ "test": "is_family", "subject": "other", "value": "player" }] }, "event": "", "target": "self" }, - "use_item": false, "interact_text": "The egg shimmers teal... (use Bonemeal)" + "use_item": false, "interact_text": "The egg glimmers teal... (use Bonemeal)" } ] - }, - "minecraft:damage_sensor": { - "triggers": [ - { "cause": "fire", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "fire_tick", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "lava", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "entity_attack", "deals_damage": true }, - { "cause": "all", "deals_damage": false } - ] - }, - "minecraft:timer": { "time": 180, "looping": false, "time_down_event": { "event": "silverlabs:advance_to_warming", "target": "self" } } + } }, "silverlabs:egg_warming": { "minecraft:interact": { @@ -60,27 +50,17 @@ }, "event": "silverlabs:advance_to_hatching", "target": "self" }, - "use_item": true, "interact_text": "Ignite with Blaze Powder", "play_sounds": "fire.fire" + "use_item": true, "interact_text": "Ignite Egg (Blaze Powder)", "play_sounds": "fire.fire" }, { "on_interact": { "filters": { "all_of": [{ "test": "is_family", "subject": "other", "value": "player" }] }, "event": "", "target": "self" }, - "use_item": false, "interact_text": "The egg glows teal bright... (use Blaze Powder)" + "use_item": false, "interact_text": "The egg radiates teal warmth... (use Blaze Powder)" } ] - }, - "minecraft:damage_sensor": { - "triggers": [ - { "cause": "fire", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "fire_tick", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "lava", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "entity_attack", "deals_damage": true }, - { "cause": "all", "deals_damage": false } - ] - }, - "minecraft:timer": { "time": 120, "looping": false, "time_down_event": { "event": "silverlabs:advance_to_hatching", "target": "self" } } + } }, "silverlabs:egg_hatching": { "minecraft:damage_sensor": { "triggers": [{ "cause": "all", "deals_damage": false }] }, @@ -93,7 +73,7 @@ "num_to_spawn": 1, "single_use": true }] }, - "minecraft:timer": { "time": [60, 90], "looping": false, "time_down_event": { "event": "silverlabs:despawn_egg", "target": "self" } } + "minecraft:timer": { "time": 3, "looping": false, "time_down_event": { "event": "silverlabs:despawn_egg", "target": "self" } } }, "silverlabs:egg_despawning": { "minecraft:instant_despawn": {} } }, diff --git a/addon/spark_pet_BP/entities/dragon_egg_color_5.json b/addon/spark_pet_BP/entities/dragon_egg_color_5.json index 1306eee..248b569 100644 --- a/addon/spark_pet_BP/entities/dragon_egg_color_5.json +++ b/addon/spark_pet_BP/entities/dragon_egg_color_5.json @@ -25,27 +25,17 @@ }, "event": "silverlabs:advance_to_warming", "target": "self" }, - "use_item": true, "interact_text": "Warm with Bonemeal", "play_sounds": "block.bone_block.place" + "use_item": true, "interact_text": "Warm Egg (Bonemeal)", "play_sounds": "block.bone_block.place" }, { "on_interact": { "filters": { "all_of": [{ "test": "is_family", "subject": "other", "value": "player" }] }, "event": "", "target": "self" }, - "use_item": false, "interact_text": "The egg radiates dark energy... (use Bonemeal)" + "use_item": false, "interact_text": "The egg is deep obsidian black... (use Bonemeal)" } ] - }, - "minecraft:damage_sensor": { - "triggers": [ - { "cause": "fire", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "fire_tick", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "lava", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_warming", "target": "self" } }, - { "cause": "entity_attack", "deals_damage": true }, - { "cause": "all", "deals_damage": false } - ] - }, - "minecraft:timer": { "time": 180, "looping": false, "time_down_event": { "event": "silverlabs:advance_to_warming", "target": "self" } } + } }, "silverlabs:egg_warming": { "minecraft:interact": { @@ -60,27 +50,17 @@ }, "event": "silverlabs:advance_to_hatching", "target": "self" }, - "use_item": true, "interact_text": "Ignite with Blaze Powder", "play_sounds": "fire.fire" + "use_item": true, "interact_text": "Ignite Egg (Blaze Powder)", "play_sounds": "fire.fire" }, { "on_interact": { "filters": { "all_of": [{ "test": "is_family", "subject": "other", "value": "player" }] }, "event": "", "target": "self" }, - "use_item": false, "interact_text": "The dark egg simmers... (use Blaze Powder)" + "use_item": false, "interact_text": "The egg pulses with dark energy... (use Blaze Powder)" } ] - }, - "minecraft:damage_sensor": { - "triggers": [ - { "cause": "fire", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "fire_tick", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "lava", "deals_damage": false, "on_damage": { "event": "silverlabs:advance_to_hatching", "target": "self" } }, - { "cause": "entity_attack", "deals_damage": true }, - { "cause": "all", "deals_damage": false } - ] - }, - "minecraft:timer": { "time": 120, "looping": false, "time_down_event": { "event": "silverlabs:advance_to_hatching", "target": "self" } } + } }, "silverlabs:egg_hatching": { "minecraft:damage_sensor": { "triggers": [{ "cause": "all", "deals_damage": false }] }, @@ -93,7 +73,7 @@ "num_to_spawn": 1, "single_use": true }] }, - "minecraft:timer": { "time": [60, 90], "looping": false, "time_down_event": { "event": "silverlabs:despawn_egg", "target": "self" } } + "minecraft:timer": { "time": 3, "looping": false, "time_down_event": { "event": "silverlabs:despawn_egg", "target": "self" } } }, "silverlabs:egg_despawning": { "minecraft:instant_despawn": {} } }, diff --git a/addon/spark_pet_BP/entities/spark_dragon.json b/addon/spark_pet_BP/entities/spark_dragon.json index 73f7066..156e991 100644 --- a/addon/spark_pet_BP/entities/spark_dragon.json +++ b/addon/spark_pet_BP/entities/spark_dragon.json @@ -730,7 +730,7 @@ "minecraft:jump.static": {}, "minecraft:tameable": { "probability": 0.33, - "tame_items": ["fish", "salmon"], + "tame_items": ["cod", "salmon"], "tame_event": { "event": "silverlabs:on_tamed", "target": "self" diff --git a/addon/spark_pet_BP/recipes/dragon_egg_crimson.json b/addon/spark_pet_BP/recipes/dragon_egg_crimson.json index 1639fb9..8521ece 100644 --- a/addon/spark_pet_BP/recipes/dragon_egg_crimson.json +++ b/addon/spark_pet_BP/recipes/dragon_egg_crimson.json @@ -5,7 +5,7 @@ "tags": ["crafting_table"], "ingredients": [ { "item": "silverlabs:dragon_egg" }, - { "item": "silverlabs:dragon_nest_crimson" } + { "item": "minecraft:red_dye" } ], "result": { "item": "silverlabs:dragon_egg_crimson" } } diff --git a/addon/spark_pet_BP/recipes/dragon_egg_jungle.json b/addon/spark_pet_BP/recipes/dragon_egg_jungle.json index be1d85a..d49d262 100644 --- a/addon/spark_pet_BP/recipes/dragon_egg_jungle.json +++ b/addon/spark_pet_BP/recipes/dragon_egg_jungle.json @@ -5,7 +5,7 @@ "tags": ["crafting_table"], "ingredients": [ { "item": "silverlabs:dragon_egg" }, - { "item": "silverlabs:dragon_nest_jungle" } + { "item": "minecraft:lime_dye" } ], "result": { "item": "silverlabs:dragon_egg_jungle" } } diff --git a/addon/spark_pet_BP/recipes/dragon_egg_oak.json b/addon/spark_pet_BP/recipes/dragon_egg_oak.json index ad913a2..dc7d792 100644 --- a/addon/spark_pet_BP/recipes/dragon_egg_oak.json +++ b/addon/spark_pet_BP/recipes/dragon_egg_oak.json @@ -5,7 +5,7 @@ "tags": ["crafting_table"], "ingredients": [ { "item": "silverlabs:dragon_egg" }, - { "item": "silverlabs:dragon_nest_oak" } + { "item": "minecraft:white_dye" } ], "result": { "item": "silverlabs:dragon_egg_oak" } } diff --git a/addon/spark_pet_BP/recipes/dragon_egg_obsidian.json b/addon/spark_pet_BP/recipes/dragon_egg_obsidian.json index 2e42aa5..7350d3b 100644 --- a/addon/spark_pet_BP/recipes/dragon_egg_obsidian.json +++ b/addon/spark_pet_BP/recipes/dragon_egg_obsidian.json @@ -5,7 +5,7 @@ "tags": ["crafting_table"], "ingredients": [ { "item": "silverlabs:dragon_egg" }, - { "item": "silverlabs:dragon_nest_obsidian" } + { "item": "minecraft:black_dye" } ], "result": { "item": "silverlabs:dragon_egg_obsidian" } } diff --git a/addon/spark_pet_BP/recipes/dragon_egg_spruce.json b/addon/spark_pet_BP/recipes/dragon_egg_spruce.json index dbe75c1..d9b707d 100644 --- a/addon/spark_pet_BP/recipes/dragon_egg_spruce.json +++ b/addon/spark_pet_BP/recipes/dragon_egg_spruce.json @@ -5,7 +5,7 @@ "tags": ["crafting_table"], "ingredients": [ { "item": "silverlabs:dragon_egg" }, - { "item": "silverlabs:dragon_nest_spruce" } + { "item": "minecraft:brown_dye" } ], "result": { "item": "silverlabs:dragon_egg_spruce" } } diff --git a/addon/spark_pet_BP/recipes/dragon_egg_warped.json b/addon/spark_pet_BP/recipes/dragon_egg_warped.json index 1f9401c..b49c894 100644 --- a/addon/spark_pet_BP/recipes/dragon_egg_warped.json +++ b/addon/spark_pet_BP/recipes/dragon_egg_warped.json @@ -5,7 +5,7 @@ "tags": ["crafting_table"], "ingredients": [ { "item": "silverlabs:dragon_egg" }, - { "item": "silverlabs:dragon_nest_warped" } + { "item": "minecraft:cyan_dye" } ], "result": { "item": "silverlabs:dragon_egg_warped" } }