NathanSalapat
/
drinks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

license fixes.

master
NathanSalapat 2019-02-17 15:01:43 -06:00
parent 72ef9931ed
commit 9dcba4a932
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drink_machines.lua
View File

@ -330,7 +330,6 @@ function drinks.drinks_liquid_avail_sub(liq_vol, ves_typ, ves_vol, outputstack,
if fullness - (liq_vol*count) < 0 then
local able_to_fill = math.floor(fullness/liq_vol)
local leftover_count = count - able_to_fill
print ('we can fill '..able_to_fill..' and have '..leftover_count..' remaining.')
drinks.drinks_liquid_sub(liq_vol, ves_typ, ves_vol, pos, able_to_fill, leftover_count, outputstack)
elseif fullness - (liq_vol*count) >= 0 then
drinks.drinks_liquid_sub(liq_vol, ves_typ, ves_vol, pos, count, 0, outputstack)
@ -362,7 +361,6 @@ function drinks.drinks_liquid_avail_add(liq_vol, ves_typ, ves_vol, pos, inputsta
local avail_ves_vol = ves_vol - fullness
local can_empty = math.floor(avail_ves_vol/liq_vol)
local leftover_count = inputcount - can_empty
print ('we can use '..can_empty..' and have '..leftover_count..' remaining.')
drinks.drinks_liquid_add(liq_vol, ves_typ, ves_vol, pos, can_empty, leftover_count, inputstack)
elseif fullness + (liq_vol*inputcount) <= ves_vol then
drinks.drinks_liquid_add(liq_vol, ves_typ, ves_vol, pos, inputcount, 0, inputstack)
@ -483,7 +481,6 @@ minetest.register_node('drinks:liquid_barrel', {
local inputstack = stack:get_name()
local inputcount = stack:get_count()
local valid = string.sub(inputstack, 1, 7)
print (valid)
if valid == 'vessels' or valid == 'bucket:' then
return inputcount
else
@ -595,7 +592,6 @@ minetest.register_node('drinks:liquid_silo', {
local inputstack = stack:get_name()
local inputcount = stack:get_count()
local valid = string.sub(inputstack, 1, 7)
print (valid)
if valid == 'vessels' or valid == 'bucket:' then
return inputcount
else

9
license.txt
View File

@ -1,4 +1,4 @@
This mod and textures are licensed under CC by SA Nathan Salapat
Textures are licensed under CC by SA 3.0 Nathan Salapat
The drinking glass textures are modified from the vessels mod where it is licensed as;
Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
@ -7,3 +7,10 @@ Copyright (C) 2016 Thomas-S
The bucket textures are modified from the bucket mod where it is licensed as;
(CC BY-SA 3.0) celeron55
Code is licensed MIT,
Copyright 2019 Nathan Salapat
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

4
mod.conf
View File

@ -1 +1,5 @@
name = drinks
depends= buket,default,vessels,stairs
description = Adds a juice press and two juice storage containers. Most fruits and several veggies can be juiced. The resulting drinks can be 'ate' to gain health, or if you are using the thirsty mod, to regain hydration.
author = Nathan, Napiophelios
optional_depends = hunger,thirsty,plantlife,farming_plus,crops,farming,minetest_doc_modpack,fruits,ethereal