minetest-mods/woodcutting-cd2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup treenodes_sorted in one place

Browse Source 
pass poshash to functions instead of recalculation
This commit is contained in:
Alexander Weber 2022-01-06 14:22:46 +01:00
parent 94eb6691cb
commit b265a9707a
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
init.lua
View File

@ -112,8 +112,7 @@ end
---------------------------------- ----------------------------------
--- Get the delay time before processing the node at pos --- Get the delay time before processing the node at pos
---------------------------------- ----------------------------------
function woodcutting_class:get_delay_time(pos) function woodcutting_class:get_delay_time(pos, poshash)
local poshash = minetest.hash_node_position(pos)
local nodedef = minetest.registered_nodes[self.treenodes_hashed[poshash]] local nodedef = minetest.registered_nodes[self.treenodes_hashed[poshash]]
local capabilities = self._player:get_wielded_item():get_tool_capabilities() local capabilities = self._player:get_wielded_item():get_tool_capabilities()
local dig_params = minetest.get_dig_params(nodedef.groups, capabilities) local dig_params = minetest.get_dig_params(nodedef.groups, capabilities)
@ -131,7 +130,7 @@ end
---------------------------------- ----------------------------------
--- Check node removal allowed --- Check node removal allowed
---------------------------------- ----------------------------------
function woodcutting_class:check_processing_allowed(pos) function woodcutting_class:check_processing_allowed(pos, poshash)
return vector.distance(pos, self._player:get_pos()) < self.player_distance return vector.distance(pos, self._player:get_pos()) < self.player_distance
and self._player:get_wielded_item():get_wear() <= self.wear_limit and self._player:get_wielded_item():get_wear() <= self.wear_limit
end end
@ -151,7 +150,20 @@ function woodcutting_class:select_next_tree_node()
end end
return aval < bval return aval < bval
end) end)
return self.treenodes_sorted[1]
-- Search for first unprocessed node. Cleanup tables
while true do
local pos = self.treenodes_sorted[1]
if not pos then --Finished
return
end
local poshash = minetest.hash_node_position(pos)
if not self.treenodes_hashed[poshash] then
table.remove(self.treenodes_sorted, 1)
else
return pos, poshash
end
end
end end
---------------------------------- ----------------------------------
@ -170,14 +182,13 @@ function woodcutting_class:process_woodcut_step()
return return
end end
local pos = process:select_next_tree_node() local pos, poshash = process:select_next_tree_node()
process:show_hud(pos) process:show_hud(pos)
if pos then if pos then
if process:check_processing_allowed(pos) then if process:check_processing_allowed(pos, poshash) then
-- dig the node -- dig the node
local delaytime = process:get_delay_time(pos) local delaytime = process:get_delay_time(pos, poshash)
if delaytime then if delaytime then
table.remove(process.treenodes_sorted, 1)
process:woodcut_node(pos, delaytime) process:woodcut_node(pos, delaytime)
else else
-- wait for right tool is used, try again -- wait for right tool is used, try again
@ -185,8 +196,6 @@ function woodcutting_class:process_woodcut_step()
end end
else else
-- just remove from hashed table and trigger the next step -- just remove from hashed table and trigger the next step
local poshash = minetest.hash_node_position(pos)
table.remove(process.treenodes_sorted, 1)
process.treenodes_hashed[poshash] = nil process.treenodes_hashed[poshash] = nil
process:process_woodcut_step() process:process_woodcut_step()
end end