From bf8e1a45b3f6fe217eaf40ff1434fa059061c1b4 Mon Sep 17 00:00:00 2001 From: Hell13Cat <46496367+Hell13Cat@users.noreply.github.com> Date: Tue, 25 Jan 2022 19:46:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=81=D0=BF=D0=B8=D1=80=D1=82=20+=20=D0=B2?= =?UTF-8?q?=D0=BE=D0=B4=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mw_alko_vodka.mcfunction | 1 + behavior_pack/items/mw_alko_alcohol.json | 4 +- behavior_pack/items/mw_alko_vodka.json | 43 ++++++++++++++++++ behavior_pack/manifest.json | 6 +-- behavior_pack/recipes/mw_alko_vodka.json | 14 ++++++ resource_pack/items/mw_alko_alcohol.json | 4 +- resource_pack/items/mw_alko_vodka.json | 14 ++++++ resource_pack/manifest.json | 6 +-- resource_pack/texts/en_US.lang | 1 + resource_pack/textures/item_texture.json | 4 ++ .../items/pamobile/mw_alko_alcohol.png | Bin 2408 -> 195 bytes .../items/pamobile/mw_alko_bottle.png | Bin 237 -> 230 bytes .../items/pamobile/mw_alko_bottle_water.png | Bin 1742 -> 223 bytes .../textures/items/pamobile/mw_alko_vodka.png | Bin 0 -> 200 bytes 14 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 behavior_pack/functions/mw_alko_vodka.mcfunction create mode 100644 behavior_pack/items/mw_alko_vodka.json create mode 100644 behavior_pack/recipes/mw_alko_vodka.json create mode 100644 resource_pack/items/mw_alko_vodka.json create mode 100644 resource_pack/textures/items/pamobile/mw_alko_vodka.png diff --git a/behavior_pack/functions/mw_alko_vodka.mcfunction b/behavior_pack/functions/mw_alko_vodka.mcfunction new file mode 100644 index 0000000..e666bbd --- /dev/null +++ b/behavior_pack/functions/mw_alko_vodka.mcfunction @@ -0,0 +1 @@ +give @s mw_alko:vodka \ 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 0ae995f..18363de 100644 --- a/behavior_pack/items/mw_alko_alcohol.json +++ b/behavior_pack/items/mw_alko_alcohol.json @@ -19,13 +19,13 @@ "name": "nausea", "chance": 1, "duration": 120, - "amplifier": 1 + "amplifier": 2 }, { "name": "slowness", "chance": 1, "duration": 30, - "amplifier": 1 + "amplifier": 2 } ], "remove_effects": [], diff --git a/behavior_pack/items/mw_alko_vodka.json b/behavior_pack/items/mw_alko_vodka.json new file mode 100644 index 0000000..e9d7bf2 --- /dev/null +++ b/behavior_pack/items/mw_alko_vodka.json @@ -0,0 +1,43 @@ +{ + "format_version": "1.10", + "minecraft:item": { + "description": { + "identifier": "mw_alko:vodka", + "category": "items" + }, + "components": { + "minecraft:hand_equipped": false, + "minecraft:max_stack_size": 1, + "minecraft:foil": false, + "minecraft:stack_by_data": true, + "minecraft:food": { + "saturation_modifier": "low", + "nutrition": 4, + "can_always_eat": true, + "effects": [ + { + "name": "nausea", + "chance": 1, + "duration": 100, + "amplifier": 1 + }, + { + "name": "slowness", + "chance": 1, + "duration": 20, + "amplifier": 1 + }, + { + "name": "strength", + "chance": 1, + "duration": 30, + "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 c3b1485..79879a0 100644 --- a/behavior_pack/manifest.json +++ b/behavior_pack/manifest.json @@ -7,7 +7,7 @@ "version": [ 0, 0, - 2 + 3 ], "min_engine_version": [ 1, @@ -23,7 +23,7 @@ "version": [ 0, 0, - 2 + 3 ] } ], @@ -33,7 +33,7 @@ "version": [ 0, 0, - 2 + 3 ] } ] diff --git a/behavior_pack/recipes/mw_alko_vodka.json b/behavior_pack/recipes/mw_alko_vodka.json new file mode 100644 index 0000000..0218ccc --- /dev/null +++ b/behavior_pack/recipes/mw_alko_vodka.json @@ -0,0 +1,14 @@ +{ + "format_version": "1.12", + "minecraft:recipe_brewing_mix": { + "description": { + "identifier": "mw_alko:vodka" + }, + + "tags": [ "brewing_stand" ], + + "input": "mw_alko:alcohol", + "reagent": "minecraft:coal", + "output": "mw_alko:vodka" + } +} \ No newline at end of file diff --git a/resource_pack/items/mw_alko_alcohol.json b/resource_pack/items/mw_alko_alcohol.json index 3804e82..98feba0 100644 --- a/resource_pack/items/mw_alko_alcohol.json +++ b/resource_pack/items/mw_alko_alcohol.json @@ -2,11 +2,11 @@ "format_version": "1.10", "minecraft:item": { "description": { - "identifier": "mw_alko:alcohol", + "identifier": "mw_alko:vodka", "category": "Nature" }, "components": { - "minecraft:icon": "mw_alko:alcohol", + "minecraft:icon": "mw_alko:vodka", "minecraft:use_animation": "drink", "minecraft:render_offsets": "apple" } diff --git a/resource_pack/items/mw_alko_vodka.json b/resource_pack/items/mw_alko_vodka.json new file mode 100644 index 0000000..3804e82 --- /dev/null +++ b/resource_pack/items/mw_alko_vodka.json @@ -0,0 +1,14 @@ +{ + "format_version": "1.10", + "minecraft:item": { + "description": { + "identifier": "mw_alko:alcohol", + "category": "Nature" + }, + "components": { + "minecraft:icon": "mw_alko:alcohol", + "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 2a81826..e39c7a6 100644 --- a/resource_pack/manifest.json +++ b/resource_pack/manifest.json @@ -7,7 +7,7 @@ "version": [ 0, 0, - 2 + 3 ], "min_engine_version": [ 1, @@ -23,7 +23,7 @@ "version": [ 0, 0, - 2 + 3 ] } ], @@ -33,7 +33,7 @@ "version": [ 0, 0, - 2 + 3 ] } ] diff --git a/resource_pack/texts/en_US.lang b/resource_pack/texts/en_US.lang index e46f891..6ac76b1 100644 --- a/resource_pack/texts/en_US.lang +++ b/resource_pack/texts/en_US.lang @@ -1,6 +1,7 @@ item.mw_alko:bottle.name=Бутылка item.mw_alko:bottle_water.name=Бутылка с водой item.mw_alko:alcohol.name=Спирт +item.mw_alko:vodka.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 269c97b..59e4b57 100644 --- a/resource_pack/textures/item_texture.json +++ b/resource_pack/textures/item_texture.json @@ -79,6 +79,10 @@ }, "mw_alko:bottle": { "textures": "textures/items/pamobile/mw_alko_bottle" + }, + "mw_alko:vodka": { + "textures": "textures/items/pamobile/mw_alko_vodka" } } + } } \ No newline at end of file diff --git a/resource_pack/textures/items/pamobile/mw_alko_alcohol.png b/resource_pack/textures/items/pamobile/mw_alko_alcohol.png index 4f0de3b6d5166d94572d98dbee9d2efd21e0f9ee..40df10f8625a213b28f501878568e18231ac5a4c 100644 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|YCT;XLo9mt z2JGZLpun@oWu-);UT_7wF{^W%>QAXIb}tUbv8fknByB~s8)J>5=atzn>U~L zl~jcC1~=a8yirrPO3p5mIIsOYpPivYF=bX-bI_W?RR=j%aWedh*ETsmMT%Q3gg0t- q8&5~%UyHkZhAlnO_78o3@$zqJQ{4T8IerGvAq<|belF{r5}E*8S3he2 literal 2408 zcmV-u377VXP)aR&%(1P1j21+xMdrUw>w5e}OK3a|thmjnnM4hMY&2Z{m( z^YQYX3>m2i6=E9`gb@>$4-@GI4~Pv8Xb1>(0|xl_`up$q@#ygE@a%RVBd8rBni?IX z6CI=+8M^}+ZW0Yz773sM3FZO@j{ydT0R;E`{qpqu>*(jAY;wZ|8m9~vo(~bm0};yz z4{sg}umuZ~0SABt27?3y-vb2w{Qc+|I+myS=;2 zt+KR+kDhyOjapTRP)UwPM57}nt{f(YCnZiLBlH9xgwR;>E`d|^xEL$*V*>c z)!ft5-^$G3y0*Wirr)HazM7n(nU=klkkNE=hhb)&W@KnyW29qY(okWTW?iUIQTH5C z`3Xf`MMRoDL%BFWNl!oUC^wQSAAv3&>H`=s8W*e+5|SGY7aI&C4Gdcd2~h(D{NDD_ z=H%ep-1?Hc`lP7PwWaxTq|2qEtD>CIla-8;kM)X+!;6XHc!~N>fQfQ&?qP0%Y+|=o zT(fIg#Bxx2RZzJ`OqWwiv|>r0S3|5hJNyGXg+n!3IxC|Cd~grK-4$fWvBZxNdFyGil&6M{6rMOf)pmD=@bJEJH6NG`Mq}00003bW%=J0D%>? zGl@R{00tCEL_t(o!{ydha2i1z25{OtTml3_2!Q~BU~zZ1#@*fB-BWk>xYpg>-QC^Y zU5~VHooSc$vETE3zxnU(-0Y(MgG~L0?wjc)(_4%0^-rz+oAwygnEZm^Jk!L;RpzuGcCjHp z&dHn9|ExABH+STQylFYNZ$G`CEif7M=f3~)pfTBV%bR9y9DDfAq}qtdp9O*&xocnD zzZ{so#2;XQz!SrkWCe|VGI{Eb*13}ef{u;@&vuNx5p-?1^TMT40KmaM#CTzP`jX7i z2UBJ&fMg?YS(D% z0szHgh)97Q^nB1P7OR3~EyXetAPo&Q9Sny<0|9nYi4X)+&FMaG zV=x@rdlW#begFhtEDo7~&`2V|I(q6Hj1pJ{0+5hBAi^Xv%wTBZa99F?LethzQ$v6n z8VV!|B|wEqjaVWJhiimk82Sn5xB&rT2%=d~kP+}`EEbI?#8C$Tb#--b4IrS(!VRJl zDF}e<0S-?fQz5+{fU6l05Nf9920=;y5q<(X1Ax_RAYgoW8#DkA@C=+17+3;E-O8$F z1`yy9-lDBMhF^iAyC|T9x46-i#}J3db|tub_D0u>kskqL0f;zWLzLXJ z2fJS$)n3-ltp4iix9=txFwvrg<}GJN;jA0>Kia;1+qMr^&z>^6?$K7}0tU=9S7X{~ zz3`UXX=yQ;T7FEe(ns6Q9{;E(M*#xi%qWSr+%Br2>~z4qOIqy|LC7LdI5pCM%4n6_up+!YcNo0PG%Z8Q1 z)+BMudn&X&Dq{-4fr)0_F&=H5lDQIz4L8y2Xe=kb$yGc>6~Mf@#-one$G7L;s{A-) z?>e5h#RPC*!kkF0x)_RIw6B*pFV0RoUe?>!Ck_M$wiZSDxp~!N;|}sX>$%a?Xku@? zRAV(buyc<2A$K(o3h8AN7oynMzJ$EEw(gg~fr9Yv63;qFK|pgGC5gBiT}5nytvL!j z;|dSTI%5vS^Audqerq(2n-Fhn8?6H1QfTQ$p-OCQdYahMWb1gItu2qQPyrY@!?N3* z0+VqB2D%YVNZ|2!e0~f{g*>!$S3Z;QXrYk7VA%8dLx$M1RRKaRyD4xS0gt8Ag+d?Q zAxLzsRRN}0x>I4~b{5iELb}kweu%xULx^e<$Y2tIK}Y(U2B|*wNZ%(<6=0{i3|1~c z6G^IpkAs7QuI~m_fC6(F8PCAd*=&6SeNCaSua9r)N>zZIy%6%qV`;M3`uc3PL27C$ zOM+4<#bhBJS%7|Wvc7%_+rYpe1*Kxf#Ug!V0m;cJDeROK8-U8MM)J{P`p1si91Hr* aN8bT$tI{f!1V(cJ0000NklH?Ss zDKRk&Lx?hffq?<8QA$h5>F&OaiF+6+q3PY~}EVv|Iy?DW}4N8;c z0+=B%fGa`aHNZemk6=o~>IHO7_zb~nKt^OFUR$XO06L2>tB^SLV*mgE07*qoM6N<$ Ef?2IobN~PV delta 209 zcmV;?051RL0qp^hB!9F?L_t(|0b^mH5U}8qF!%EMKV$iFh6|T2G0bRhXE?cS8zV^u zfB;Cdfu0_DE`R|;ett%fYe+HxS;PFphyR1T020II4GaTdnlmaZ8N?(c7+$@2fg*=) z2v!$>G=qSYm>3ElN W!JMDVzIFf|$>8bg=d#Wzp$Pz2|5g70 literal 1742 zcmV;<1~K`GP)QgM;ic7BMClSqEP^pM*!%fIpUTw-iQ^@e+ABb1-oDayK4f&Xabc_ z0?Tm$z-WZ9#%v(HXCBLd z8?j#(#cvhFX%&b+6SiUz;EfNoSr3y(4Ag=M*@p+%f&;v61G8TO&T|2PKLLn40h~+# zpGg4l>f!R{+4tnk`r^U$+r0ADwDHZN;JcdIv4rlqf7-8l*QR#qxN_vMa`L=n+@D+T zv{Gv}Nz){Za5dM>J9EajFf;EyTDZYa%x zCzMboo>V00n_4D-a z-_YyUz3kPu_t>fR(4_LghvT<&)1Yzkxp3sGY2Kw_)0|%Fsaf2nROzfx)|XG)oJ`l9 zOWT`A!i7e&ghZlWHMMOtw{bGOaxuz!Czeen+ms}uY9ok7Bfxea+l(B1TO84f8F4um zsZkM4I1!^;4!d3q(0L1HC=17H3czIu<&*=eT>*bP0Jt`6%K!iXEOb&%Qve4Z77IQS z4?-y2Rsw4``rUhZ;xyV=)!`<4ZiuUS(X zSZXmHE`Oz@B|IAwi2S+-EkXAkb>mOlx^){ab^Ya?^dv6oY0*~Kg@%!2&FzGs6AszC|> zs&_Z+H&0?>VHOi{Gu16lw`&C%%f)wc&c28+Ad~rszPrOT6`&X=zgdyv)Wyvm^&k}j zTe|gwzXMrJN6gc2{t*YUcoLF|avgSN7=R4s6iPCw4V%Njpz1l_zQGA3#KyDh=%?t& zL+&~t9y51mRfY3H28K)@r{!f}JuCu>+ihK4uf~8Cuye|c&e ze?60p!(wh96bG8ecf+L8T$F)9d5TT$>LprW1*hVBbd%3o*<1JlT{OjVT8#xzSTf?8 zgX`A`s!pXoD6a;Kzm#)g34Mqc^bA&G&MHSv6^JD*BBd2bvDrL={n5D$bh8cBPYkZ^=77i zem16-wu!pgrV%LeUxBgDB*?n{l3BsI%~4iO5$n|9(g;IBxFlFP)K+cSu<98T*m_JQ kY|Om8TwF}dEDWRo0MuO+0`FTm6951J07*qoM6N<$f;}N8#{d8T diff --git a/resource_pack/textures/items/pamobile/mw_alko_vodka.png b/resource_pack/textures/items/pamobile/mw_alko_vodka.png new file mode 100644 index 0000000000000000000000000000000000000000..a6939435f846f2a060d53f24439f526d8cb1bf2e GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|nmk<`Lo9mF z2JYrIzhMS5=z%X;~` xSJSxO;-K(K{k;B;IY9?~{Z~lc@tpsViSwbV5gW^uEkM^Wc)I$ztaD0e0st1{N3s9_ literal 0 HcmV?d00001