CableGuy67
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Return items to main inv when closing crafting 

This is a MC 1.12 feature.
This commit is contained in:
Wuzzy 2017-07-25 18:00:49 +02:00
parent b031f478f8
commit aea8bb8305
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mods/HUD/mcl_inventory/init.lua
View File

@ -3,8 +3,14 @@ mcl_inventory = {}
local show_armor = false local show_armor = false
if minetest.get_modpath("3d_armor") ~= nil then show_armor = true end if minetest.get_modpath("3d_armor") ~= nil then show_armor = true end
local function item_drop(itemstack, dropper, pos) -- Returns a single itemstack in the given inventory to the main inventory, or drop it when there's no space left
local function return_item(itemstack, dropper, pos, inv)
if dropper:is_player() then if dropper:is_player() then
-- Return to main inventory
if inv:room_for_item("main", itemstack) then
inv:add_item("main", itemstack)
else
-- Drop item on the ground
local v = dropper:get_look_dir() local v = dropper:get_look_dir()
local p = {x=pos.x, y=pos.y+1.2, z=pos.z} local p = {x=pos.x, y=pos.y+1.2, z=pos.z}
p.x = p.x+(math.random(1,3)*0.2) p.x = p.x+(math.random(1,3)*0.2)
@ -17,16 +23,19 @@ local function item_drop(itemstack, dropper, pos)
obj:setvelocity(v) obj:setvelocity(v)
obj:get_luaentity()._insta_collect = false obj:get_luaentity()._insta_collect = false
end end
end
else else
-- Fallback for unexpected cases
minetest.add_item(pos, itemstack) minetest.add_item(pos, itemstack)
end end
return itemstack return itemstack
end end
local function drop_fields(player, name) -- Return items in the given inventory list (name) to the main inventory, or drop them if there is no space left
local function return_fields(player, name)
local inv = player:get_inventory() local inv = player:get_inventory()
for i,stack in ipairs(inv:get_list(name)) do for i,stack in ipairs(inv:get_list(name)) do
item_drop(stack, player, player:getpos()) return_item(stack, player, player:getpos(), inv)
stack:clear() stack:clear()
inv:set_stack(name, i, stack) inv:set_stack(name, i, stack)
end end
@ -105,7 +114,7 @@ end
-- Drop items in craft grid and reset inventory on closing -- Drop items in craft grid and reset inventory on closing
minetest.register_on_player_receive_fields(function(player, formname, fields) minetest.register_on_player_receive_fields(function(player, formname, fields)
if fields.quit then if fields.quit then
drop_fields(player,"craft") return_fields(player,"craft")
if not minetest.setting_getbool("creative_mode") and (formname == "" or formname == "main") then if not minetest.setting_getbool("creative_mode") and (formname == "" or formname == "main") then
set_inventory(player) set_inventory(player)
end end
@ -114,7 +123,7 @@ end)
-- Drop crafting grid items on leaving -- Drop crafting grid items on leaving
minetest.register_on_leaveplayer(function(player) minetest.register_on_leaveplayer(function(player)
drop_fields(player, "craft") return_fields(player, "craft")
end) end)
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
@ -151,7 +160,7 @@ minetest.register_on_joinplayer(function(player)
items remaining in the crafting grid from the previous join; this is likely items remaining in the crafting grid from the previous join; this is likely
when the server has been shutdown and the server didn't clean up the player when the server has been shutdown and the server didn't clean up the player
inventories. ]] inventories. ]]
drop_fields(player, "craft") return_fields(player, "craft")
end) end)
if minetest.setting_getbool("creative_mode") then if minetest.setting_getbool("creative_mode") then