mdk
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Hoes and shovels now respect protection 

That is, their special action do so.
This commit is contained in:
Wuzzy 2019-03-27 13:07:33 +01:00
parent c6e671376d
commit 8533ff0b75
2 changed files with 36 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
mods/ITEMS/mcl_farming/hoes.lua
View File

@ -25,6 +25,30 @@ local function create_soil(pos, inv)
return false return false
end end
local hoe_on_place_function = function(wear_divisor)
return function(itemstack, user, pointed_thing)
-- Call on_rightclick if the pointed node defines it
local node = minetest.get_node(pointed_thing.under)
if user and not user:get_player_control().sneak then
if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
end
end
if minetest.is_protected(pointed_thing.under, user:get_player_name()) then
minetest.record_protection_violation(pointed_thing.under, user:get_player_name())
return itemstack
end
if create_soil(pointed_thing.under, user:get_inventory()) then
if not minetest.settings:get_bool("creative_mode") then
itemstack:add_wear(65535/wear_divisor)
end
return itemstack
end
end
end
local hoe_longdesc = S("Hoes are essential tools for growing crops. They are used to create farmland in order to plant seeds on it. Hoes can also be used as very weak weapons in a pinch.") local hoe_longdesc = S("Hoes are essential tools for growing crops. They are used to create farmland in order to plant seeds on it. Hoes can also be used as very weak weapons in a pinch.")
local hoe_usagehelp = S("Use the hoe on a cultivatable block (by rightclicking it) to turn it into farmland. Dirt, grass blocks and grass paths are cultivatable blocks. Using a hoe on coarse dirt turns it into dirt.") local hoe_usagehelp = S("Use the hoe on a cultivatable block (by rightclicking it) to turn it into farmland. Dirt, grass blocks and grass paths are cultivatable blocks. Using a hoe on coarse dirt turns it into dirt.")
@ -34,22 +58,7 @@ minetest.register_tool("mcl_farming:hoe_wood", {
_doc_items_usagehelp = hoe_usagehelp, _doc_items_usagehelp = hoe_usagehelp,
_doc_items_hidden = false, _doc_items_hidden = false,
inventory_image = "farming_tool_woodhoe.png", inventory_image = "farming_tool_woodhoe.png",
on_place = function(itemstack, user, pointed_thing) on_place = hoe_on_place_function(60),
-- Call on_rightclick if the pointed node defines it
local node = minetest.get_node(pointed_thing.under)
if user and not user:get_player_control().sneak then
if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
end
end
if create_soil(pointed_thing.under, user:get_inventory()) then
if not minetest.settings:get_bool("creative_mode") then
itemstack:add_wear(65535/60)
end
return itemstack
end
end,
groups = { tool=1, hoe=1 }, groups = { tool=1, hoe=1 },
tool_capabilities = { tool_capabilities = {
full_punch_interval = 1, full_punch_interval = 1,
@ -85,22 +94,7 @@ minetest.register_tool("mcl_farming:hoe_stone", {
_doc_items_longdesc = hoe_longdesc, _doc_items_longdesc = hoe_longdesc,
_doc_items_usagehelp = hoe_usagehelp, _doc_items_usagehelp = hoe_usagehelp,
inventory_image = "farming_tool_stonehoe.png", inventory_image = "farming_tool_stonehoe.png",
on_place = function(itemstack, user, pointed_thing) on_place = hoe_on_place_function(132),
-- Call on_rightclick if the pointed node defines it
local node = minetest.get_node(pointed_thing.under)
if user and not user:get_player_control().sneak then
if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
end
end
if create_soil(pointed_thing.under, user:get_inventory()) then
if not minetest.settings:get_bool("creative_mode") then
itemstack:add_wear(65535/132)
end
return itemstack
end
end,
groups = { tool=1, hoe=1 }, groups = { tool=1, hoe=1 },
tool_capabilities = { tool_capabilities = {
full_punch_interval = 0.5, full_punch_interval = 0.5,
@ -131,22 +125,7 @@ minetest.register_tool("mcl_farming:hoe_iron", {
_doc_items_longdesc = hoe_longdesc, _doc_items_longdesc = hoe_longdesc,
_doc_items_usagehelp = hoe_usagehelp, _doc_items_usagehelp = hoe_usagehelp,
inventory_image = "farming_tool_steelhoe.png", inventory_image = "farming_tool_steelhoe.png",
on_place = function(itemstack, user, pointed_thing) on_place = hoe_on_place_function(251),
-- Call on_rightclick if the pointed node defines it
local node = minetest.get_node(pointed_thing.under)
if user and not user:get_player_control().sneak then
if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
end
end
if create_soil(pointed_thing.under, user:get_inventory()) then
if not minetest.settings:get_bool("creative_mode") then
itemstack:add_wear(65535/251)
end
return itemstack
end
end,
groups = { tool=1, hoe=1 }, groups = { tool=1, hoe=1 },
tool_capabilities = { tool_capabilities = {
-- 1/3 -- 1/3
@ -185,22 +164,7 @@ minetest.register_tool("mcl_farming:hoe_gold", {
_doc_items_longdesc = hoe_longdesc, _doc_items_longdesc = hoe_longdesc,
_doc_items_usagehelp = hoe_usagehelp, _doc_items_usagehelp = hoe_usagehelp,
inventory_image = "farming_tool_goldhoe.png", inventory_image = "farming_tool_goldhoe.png",
on_place = function(itemstack, user, pointed_thing) on_place = hoe_on_place_function(33),
-- Call on_rightclick if the pointed node defines it
local node = minetest.get_node(pointed_thing.under)
if user and not user:get_player_control().sneak then
if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
end
end
if create_soil(pointed_thing.under, user:get_inventory()) then
if not minetest.settings:get_bool("creative_mode") then
itemstack:add_wear(65535/33)
end
return itemstack
end
end,
groups = { tool=1, hoe=1 }, groups = { tool=1, hoe=1 },
tool_capabilities = { tool_capabilities = {
full_punch_interval = 1, full_punch_interval = 1,
@ -240,22 +204,7 @@ minetest.register_tool("mcl_farming:hoe_diamond", {
_doc_items_longdesc = hoe_longdesc, _doc_items_longdesc = hoe_longdesc,
_doc_items_usagehelp = hoe_usagehelp, _doc_items_usagehelp = hoe_usagehelp,
inventory_image = "farming_tool_diamondhoe.png", inventory_image = "farming_tool_diamondhoe.png",
on_place = function(itemstack, user, pointed_thing) on_place = hoe_on_place_function(1562),
-- Call on_rightclick if the pointed node defines it
local node = minetest.get_node(pointed_thing.under)
if user and not user:get_player_control().sneak then
if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
end
end
if create_soil(pointed_thing.under, user:get_inventory()) then
if not minetest.settings:get_bool("creative_mode") then
itemstack:add_wear(65535/1562)
end
return itemstack
end
end,
groups = { tool=1, hoe=1 }, groups = { tool=1, hoe=1 },
tool_capabilities = { tool_capabilities = {
full_punch_interval = 0.25, full_punch_interval = 0.25,

8
mods/ITEMS/mcl_tools/init.lua
View File

@ -179,12 +179,18 @@ local make_grass_path = function(itemstack, placer, pointed_thing)
-- Only make grass path if tool used on side or top of target node -- Only make grass path if tool used on side or top of target node
if pointed_thing.above.y < pointed_thing.under.y then if pointed_thing.above.y < pointed_thing.under.y then
return return itemstack
end end
if (minetest.get_item_group(node.name, "grass_block") == 1) then if (minetest.get_item_group(node.name, "grass_block") == 1) then
local above = table.copy(pointed_thing.under) local above = table.copy(pointed_thing.under)
above.y = above.y + 1 above.y = above.y + 1
if minetest.get_node(above).name == "air" then if minetest.get_node(above).name == "air" then
if minetest.is_protected(pointed_thing.under, placer:get_player_name()) then
minetest.record_protection_violation(pointed_thing.under, placer:get_player_name())
return itemstack
end
if not minetest.settings:get_bool("creative_mode") then if not minetest.settings:get_bool("creative_mode") then
-- Add wear, as if digging a level 0 shovely node -- Add wear, as if digging a level 0 shovely node
local toolname = itemstack:get_name() local toolname = itemstack:get_name()