From f273633db542694f2bfe1e476610da3e0e04c3ff Mon Sep 17 00:00:00 2001 From: Hell13Cat <46496367+Hell13Cat@users.noreply.github.com> Date: Sat, 29 Jan 2022 20:20:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=8D=D1=84=D1=84=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- behavior_pack/items/mw_alko_absent.json | 2 +- behavior_pack/items/mw_alko_alcohol.json | 2 +- behavior_pack/items/mw_alko_beer.json | 32 +++++++++---------- behavior_pack/items/mw_alko_bottle_water.json | 2 +- behavior_pack/items/mw_alko_vine.json | 2 +- behavior_pack/items/mw_alko_vodka.json | 2 +- behavior_pack/manifest.json | 2 +- resource_pack/manifest.json | 2 +- 8 files changed, 22 insertions(+), 24 deletions(-) diff --git a/behavior_pack/items/mw_alko_absent.json b/behavior_pack/items/mw_alko_absent.json index 957b5f4..92c3bf7 100644 --- a/behavior_pack/items/mw_alko_absent.json +++ b/behavior_pack/items/mw_alko_absent.json @@ -51,7 +51,7 @@ "remove_effects": [], "using_converts_to": "mw_alko:bottle" }, - "minecraft:use_duration": 32 + "minecraft:use_duration": 3 } } } \ No newline at end of file diff --git a/behavior_pack/items/mw_alko_alcohol.json b/behavior_pack/items/mw_alko_alcohol.json index c734b58..2b3add4 100644 --- a/behavior_pack/items/mw_alko_alcohol.json +++ b/behavior_pack/items/mw_alko_alcohol.json @@ -44,7 +44,7 @@ "remove_effects": [], "using_converts_to": "mw_alko:bottle" }, - "minecraft:use_duration": 32 + "minecraft:use_duration": 3 } } } \ No newline at end of file diff --git a/behavior_pack/items/mw_alko_beer.json b/behavior_pack/items/mw_alko_beer.json index 2b96d7d..6128678 100644 --- a/behavior_pack/items/mw_alko_beer.json +++ b/behavior_pack/items/mw_alko_beer.json @@ -21,24 +21,22 @@ "saturation_modifier": "normal", "nutrition": 4, "can_always_eat": true, - "effects": [ - { - "name": "nausea", - "chance": 1, - "duration": 80, - "amplifier": 0 - }, - { - "name": "strength", - "chance": 1, - "duration": 20, - "amplifier": 0 - } - ], - "remove_effects": [], + "on_consume": { + "event": "mw_alko:effect" + }, "using_converts_to": "mw_alko:bottle" }, - "minecraft:use_duration": 32 - } + "minecraft:use_duration": 3 + }, + "events": { + "mw_alko:effect": { + "run_command": { + "command": [ + "effect @s nausea 80 0 true", + "effect @s nausea 20 0 true" + ] + } + } + } } } \ 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 42c3f16..fc7c045 100644 --- a/behavior_pack/items/mw_alko_bottle_water.json +++ b/behavior_pack/items/mw_alko_bottle_water.json @@ -25,7 +25,7 @@ "remove_effects": [], "using_converts_to": "mw_alko:bottle" }, - "minecraft:use_duration": 32 + "minecraft:use_duration": 3 } } } \ No newline at end of file diff --git a/behavior_pack/items/mw_alko_vine.json b/behavior_pack/items/mw_alko_vine.json index 293035e..bad1093 100644 --- a/behavior_pack/items/mw_alko_vine.json +++ b/behavior_pack/items/mw_alko_vine.json @@ -38,7 +38,7 @@ "remove_effects": [], "using_converts_to": "mw_alko:bottle" }, - "minecraft:use_duration": 32 + "minecraft:use_duration": 3 } } } \ No newline at end of file diff --git a/behavior_pack/items/mw_alko_vodka.json b/behavior_pack/items/mw_alko_vodka.json index 47109e0..fb46ffa 100644 --- a/behavior_pack/items/mw_alko_vodka.json +++ b/behavior_pack/items/mw_alko_vodka.json @@ -44,7 +44,7 @@ "remove_effects": [], "using_converts_to": "mw_alko:bottle" }, - "minecraft:use_duration": 32 + "minecraft:use_duration": 3 } } } \ No newline at end of file diff --git a/behavior_pack/manifest.json b/behavior_pack/manifest.json index ec0e26a..de68b74 100644 --- a/behavior_pack/manifest.json +++ b/behavior_pack/manifest.json @@ -1 +1 @@ -{"format_version": 2, "header": {"description": "Система алкоголя для MW", "name": "MW Alko", "uuid": "e9eba44a-91d6-41de-a242-76c8c7d0e83b", "version": [0, 1, 34], "min_engine_version": [1, 17, 0]}, "modules": [{"description": "Система алкоголя для MW", "type": "data", "uuid": "115c640d-fbfd-48af-8e50-115c5bb6485e", "version": [0, 1, 34]}], "dependencies": [{"uuid": "8b764b0b-89b1-45df-8f83-9204bccf7184", "version": [0, 1, 34]}]} \ No newline at end of file +{"format_version": 2, "header": {"description": "Система алкоголя для MW", "name": "MW Alko", "uuid": "e9eba44a-91d6-41de-a242-76c8c7d0e83b", "version": [0, 1, 37], "min_engine_version": [1, 17, 0]}, "modules": [{"description": "Система алкоголя для MW", "type": "data", "uuid": "115c640d-fbfd-48af-8e50-115c5bb6485e", "version": [0, 1, 37]}], "dependencies": [{"uuid": "8b764b0b-89b1-45df-8f83-9204bccf7184", "version": [0, 1, 37]}]} \ No newline at end of file diff --git a/resource_pack/manifest.json b/resource_pack/manifest.json index fe37bf1..f8fae4a 100644 --- a/resource_pack/manifest.json +++ b/resource_pack/manifest.json @@ -1 +1 @@ -{"format_version": 2, "header": {"description": "Система алкоголя для MW", "name": "MW Alko", "uuid": "8b764b0b-89b1-45df-8f83-9204bccf7184", "version": [0, 1, 34], "min_engine_version": [1, 17, 0]}, "modules": [{"description": "Система алкоголя для MW", "type": "resources", "uuid": "397e7227-43f5-4b31-9681-6a81cd09a9d0", "version": [0, 1, 34]}], "dependencies": [{"uuid": "e9eba44a-91d6-41de-a242-76c8c7d0e83b", "version": [0, 1, 34]}]} \ No newline at end of file +{"format_version": 2, "header": {"description": "Система алкоголя для MW", "name": "MW Alko", "uuid": "8b764b0b-89b1-45df-8f83-9204bccf7184", "version": [0, 1, 37], "min_engine_version": [1, 17, 0]}, "modules": [{"description": "Система алкоголя для MW", "type": "resources", "uuid": "397e7227-43f5-4b31-9681-6a81cd09a9d0", "version": [0, 1, 37]}], "dependencies": [{"uuid": "e9eba44a-91d6-41de-a242-76c8c7d0e83b", "version": [0, 1, 37]}]} \ No newline at end of file