diff --git a/behavior_pack/functions/mw_alko_vine.mcfunction b/behavior_pack/functions/mw_alko_vine.mcfunction new file mode 100644 index 0000000..80253da --- /dev/null +++ b/behavior_pack/functions/mw_alko_vine.mcfunction @@ -0,0 +1 @@ +give @s mw_alko:vine \ No newline at end of file diff --git a/behavior_pack/items/mw_alko_bottle_water.json b/behavior_pack/items/mw_alko_bottle_water.json index 95ba90b..10f263d 100644 --- a/behavior_pack/items/mw_alko_bottle_water.json +++ b/behavior_pack/items/mw_alko_bottle_water.json @@ -7,7 +7,7 @@ }, "components": { "minecraft:hand_equipped": false, - "minecraft:max_stack_size": 32, + "minecraft:max_stack_size": 1, "minecraft:foil": false, "minecraft:stack_by_data": true, "minecraft:food": { diff --git a/behavior_pack/items/mw_alko_vine.json b/behavior_pack/items/mw_alko_vine.json new file mode 100644 index 0000000..ae47f95 --- /dev/null +++ b/behavior_pack/items/mw_alko_vine.json @@ -0,0 +1,37 @@ +{ + "format_version": "1.10", + "minecraft:item": { + "description": { + "identifier": "mw_alko:vine", + "category": "items" + }, + "components": { + "minecraft:hand_equipped": false, + "minecraft:max_stack_size": 1, + "minecraft:foil": false, + "minecraft:stack_by_data": true, + "minecraft:food": { + "saturation_modifier": "normal", + "nutrition": 4, + "can_always_eat": true, + "effects": [ + { + "name": "nausea", + "chance": 1, + "duration": 80, + "amplifier": 1 + }, + { + "name": "strength", + "chance": 1, + "duration": 20, + "amplifier": 1 + } + ], + "remove_effects": [], + "using_converts_to": "mw_alko:bottle" + }, + "minecraft:use_duration": 32 + } + } +} \ No newline at end of file diff --git a/behavior_pack/manifest.json b/behavior_pack/manifest.json index 79879a0..b758ac4 100644 --- a/behavior_pack/manifest.json +++ b/behavior_pack/manifest.json @@ -7,7 +7,7 @@ "version": [ 0, 0, - 3 + 8 ], "min_engine_version": [ 1, @@ -23,7 +23,7 @@ "version": [ 0, 0, - 3 + 8 ] } ], @@ -33,7 +33,7 @@ "version": [ 0, 0, - 3 + 8 ] } ] diff --git a/behavior_pack/recipes/mw_alko_bottle_water.json b/behavior_pack/recipes/mw_alko_bottle_water.json index c7bfc4e..f46a114 100644 --- a/behavior_pack/recipes/mw_alko_bottle_water.json +++ b/behavior_pack/recipes/mw_alko_bottle_water.json @@ -8,22 +8,20 @@ "crafting_table" ], "pattern": [ - " A ", - "BBB" + " ", + " B ", + " " ], "key": { "A": { - "item": "minecraft:bucket", - "data": 8 + "item": "minecraft:bucket" }, "B": { - "item": "mw_alko:bottle", - "data": 0 + "item": "mw_alko:bottle" } }, "result": { - "item": "mw_alko:bottle_water", - "count": 1 + "item": "mw_alko:bottle_water" } } } \ No newline at end of file diff --git a/behavior_pack/recipes/mw_alko_vine.json b/behavior_pack/recipes/mw_alko_vine.json new file mode 100644 index 0000000..79149ed --- /dev/null +++ b/behavior_pack/recipes/mw_alko_vine.json @@ -0,0 +1,14 @@ +{ + "format_version": "1.12", + "minecraft:recipe_brewing_mix": { + "description": { + "identifier": "mw_alko:vine" + }, + + "tags": [ "brewing_stand" ], + + "input": "mw_alko:bottle_water", + "reagent": "minecraft:sweet_berries", + "output": "mw_alko:vine" + } +} \ No newline at end of file diff --git a/resource_pack/items/mw_alko_vine.json b/resource_pack/items/mw_alko_vine.json new file mode 100644 index 0000000..db3ae14 --- /dev/null +++ b/resource_pack/items/mw_alko_vine.json @@ -0,0 +1,14 @@ +{ + "format_version": "1.10", + "minecraft:item": { + "description": { + "identifier": "mw_alko:vine", + "category": "Nature" + }, + "components": { + "minecraft:icon": "mw_alko:vine", + "minecraft:use_animation": "drink", + "minecraft:render_offsets": "apple" + } + } +} \ No newline at end of file diff --git a/resource_pack/manifest.json b/resource_pack/manifest.json index e39c7a6..64d807c 100644 --- a/resource_pack/manifest.json +++ b/resource_pack/manifest.json @@ -7,7 +7,7 @@ "version": [ 0, 0, - 3 + 8 ], "min_engine_version": [ 1, @@ -23,7 +23,7 @@ "version": [ 0, 0, - 3 + 8 ] } ], @@ -33,7 +33,7 @@ "version": [ 0, 0, - 3 + 8 ] } ] diff --git a/resource_pack/texts/en_US.lang b/resource_pack/texts/en_US.lang index 6ac76b1..9cd9fc4 100644 --- a/resource_pack/texts/en_US.lang +++ b/resource_pack/texts/en_US.lang @@ -1,7 +1,10 @@ item.mw_alko:bottle.name=Бутылка item.mw_alko:bottle_water.name=Бутылка с водой -item.mw_alko:alcohol.name=Спирт +item.mw_alko:alcohol.name=Самогон item.mw_alko:vodka.name=Водка +item.mw_alko:vine.name=Вино +item.mw_alko:beer.name=Пиво +item.mw_alko:absent.name=Абсент ## Comments can be added anywhere on a valid line by starting with '##' ## ## Note, trailing spaces will NOT be trimmed. If you want room between the end of the string and the start of a diff --git a/resource_pack/textures/item_texture.json b/resource_pack/textures/item_texture.json index 59e4b57..ec632a9 100644 --- a/resource_pack/textures/item_texture.json +++ b/resource_pack/textures/item_texture.json @@ -82,6 +82,9 @@ }, "mw_alko:vodka": { "textures": "textures/items/pamobile/mw_alko_vodka" + }, + "mw_alko:vine": { + "textures": "textures/items/pamobile/mw_alko_vine" } } } diff --git a/resource_pack/textures/items/pamobile/mw_alko_absent.png b/resource_pack/textures/items/pamobile/mw_alko_absent.png new file mode 100644 index 0000000..f36f26d Binary files /dev/null and b/resource_pack/textures/items/pamobile/mw_alko_absent.png differ diff --git a/resource_pack/textures/items/pamobile/mw_alko_beer.png b/resource_pack/textures/items/pamobile/mw_alko_beer.png new file mode 100644 index 0000000..f7ea877 Binary files /dev/null and b/resource_pack/textures/items/pamobile/mw_alko_beer.png differ diff --git a/resource_pack/textures/items/pamobile/mw_alko_vine.png b/resource_pack/textures/items/pamobile/mw_alko_vine.png new file mode 100644 index 0000000..87accc7 Binary files /dev/null and b/resource_pack/textures/items/pamobile/mw_alko_vine.png differ