diff --git a/drink_machines.lua b/drink_machines.lua index 9c55449..41150f0 100644 --- a/drink_machines.lua +++ b/drink_machines.lua @@ -179,7 +179,7 @@ minetest.register_node('drinks:juice_press', { end, }) -function drinks.drinks_barrel_sub(liq_vol, ves_typ, pos) +function drinks.drinks_liquid_sub(liq_vol, ves_typ, ves_vol, pos) local meta = minetest.env:get_meta(pos) local fullness = tonumber(meta:get_string('fullness')) if fullness - liq_vol < 0 then @@ -189,10 +189,14 @@ function drinks.drinks_barrel_sub(liq_vol, ves_typ, pos) local inv = meta:get_inventory() local fullness = fullness - liq_vol meta:set_string('fullness', fullness) - meta:set_string('infotext', 'Barrel of '..fruit..' juice. '..(math.floor((fullness/128)*100))..' % full.') - meta:set_string('formspec', drinks.barrel_formspec(fullness)) + meta:set_string('infotext', 'Barrel of '..fruit..' juice. '..(math.floor((fullness/ves_vol)*100))..' % full.') + if ves_vol == 128 then + meta:set_string('formspec', drinks.barrel_formspec(fullness)) + end + if ves_vol == 256 then + meta:set_string('formspec', drinks.silo_formspec(fullness)) + end if ves_typ == 'jcu' or ves_typ == 'jbo' or ves_typ == 'jbu' then - print ('vessel is '..ves_typ..'. fruit is '..fruit) inv:set_stack('dst', 1, 'drinks:'..ves_typ..'_'..fruit) end if ves_typ == 'thirsty:bronze_canteen' then @@ -204,10 +208,10 @@ function drinks.drinks_barrel_sub(liq_vol, ves_typ, pos) end end -function drinks.drinks_barrel_add(liq_vol, ves_typ, pos) +function drinks.drinks_liquid_add(liq_vol, ves_typ, ves_vol, pos) local meta = minetest.env:get_meta(pos) local fullness = tonumber(meta:get_string('fullness')) - if fullness + liq_vol > 128 then + if fullness + liq_vol > ves_vol then return else local fruit = meta:get_string('fruit') @@ -215,29 +219,41 @@ function drinks.drinks_barrel_add(liq_vol, ves_typ, pos) local fullness = fullness + liq_vol meta:set_string('fullness', fullness) inv:set_stack('src', 1, ves_typ) - meta:set_string('infotext', 'Barrel of '..fruit..' juice. '..(math.floor((fullness/128)*100))..' % full.') - meta:set_string('formspec', drinks.barrel_formspec(fullness)) + meta:set_string('infotext', 'Barrel of '..fruit..' juice. '..(math.floor((fullness/ves_vol)*100))..' % full.') + if ves_vol == 256 then + meta:set_string('formspec', drinks.silo_formspec(fullness)) + end + if ves_vol == 128 then + meta:set_string('formspec', drinks.barrel_formspec(fullness)) + end end end function drinks.drinks_barrel(pos, inputstack) local meta = minetest.env:get_meta(pos) local vessel = string.sub(inputstack, 8, 10) - print (vessel) if vessel == 'jcu' then - local liq_vol = 2 - local ves_typ = 'vessels:drinking_glass' - drinks.drinks_barrel_add(liq_vol, ves_typ, pos) + drinks.drinks_liquid_add(2, 'vessels:drinking_glass', 128, pos) end if vessel == 'jbo' then - local liq_vol = 4 - local ves_typ = 'vessels:glass_bottle' - drinks.drinks_barrel_add(liq_vol, ves_typ, pos) + drinks.drinks_liquid_add(4, 'vessels:glass_bottle', 128, pos) end if vessel == 'jbu' then - local liq_vol = 16 - local ves_typ = 'bucket:bucket_empty' - drinks.drinks_barrel_add(liq_vol, ves_typ, pos) + drinks.drinks_liquid_add(16, 'bucket:bucket_empty', 128, pos) + end +end + +function drinks.drinks_silo(pos, inputstack) + local meta = minetest.env:get_meta(pos) + local vessel = string.sub(inputstack, 8, 10) + if vessel == 'jcu' then + drinks.drinks_liquid_add(2, 'vessels:drinking_glass', 256, pos) + end + if vessel == 'jbo' then + drinks.drinks_liquid_add(4, 'vessels:glass_bottle', 256, pos) + end + if vessel == 'jbu' then + drinks.drinks_liquid_add(16, 'bucket:bucket_empty', 256, pos) end end @@ -286,7 +302,6 @@ minetest.register_node('drinks:liquid_barrel', { local inputstack = instack:get_name() local outputstack = outstack:get_name() local fruit = string.sub(inputstack, 12, -1) - print ('fruit added to barrel is '..fruit) local fruit_in = meta:get_string('fruit') if fruit_in == 'empty' then meta:set_string('fruit', fruit) @@ -298,19 +313,19 @@ minetest.register_node('drinks:liquid_barrel', { drinks.drinks_barrel(pos, inputstack) end if outputstack == 'vessels:drinking_glass' then - drinks.drinks_barrel_sub(2, 'jcu', pos) + drinks.drinks_liquid_sub(2, 'jcu', 128, pos) end if outputstack == 'vessels:glass_bottle' then - drinks.drinks_barrel_sub(4, 'jbo', pos) + drinks.drinks_liquid_sub(4, 'jbo', 128, pos) end if outputstack == 'bucket:bucket_empty' then - drinks.drinks_barrel_sub(16, 'jbu', pos) + drinks.drinks_liquid_sub(16, 'jbu', 128, pos) end if outputstack == 'thirsty:steel_canteen' then - drinks.drinks_barrel_sub(20, 'thirsty:steel_canteen', pos) + drinks.drinks_liquid_sub(20, 'thirsty:steel_canteen', 128, pos) end if outputstack == 'thirsty:bronze_canteen' then - drinks.drinks_barrel_sub(30, 'thirsty:bronze_canteen', pos) + drinks.drinks_liquid_sub(30, 'thirsty:bronze_canteen', 128, pos) end end, on_receive_fields = function(pos, formname, fields, sender) @@ -324,3 +339,86 @@ minetest.register_node('drinks:liquid_barrel', { end end, }) + +minetest.register_node('drinks:liquid_silo', { + description = 'Silo of Liquid', + drawtype = 'mesh', + mesh = 'drinks_silo.obj', + tiles = {name='drinks_silo.png'}, + groups = {choppy=2, dig_immediate=2,}, + paramtype = 'light', + paramtype2 = 'facedir', + selection_box = { + type = 'fixed', + fixed = {-.5, -.5, -.5, .5, 1.5, .5}, + }, + collision_box = { + type = 'fixed', + fixed = {-.5, -.5, -.5, .5, .5, .5}, + }, + on_construct = function(pos) + local meta = minetest.env:get_meta(pos) + local inv = meta:get_inventory() + inv:set_size('main', 8*4) + inv:set_size('src', 1) + inv:set_size('dst', 1) + meta:set_string('fullness', 0) + meta:set_string('fruit', 'empty') + meta:set_string('infotext', 'Empty Drink Silo') + meta:set_string('formspec', 'size[8,8]'.. + 'label[0,0;Fill the silo with the drink of your choice,]'.. + 'label[0,.4;you can only add more of the same type of drink.]'.. + 'label[4.5,1.2;Add liquid ->]'.. + 'label[.75,1.75;The Silo is empty]'.. + 'label[4.5,2.25;Take liquid ->]'.. + 'label[2,3.2;(This empties the silo completely)]'.. + 'button[0,3;2,1;purge;Purge]'.. + 'list[current_name;src;6.5,1;1,1;]'.. + 'list[current_name;dst;6.5,2;1,1;]'.. + 'list[current_player;main;0,4;8,5;]') + end, + on_metadata_inventory_put = function(pos, listname, index, stack, player) + local meta = minetest.env:get_meta(pos) + local inv = meta:get_inventory() + local instack = inv:get_stack("src", 1) + local outstack = inv:get_stack('dst', 1) + local inputstack = instack:get_name() + local outputstack = outstack:get_name() + local fruit = string.sub(inputstack, 12, -1) + local fruit_in = meta:get_string('fruit') + if fruit_in == 'empty' then + meta:set_string('fruit', fruit) + local vessel = string.sub(inputstack, 8, 10) + drinks.drinks_barrel(pos, inputstack) + end + if fruit == fruit_in then + local vessel = string.sub(inputstack, 8, 10) + drinks.drinks_silo(pos, inputstack) + end + if outputstack == 'vessels:drinking_glass' then + drinks.drinks_liquid_sub(2, 'jcu', 256, pos) + end + if outputstack == 'vessels:glass_bottle' then + drinks.drinks_liquid_sub(4, 'jbo', 256, pos) + end + if outputstack == 'bucket:bucket_empty' then + drinks.drinks_liquid_sub(16, 'jbu', 256, pos) + end + if outputstack == 'thirsty:steel_canteen' then + drinks.drinks_liquid_sub(20, 'thirsty:steel_canteen', 256, pos) + end + if outputstack == 'thirsty:bronze_canteen' then + drinks.drinks_liquid_sub(30, 'thirsty:bronze_canteen', 256, pos) + end + end, + on_receive_fields = function(pos, formname, fields, sender) + if fields['purge'] then + local meta = minetest.env:get_meta(pos) + local fullness = 0 + meta:set_string('fullness', 0) + meta:set_string('fruit', 'empty') + meta:set_string('infotext', 'Empty Drink Silo') + meta:set_string('formspec', drinks.barrel_formspec(fullness)) + end + end, +}) diff --git a/formspecs.lua b/formspecs.lua index 0470954..56ac056 100644 --- a/formspecs.lua +++ b/formspecs.lua @@ -13,3 +13,19 @@ function drinks.barrel_formspec(fullness) 'list[current_player;main;0,4;8,5;]' return formspec end + +function drinks.silo_formspec(fullness) + local formspec = -- Used for the liquid storing barrels. + 'size[8,8]'.. + 'label[0,0;Fill the barrel with the drink of your choice,]'.. + 'label[0,.4;you can only add more of the same type of drink.]'.. + 'label[4.5,1.2;Add liquid ->]'.. + 'label[.75,1.75;This barrel is '..((fullness/256)*100)..'% full]'.. + 'label[4.5,2.25;Take liquid ->]'.. + 'label[2,3.2;(This empties the barrel completely)]'.. + 'button[0,3;2,1;purge;Purge]'.. + 'list[current_name;src;6.5,1;1,1;]'.. + 'list[current_name;dst;6.5,2;1,1;]'.. + 'list[current_player;main;0,4;8,5;]' + return formspec +end diff --git a/models/drinks_silo.obj b/models/drinks_silo.obj new file mode 100644 index 0000000..990ca44 --- /dev/null +++ b/models/drinks_silo.obj @@ -0,0 +1,449 @@ +# Blender v2.78 (sub 2) OBJ File: 'drinks.blend' +# www.blender.org +o Sphere_Sphere.001 +v 0.355973 -0.470000 -0.283179 +v 0.355973 0.000000 -0.283179 +v 0.285262 -0.470000 -0.353890 +v 0.285262 0.000000 -0.353890 +v 0.426684 -0.470000 -0.353890 +v 0.426684 0.000000 -0.353890 +v 0.355973 -0.470000 -0.424601 +v 0.355973 0.000000 -0.424601 +v 0.256978 -0.480000 -0.353890 +v 0.355973 -0.480000 -0.254895 +v 0.355973 -0.480000 -0.452885 +v 0.454968 -0.480000 -0.353890 +v 0.256978 -0.500000 -0.353890 +v 0.355973 -0.500000 -0.254895 +v 0.355973 -0.500000 -0.452885 +v 0.454968 -0.500000 -0.353890 +v 0.355973 0.030000 -0.283179 +v 0.285262 0.030000 -0.353890 +v 0.296242 0.036360 -0.364870 +v 0.366953 0.036360 -0.294159 +v -0.285262 -0.470000 -0.353890 +v -0.285262 0.000000 -0.353890 +v -0.355973 -0.470000 -0.283179 +v -0.355973 0.000000 -0.283179 +v -0.355973 -0.470000 -0.424601 +v -0.355973 0.000000 -0.424601 +v -0.426684 -0.470000 -0.353890 +v -0.426684 0.000000 -0.353890 +v -0.355973 -0.480000 -0.254895 +v -0.256978 -0.480000 -0.353890 +v -0.454968 -0.480000 -0.353890 +v -0.355973 -0.480000 -0.452885 +v -0.355973 -0.500000 -0.254895 +v -0.256978 -0.500000 -0.353890 +v -0.454968 -0.500000 -0.353890 +v -0.355973 -0.500000 -0.452885 +v -0.285262 0.030000 -0.353890 +v -0.355973 0.030000 -0.283179 +v -0.366953 0.036360 -0.294159 +v -0.296242 0.036360 -0.364870 +v 0.285262 -0.470000 0.358056 +v 0.285262 0.000000 0.358056 +v 0.355973 -0.470000 0.287346 +v 0.355973 0.000000 0.287346 +v 0.355973 -0.470000 0.428767 +v 0.355973 0.000000 0.428767 +v 0.426684 -0.470000 0.358056 +v 0.426684 0.000000 0.358056 +v 0.355973 -0.480000 0.259061 +v 0.256978 -0.480000 0.358056 +v 0.454968 -0.480000 0.358056 +v 0.355973 -0.480000 0.457051 +v 0.355973 -0.500000 0.259061 +v 0.256978 -0.500000 0.358056 +v 0.454968 -0.500000 0.358056 +v 0.355973 -0.500000 0.457051 +v 0.285262 0.030000 0.358056 +v 0.355973 0.030000 0.287346 +v 0.366953 0.036360 0.298326 +v 0.296242 0.036360 0.369036 +v -0.355973 -0.470000 0.287346 +v -0.355973 0.000000 0.287346 +v -0.285263 -0.470000 0.358056 +v -0.285263 0.000000 0.358056 +v -0.426684 -0.470000 0.358056 +v -0.426684 0.000000 0.358056 +v -0.355973 -0.470000 0.428767 +v -0.355973 0.000000 0.428767 +v -0.256978 -0.480000 0.358056 +v -0.355973 -0.480000 0.259061 +v -0.355973 -0.480000 0.457051 +v -0.454968 -0.480000 0.358056 +v -0.256978 -0.500000 0.358056 +v -0.355973 -0.500000 0.259061 +v -0.355973 -0.500000 0.457051 +v -0.454968 -0.500000 0.358056 +v -0.355973 0.030000 0.287346 +v -0.285263 0.030000 0.358056 +v -0.296242 0.036360 0.369036 +v -0.366953 0.036360 0.298326 +v -0.123715 1.404509 -0.298674 +v -0.200174 -0.154509 -0.483264 +v 0.000000 -0.350000 0.000000 +v 0.123715 1.404509 -0.298674 +v 0.200174 1.154508 -0.483264 +v 0.200174 -0.154509 -0.483264 +v 0.123715 -0.304509 -0.298673 +v 0.298674 1.404509 -0.123715 +v 0.483264 1.154508 -0.200174 +v 0.483264 -0.154509 -0.200174 +v 0.298674 -0.304509 -0.123715 +v 0.298674 1.404509 0.123715 +v 0.483264 1.154508 0.200175 +v 0.483264 -0.154509 0.200174 +v 0.298674 -0.304509 0.123715 +v 0.123715 1.404509 0.298674 +v 0.200174 1.154508 0.483264 +v 0.200174 -0.154509 0.483264 +v 0.123715 -0.304509 0.298674 +v -0.000000 1.500000 0.000000 +v -0.123715 1.404509 0.298674 +v -0.200174 1.154508 0.483264 +v -0.200174 -0.154509 0.483264 +v -0.123715 -0.304509 0.298674 +v -0.298674 1.404509 0.123715 +v -0.483264 1.154508 0.200175 +v -0.483264 -0.154509 0.200175 +v -0.298673 -0.304509 0.123715 +v -0.298674 1.404509 -0.123715 +v -0.483264 1.154508 -0.200174 +v -0.483264 -0.154509 -0.200174 +v -0.298673 -0.304509 -0.123715 +v -0.200174 1.154508 -0.483264 +v -0.123715 -0.304509 -0.298673 +vt 1.000000 0.008414 +vt 0.978921 0.399028 +vt 0.894297 0.383031 +vt 0.916891 0.003929 +vt 0.822710 0.352283 +vt 0.834561 0.000001 +vt 0.760707 0.354848 +vt 0.739397 0.000000 +vt 0.689594 0.414136 +vt 0.642691 0.007416 +vt 0.756477 0.490620 +vt 0.709526 0.588101 +vt 0.670960 0.596854 +vt 0.740550 0.468871 +vt 0.849070 0.402909 +vt 0.749567 0.419582 +vt 0.853240 0.441198 +vt 0.727002 0.453325 +vt 0.854930 0.419425 +vt 0.924304 0.516307 +vt 0.847709 0.465468 +vt 0.944476 0.505392 +vt 0.932660 0.620289 +vt 0.957582 0.639217 +vt 0.963235 0.492572 +vt 0.982975 0.636506 +vt 0.651986 0.586137 +vt 0.974085 0.425479 +vt 0.885915 0.409359 +vt 0.712088 0.441124 +vt 1.000000 0.008414 +vt 0.978921 0.399028 +vt 0.894297 0.383031 +vt 0.916891 0.003929 +vt 0.822710 0.352283 +vt 0.834561 0.000001 +vt 0.760707 0.354848 +vt 0.739397 0.000000 +vt 0.689594 0.414136 +vt 0.642691 0.007416 +vt 0.756477 0.490620 +vt 0.709526 0.588101 +vt 0.670960 0.596854 +vt 0.740550 0.468871 +vt 0.849070 0.402909 +vt 0.749567 0.419582 +vt 0.853240 0.441198 +vt 0.727002 0.453325 +vt 0.854930 0.419425 +vt 0.924304 0.516307 +vt 0.847709 0.465468 +vt 0.944476 0.505392 +vt 0.932660 0.620289 +vt 0.957582 0.639217 +vt 0.963235 0.492572 +vt 0.982975 0.636506 +vt 0.651986 0.586137 +vt 0.974085 0.425479 +vt 0.885915 0.409359 +vt 0.712088 0.441124 +vt 1.000000 0.008414 +vt 0.978921 0.399028 +vt 0.894297 0.383031 +vt 0.916891 0.003929 +vt 0.822710 0.352283 +vt 0.834561 0.000001 +vt 0.760707 0.354848 +vt 0.739397 0.000000 +vt 0.689594 0.414136 +vt 0.642691 0.007416 +vt 0.756477 0.490620 +vt 0.709526 0.588101 +vt 0.670960 0.596854 +vt 0.740550 0.468871 +vt 0.849070 0.402909 +vt 0.749567 0.419582 +vt 0.853240 0.441198 +vt 0.727002 0.453325 +vt 0.854930 0.419425 +vt 0.924304 0.516307 +vt 0.847709 0.465468 +vt 0.944476 0.505392 +vt 0.932660 0.620289 +vt 0.957582 0.639217 +vt 0.963235 0.492572 +vt 0.982975 0.636506 +vt 0.651986 0.586137 +vt 0.974085 0.425479 +vt 0.885915 0.409359 +vt 0.712088 0.441124 +vt 1.000000 0.008414 +vt 0.978921 0.399028 +vt 0.894297 0.383031 +vt 0.916891 0.003929 +vt 0.822710 0.352283 +vt 0.834561 0.000001 +vt 0.760707 0.354848 +vt 0.739397 0.000000 +vt 0.689594 0.414136 +vt 0.642691 0.007416 +vt 0.756477 0.490620 +vt 0.709526 0.588101 +vt 0.670960 0.596854 +vt 0.740550 0.468871 +vt 0.849070 0.402909 +vt 0.749567 0.419582 +vt 0.853240 0.441198 +vt 0.727002 0.453325 +vt 0.854930 0.419425 +vt 0.924304 0.516307 +vt 0.847709 0.465468 +vt 0.944476 0.505392 +vt 0.932660 0.620289 +vt 0.957582 0.639217 +vt 0.963235 0.492572 +vt 0.982975 0.636506 +vt 0.651986 0.586137 +vt 0.974085 0.425479 +vt 0.885915 0.409359 +vt 0.712088 0.441124 +vt 0.458192 0.984779 +vt 0.416249 0.876077 +vt 0.492200 0.829133 +vt 0.577701 0.901340 +vt 0.398986 0.746077 +vt 0.371685 0.623173 +vt 0.461508 0.642253 +vt 0.611408 0.000000 +vt 0.611408 0.499779 +vt 0.458556 0.499779 +vt 0.458556 0.000000 +vt 0.401059 0.746160 +vt 0.364561 0.526338 +vt 0.515364 0.565244 +vt 0.603345 0.690487 +vt 0.513970 0.712258 +vt 0.522330 0.752969 +vt 0.633687 0.763133 +vt 0.305704 0.499779 +vt 0.305704 0.000000 +vt 0.586447 0.840659 +vt 0.506303 0.797843 +vt 0.500258 0.675850 +vt 0.595875 0.616286 +vt 0.152852 0.499779 +vt 0.152852 0.000000 +vt 0.474776 0.940516 +vt 0.443899 0.855822 +vt 0.435323 0.628715 +vt 0.474696 0.521813 +vt 0.000000 0.499779 +vt -0.000000 0.000000 +vt 0.325985 0.940516 +vt 0.359167 0.857264 +vt 0.354410 0.631967 +vt 0.318943 0.521813 +vt 0.611519 0.000111 +vt 0.611519 0.499889 +vt 0.458667 0.499889 +vt 0.458667 0.000111 +vt 0.215537 0.842251 +vt 0.295143 0.801929 +vt 0.291947 0.685733 +vt 0.193933 0.619083 +vt 0.305815 0.499889 +vt 0.305815 0.000111 +vt 0.197065 0.696779 +vt 0.283780 0.717322 +vt 0.275822 0.769647 +vt 0.152658 0.775742 +vt 0.152963 0.499889 +vt 0.152963 0.000111 +vt 0.274084 0.573260 +vt 0.332759 0.642608 +vt 0.317258 0.853505 +vt 0.211645 0.931220 +vt 0.000111 0.499889 +vt 0.000111 0.000111 +vn -0.7071 0.0000 0.7071 +vn -0.7071 0.0000 -0.7071 +vn 0.7071 0.0000 -0.7071 +vn 0.7071 0.0000 0.7071 +vn 0.3162 0.8944 0.3162 +vn 0.2796 0.9185 -0.2796 +vn -0.3162 0.8944 -0.3162 +vn -0.3162 0.8944 0.3162 +vn 0.3162 0.8944 -0.3162 +vn -0.2796 0.9185 -0.2796 +vn 0.2796 0.9185 0.2796 +vn -0.2796 0.9185 0.2796 +vn -0.0000 0.5940 -0.8045 +vn -0.0000 -0.9886 -0.1506 +vn -0.0000 -0.0000 -1.0000 +vn 0.0000 0.9525 -0.3045 +vn -0.0000 -0.7761 -0.6306 +vn 0.4459 -0.7761 -0.4459 +vn 0.5688 0.5940 -0.5688 +vn 0.1065 -0.9886 -0.1065 +vn 0.2153 0.9525 -0.2153 +vn 0.6306 -0.7761 0.0000 +vn 0.8045 0.5940 0.0000 +vn 0.1506 -0.9886 0.0000 +vn 1.0000 -0.0000 0.0000 +vn 0.3045 0.9525 0.0000 +vn 0.4459 -0.7761 0.4459 +vn 0.5688 0.5940 0.5688 +vn 0.1065 -0.9886 0.1065 +vn 0.2153 0.9525 0.2153 +vn 0.0000 -0.7761 0.6306 +vn 0.0000 0.5940 0.8045 +vn 0.0000 -0.9886 0.1506 +vn 0.0000 0.0000 1.0000 +vn 0.0000 0.9525 0.3045 +vn -0.4459 -0.7761 0.4459 +vn -0.5688 0.5940 0.5688 +vn -0.1065 -0.9886 0.1065 +vn -0.2153 0.9525 0.2153 +vn -0.6306 -0.7761 0.0000 +vn -0.8045 0.5940 0.0000 +vn -0.1506 -0.9886 -0.0000 +vn -1.0000 0.0000 0.0000 +vn -0.3045 0.9525 0.0000 +vn -0.4459 -0.7761 -0.4459 +vn -0.5688 0.5940 -0.5688 +vn -0.1065 -0.9886 -0.1065 +vn -0.2153 0.9525 -0.2153 +g Sphere_Sphere.001_None +s off +f 1/1/1 2/2/1 4/3/1 3/4/1 +f 3/4/2 4/3/2 8/5/2 7/6/2 +f 7/6/3 8/5/3 6/7/3 5/8/3 +f 5/8/4 6/7/4 2/9/4 1/10/4 +f 5/11/5 1/12/5 10/13/5 12/14/5 +f 6/7/6 8/5/6 19/15/6 20/16/6 +f 11/17/3 12/14/3 16/18/3 15/19/3 +f 3/20/7 7/21/7 11/17/7 9/22/7 +f 1/23/8 3/20/8 9/22/8 10/24/8 +f 7/21/9 5/11/9 12/14/9 11/17/9 +f 10/24/1 9/22/1 13/25/1 14/26/1 +f 12/14/4 10/13/4 14/27/4 16/18/4 +f 9/22/2 11/17/2 15/19/2 13/25/2 +f 4/3/1 2/2/1 17/28/1 18/29/1 +f 2/9/4 6/7/4 20/16/4 17/30/4 +f 8/5/2 4/3/2 18/29/2 19/15/2 +f 21/31/4 22/32/4 24/33/4 23/34/4 +f 23/34/1 24/33/1 28/35/1 27/36/1 +f 27/36/2 28/35/2 26/37/2 25/38/2 +f 25/38/3 26/37/3 22/39/3 21/40/3 +f 25/41/9 21/42/9 30/43/9 32/44/9 +f 26/37/10 28/35/10 39/45/10 40/46/10 +f 31/47/2 32/44/2 36/48/2 35/49/2 +f 23/50/8 27/51/8 31/47/8 29/52/8 +f 21/53/5 23/50/5 29/52/5 30/54/5 +f 27/51/7 25/41/7 32/44/7 31/47/7 +f 30/54/4 29/52/4 33/55/4 34/56/4 +f 32/44/3 30/43/3 34/57/3 36/48/3 +f 29/52/1 31/47/1 35/49/1 33/55/1 +f 24/33/4 22/32/4 37/58/4 38/59/4 +f 22/39/3 26/37/3 40/46/3 37/60/3 +f 28/35/1 24/33/1 38/59/1 39/45/1 +f 41/61/2 42/62/2 44/63/2 43/64/2 +f 43/64/3 44/63/3 48/65/3 47/66/3 +f 47/66/4 48/65/4 46/67/4 45/68/4 +f 45/68/1 46/67/1 42/69/1 41/70/1 +f 45/71/8 41/72/8 50/73/8 52/74/8 +f 46/67/11 48/65/11 59/75/11 60/76/11 +f 51/77/4 52/74/4 56/78/4 55/79/4 +f 43/80/9 47/81/9 51/77/9 49/82/9 +f 41/83/7 43/80/7 49/82/7 50/84/7 +f 47/81/5 45/71/5 52/74/5 51/77/5 +f 50/84/2 49/82/2 53/85/2 54/86/2 +f 52/74/1 50/73/1 54/87/1 56/78/1 +f 49/82/3 51/77/3 55/79/3 53/85/3 +f 44/63/2 42/62/2 57/88/2 58/89/2 +f 42/69/1 46/67/1 60/76/1 57/90/1 +f 48/65/3 44/63/3 58/89/3 59/75/3 +f 61/91/3 62/92/3 64/93/3 63/94/3 +f 63/94/4 64/93/4 68/95/4 67/96/4 +f 67/96/1 68/95/1 66/97/1 65/98/1 +f 65/98/2 66/97/2 62/99/2 61/100/2 +f 65/101/7 61/102/7 70/103/7 72/104/7 +f 66/97/12 68/95/12 79/105/12 80/106/12 +f 71/107/1 72/104/1 76/108/1 75/109/1 +f 63/110/5 67/111/5 71/107/5 69/112/5 +f 61/113/9 63/110/9 69/112/9 70/114/9 +f 67/111/8 65/101/8 72/104/8 71/107/8 +f 70/114/3 69/112/3 73/115/3 74/116/3 +f 72/104/2 70/103/2 74/117/2 76/108/2 +f 69/112/4 71/107/4 75/109/4 73/115/4 +f 64/93/3 62/92/3 77/118/3 78/119/3 +f 62/99/2 66/97/2 80/106/2 77/120/2 +f 68/95/4 64/93/4 78/119/4 79/105/4 +f 113/121/13 81/122/13 84/123/13 85/124/13 +f 83/125/14 114/126/14 87/127/14 +f 82/128/15 113/129/15 85/130/15 86/131/15 +f 81/122/16 100/132/16 84/123/16 +f 114/126/17 82/133/17 86/134/17 87/127/17 +f 87/127/18 86/134/18 90/135/18 91/136/18 +f 85/124/19 84/123/19 88/137/19 89/138/19 +f 83/125/20 87/127/20 91/136/20 +f 86/131/3 85/130/3 89/139/3 90/140/3 +f 84/123/21 100/132/21 88/137/21 +f 91/136/22 90/135/22 94/141/22 95/142/22 +f 89/138/23 88/137/23 92/143/23 93/144/23 +f 83/125/24 91/136/24 95/142/24 +f 90/140/25 89/139/25 93/145/25 94/146/25 +f 88/137/26 100/132/26 92/143/26 +f 95/142/27 94/141/27 98/147/27 99/148/27 +f 93/144/28 92/143/28 96/149/28 97/150/28 +f 83/125/29 95/142/29 99/148/29 +f 94/146/4 93/145/4 97/151/4 98/152/4 +f 92/143/30 100/132/30 96/149/30 +f 99/148/31 98/147/31 103/153/31 104/154/31 +f 97/150/32 96/149/32 101/155/32 102/156/32 +f 83/125/33 99/148/33 104/154/33 +f 98/157/34 97/158/34 102/159/34 103/160/34 +f 96/149/35 100/132/35 101/155/35 +f 104/154/36 103/153/36 107/161/36 108/162/36 +f 102/156/37 101/155/37 105/163/37 106/164/37 +f 83/125/38 104/154/38 108/162/38 +f 103/160/1 102/159/1 106/165/1 107/166/1 +f 101/155/39 100/132/39 105/163/39 +f 108/162/40 107/161/40 111/167/40 112/168/40 +f 106/164/41 105/163/41 109/169/41 110/170/41 +f 83/125/42 108/162/42 112/168/42 +f 107/166/43 106/165/43 110/171/43 111/172/43 +f 105/163/44 100/132/44 109/169/44 +f 112/168/45 111/167/45 82/173/45 114/174/45 +f 110/170/46 109/169/46 81/175/46 113/176/46 +f 83/125/47 112/168/47 114/174/47 +f 111/172/2 110/171/2 113/177/2 82/178/2 +f 109/169/48 100/132/48 81/175/48 diff --git a/textures/drinks_silo.png b/textures/drinks_silo.png new file mode 100644 index 0000000..89cb589 Binary files /dev/null and b/textures/drinks_silo.png differ