coradelamouche
/
waspsaliva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch_item: better target slot selection

master
cora 2021-03-03 05:31:47 +01:00
parent 1cdb01a1f9
commit c15c97e0a7
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
builtin/client/wasplib.lua
View File

@ -211,21 +211,36 @@ function ws.find_named(inv, name)
end
end
end
local hotbar_slot=7
local hotbar_slot=8
function ws.to_hotbar(it)
local tpos=nil
local plinv = minetest.get_inventory("current_player")
for i, v in ipairs(plinv.main) do
if i<10 and v:is_empty() then
tpos = i
break
end
end
if tpos == nil then tpos=hotbar_slot end
local mv = InventoryAction("move")
mv:from("current_player", "main", it)
mv:to("current_player", "main", hotbar_slot)
mv:to("current_player", "main", tpos)
mv:apply()
return tpos
end
function ws.switch_to_item(itname)
if not minetest.localplayer then return false end
local plinv = minetest.get_inventory("current_player")
for i, v in ipairs(plinv.main) do
if i<10 and v:get_name() == itname then
minetest.localplayer:set_wield_index(i)
return true
end
end
local pos = ws.find_named(plinv.main, itname)
if pos then
ws.to_hotbar(pos)
minetest.localplayer:set_wield_index(hotbar_slot)
minetest.localplayer:set_wield_index(ws.to_hotbar(pos))
return true
end
return false
@ -242,27 +257,22 @@ function ws.switch_inv_or_echest(name,max_count)
if epos then
local tpos
for i, v in ipairs(plinv.main) do
if v:is_empty() then
if i < 9 and v:is_empty() then
tpos = i
break
end
end
if tpos and not plinv.main[hotbar_slot]:is_empty() then
local mov = InventoryAction("move")
mov:from("current_player", "enderchest", hotbar_slot)
mov:to("current_player", "main", tpos)
mov:apply()
end
if not tpos then tpos=hotbar_slot end
if tpos then
local mv = InventoryAction("move")
mv:from("current_player", "enderchest", epos)
mv:to("current_player", "main", hotbar_slot)
mv:to("current_player", "main", tpos)
if max_count then
mv:set_count(max_count)
end
mv:apply()
minetest.localplayer:set_wield_index(hotbar_slot)
minetest.localplayer:set_wield_index(tpos)
return true
end
end

1
clientmods/scaffold/init.lua
View File

@ -167,6 +167,7 @@ function scaffold.place_if_needed(items, pos, place)
-- need to place
if swapped and scaffold.can_place_at(pos) then
--minetest.after("0.05",place,pos)
place(pos)
return true
-- can't place