diff --git a/.gitignore b/.gitignore index 6c0413d..b96a7a9 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,9 @@ addon/build/ # (LEVEL_NAME, etc.) that must survive deploys. Never committed. docker-compose.override.yml +# Local-only backup files (e.g. docker-compose.yml.bak.local) +*.bak.local + # Server data (Docker volumes are external, but just in case) server-data/ diff --git a/dynamite-addon/dynamite_BP/entities/thrown_banger.json b/dynamite-addon/dynamite_BP/entities/thrown_banger.json index f10c940..2af4051 100644 --- a/dynamite-addon/dynamite_BP/entities/thrown_banger.json +++ b/dynamite-addon/dynamite_BP/entities/thrown_banger.json @@ -25,12 +25,6 @@ "destroy_on_hit": true, "semi_random_diff_damage": false }, - "spawn_aoe_cloud": { - "radius": 1.5, - "duration": 0, - "particle": "minecraft:explosion_manual", - "affect_owner": false - }, "remove_on_hit": {} }, "power": 1.4, diff --git a/naturalist-lite-addon/naturalist_lite_BP/items/cooked_frog_leg.json b/naturalist-lite-addon/naturalist_lite_BP/items/cooked_frog_leg.json new file mode 100644 index 0000000..c2fd882 --- /dev/null +++ b/naturalist-lite-addon/naturalist_lite_BP/items/cooked_frog_leg.json @@ -0,0 +1,16 @@ +{ + "format_version": "1.21.0", + "minecraft:item": { + "description": { + "identifier": "silverlabs_nat:cooked_frog_leg", + "menu_category": { "category": "items", "group": "itemGroup.name.miscFood" } + }, + "components": { + "minecraft:icon": "silverlabs_nat.cooked_frog_leg", + "minecraft:max_stack_size": 64, + "minecraft:food": { "nutrition": 4, "saturation_modifier": 1.2 }, + "minecraft:use_animation": "eat", + "minecraft:use_modifiers": { "use_duration": 1.6, "movement_modifier": 0.35 } + } + } +} diff --git a/naturalist-lite-addon/naturalist_lite_BP/items/frog_leg.json b/naturalist-lite-addon/naturalist_lite_BP/items/frog_leg.json new file mode 100644 index 0000000..48b8a94 --- /dev/null +++ b/naturalist-lite-addon/naturalist_lite_BP/items/frog_leg.json @@ -0,0 +1,16 @@ +{ + "format_version": "1.21.0", + "minecraft:item": { + "description": { + "identifier": "silverlabs_nat:frog_leg", + "menu_category": { "category": "items", "group": "itemGroup.name.miscFood" } + }, + "components": { + "minecraft:icon": "silverlabs_nat.frog_leg", + "minecraft:max_stack_size": 64, + "minecraft:food": { "nutrition": 2, "saturation_modifier": 0.6 }, + "minecraft:use_animation": "eat", + "minecraft:use_modifiers": { "use_duration": 1.6, "movement_modifier": 0.35 } + } + } +} diff --git a/naturalist-lite-addon/naturalist_lite_BP/items/snake_egg_block.json b/naturalist-lite-addon/naturalist_lite_BP/items/snake_egg_block.json new file mode 100644 index 0000000..0ad517f --- /dev/null +++ b/naturalist-lite-addon/naturalist_lite_BP/items/snake_egg_block.json @@ -0,0 +1,13 @@ +{ + "format_version": "1.21.0", + "minecraft:item": { + "description": { + "identifier": "silverlabs_nat:snake_egg_block", + "menu_category": { "category": "nature" } + }, + "components": { + "minecraft:icon": "silverlabs_nat.snake_egg_block", + "minecraft:max_stack_size": 16 + } + } +} diff --git a/naturalist-lite-addon/naturalist_lite_RP/texts/en_US.lang b/naturalist-lite-addon/naturalist_lite_RP/texts/en_US.lang index 6f4eebb..88d2dd8 100644 --- a/naturalist-lite-addon/naturalist_lite_RP/texts/en_US.lang +++ b/naturalist-lite-addon/naturalist_lite_RP/texts/en_US.lang @@ -16,4 +16,8 @@ entity.silverlabs_nat:coral_snake_egg.name=Coral Snake Egg tile.silverlabs_nat:cave_snake_egg.name=Cave Snake Egg tile.silverlabs_nat:coral_snake_egg.name=Coral Snake Egg +item.silverlabs_nat:frog_leg.name=Frog Leg +item.silverlabs_nat:cooked_frog_leg.name=Cooked Frog Leg +item.silverlabs_nat:snake_egg_block.name=Snake Egg + diff --git a/naturalist-lite-addon/naturalist_lite_RP/textures/item_texture.json b/naturalist-lite-addon/naturalist_lite_RP/textures/item_texture.json index 70bbeab..7895444 100644 --- a/naturalist-lite-addon/naturalist_lite_RP/textures/item_texture.json +++ b/naturalist-lite-addon/naturalist_lite_RP/textures/item_texture.json @@ -94,6 +94,15 @@ }, "silverlabs_nat.tiger_spawn_egg": { "textures": "textures/sf/nba/items/tiger_default_spawn_egg" + }, + "silverlabs_nat.frog_leg": { + "textures": "textures/sf/nba/items/frog_leg" + }, + "silverlabs_nat.cooked_frog_leg": { + "textures": "textures/sf/nba/items/cooked_frog_leg" + }, + "silverlabs_nat.snake_egg_block": { + "textures": "textures/sf/nba/items/snake_egg_block" } } } \ No newline at end of file