fix(spark_pet): egg auto-hatch, repeated spawning, taming, despawn, and nest selection

- 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 <noreply@anthropic.com>

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": {

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": {} }
     },

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": {} }
     },

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": {} }
     },

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": {} }
     },

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": {} }
     },

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": {} }
     },

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"