forked from VoxeLibre/VoxeLibre
Added the ability to stonecut up to full stack
This commit is contained in:
parent
e324a1a74b
commit
af2f58248f
|
@ -92,6 +92,20 @@ local function fieldname_to_itemname(fieldname)
|
||||||
return string.gsub(fieldname, "__", ":")
|
return string.gsub(fieldname, "__", ":")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Get the player configured stack size when taking items from creative inventory
|
||||||
|
---@param player mt.PlayerObjectRef
|
||||||
|
---@return integer
|
||||||
|
local function get_stack_size(player)
|
||||||
|
return player:get_meta():get_int("mcl_stonecutter:switch_stack")
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Set the player configured stack size when taking items from creative inventory
|
||||||
|
---@param player mt.PlayerObjectRef
|
||||||
|
---@param n integer
|
||||||
|
local function set_stack_size(player, n)
|
||||||
|
player:get_meta():set_int("mcl_stonecutter:switch_stack", n)
|
||||||
|
end
|
||||||
|
|
||||||
---Build the formspec for the stonecutter with given output button
|
---Build the formspec for the stonecutter with given output button
|
||||||
---@param player mt.PlayerObjectRef
|
---@param player mt.PlayerObjectRef
|
||||||
---@param items? table<string, integer>
|
---@param items? table<string, integer>
|
||||||
|
@ -142,6 +156,11 @@ local function build_stonecutter_formspec(player, items)
|
||||||
math.max(math.floor(#items / 4) + 1 - 4, 0) .. ";smallstep=1;largesteps=1]",
|
math.max(math.floor(#items / 4) + 1 - 4, 0) .. ";smallstep=1;largesteps=1]",
|
||||||
"scrollbar[7.625,0.7;0.75,3.6;vertical;scroll;0]",
|
"scrollbar[7.625,0.7;0.75,3.6;vertical;scroll;0]",
|
||||||
|
|
||||||
|
-- Switch stack size button
|
||||||
|
"image_button[9.75,0.75;1,1;mcl_stonecutter_saw.png^[verticalframe:3:1;__switch_stack;]",
|
||||||
|
"label[10.25,1.5;" .. C("#FFFFFF", tostring(get_stack_size(player))) .. "]",
|
||||||
|
"tooltip[__switch_stack;" .. S("Switch stack size") .. "]",
|
||||||
|
|
||||||
-- Output slot
|
-- Output slot
|
||||||
mcl_formspec.get_itemslot_bg_v4(9.75, 2, 1, 1, 0.2),
|
mcl_formspec.get_itemslot_bg_v4(9.75, 2, 1, 1, 0.2),
|
||||||
"list[current_player;stonecutter_output;9.75,2;1,1;]",
|
"list[current_player;stonecutter_output;9.75,2;1,1;]",
|
||||||
|
@ -209,13 +228,16 @@ function update_stonecutter_slots(player)
|
||||||
local input = inv:get_stack("stonecutter_input", 1)
|
local input = inv:get_stack("stonecutter_input", 1)
|
||||||
local recipes = mcl_stonecutter.registered_recipes[input:get_name()]
|
local recipes = mcl_stonecutter.registered_recipes[input:get_name()]
|
||||||
local output_item = meta:get_string("stonecutter_selected")
|
local output_item = meta:get_string("stonecutter_selected")
|
||||||
|
local stack_size = meta:get_int("mcl_stonecutter:switch_stack")
|
||||||
|
|
||||||
if recipes then
|
if recipes then
|
||||||
if output_item then
|
if output_item then
|
||||||
local recipe = recipes[output_item]
|
local recipe = recipes[output_item]
|
||||||
if recipe then
|
if recipe then
|
||||||
local cut_item = ItemStack(output_item)
|
local cut_item = ItemStack(output_item)
|
||||||
cut_item:set_count(recipe)
|
local count = math.min(math.floor(stack_size/recipe), input:get_count()) * recipe
|
||||||
|
if count < recipe then count = recipe end
|
||||||
|
cut_item:set_count(count)
|
||||||
inv:set_stack("stonecutter_output", 1, cut_item)
|
inv:set_stack("stonecutter_output", 1, cut_item)
|
||||||
else
|
else
|
||||||
inv:set_stack("stonecutter_output", 1, nil)
|
inv:set_stack("stonecutter_output", 1, nil)
|
||||||
|
@ -240,6 +262,17 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if fields.__switch_stack then
|
||||||
|
local switch = 1
|
||||||
|
if get_stack_size(player) == 1 then
|
||||||
|
switch = 64
|
||||||
|
end
|
||||||
|
set_stack_size(player, switch)
|
||||||
|
update_stonecutter_slots(player)
|
||||||
|
mcl_stonecutter.show_stonecutter_form(player)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
for field_name, value in pairs(fields) do
|
for field_name, value in pairs(fields) do
|
||||||
if field_name ~= "scroll" then
|
if field_name ~= "scroll" then
|
||||||
local itemname = fieldname_to_itemname(field_name)
|
local itemname = fieldname_to_itemname(field_name)
|
||||||
|
@ -277,10 +310,15 @@ function remove_from_input(player, inventory)
|
||||||
local meta = player:get_meta()
|
local meta = player:get_meta()
|
||||||
local selected = meta:get_string("stonecutter_selected")
|
local selected = meta:get_string("stonecutter_selected")
|
||||||
local istack = inventory:get_stack("stonecutter_input", 1)
|
local istack = inventory:get_stack("stonecutter_input", 1)
|
||||||
|
local recipes = mcl_stonecutter.registered_recipes[istack:get_name()]
|
||||||
|
local stack_size = meta:get_int("mcl_stonecutter:switch_stack")
|
||||||
|
|
||||||
-- selected should normally never be nil, but just in case
|
-- selected should normally never be nil, but just in case
|
||||||
if selected then
|
if selected and recipes then
|
||||||
istack:set_count(math.max(0, istack:get_count() - 1))
|
local recipe = recipes[selected]
|
||||||
|
local count = math.floor(stack_size/recipe)
|
||||||
|
if count < 1 then count = 1 end
|
||||||
|
istack:set_count(math.max(0, istack:get_count() - count))
|
||||||
inventory:set_stack("stonecutter_input", 1, istack)
|
inventory:set_stack("stonecutter_input", 1, istack)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue