LizzyFleckenstein03
/
Memeclone
2
1
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

use mcl_util.call_on_rightclick insteed of current implementation

This commit is contained in:
AFCMS 2021-07-14 09:10:01 +02:00
parent 2624343c30
commit d26b1b1402
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mods/ITEMS/mcl_buckets/init.lua
View File

@ -3,6 +3,7 @@ local modname = minetest.get_current_modname()
local S = minetest.get_translator(modname) local S = minetest.get_translator(modname)
local modpath = minetest.get_modpath(modname) local modpath = minetest.get_modpath(modname)
-- Compatibility with old bucket mod
minetest.register_alias("bucket:bucket_empty", "mcl_buckets:bucket_empty") minetest.register_alias("bucket:bucket_empty", "mcl_buckets:bucket_empty")
minetest.register_alias("bucket:bucket_water", "mcl_buckets:bucket_water") minetest.register_alias("bucket:bucket_water", "mcl_buckets:bucket_water")
minetest.register_alias("bucket:bucket_lava", "mcl_buckets:bucket_lava") minetest.register_alias("bucket:bucket_lava", "mcl_buckets:bucket_lava")
@ -11,6 +12,7 @@ local mod_doc = minetest.get_modpath("doc")
local mod_mcl_core = minetest.get_modpath("mcl_core") local mod_mcl_core = minetest.get_modpath("mcl_core")
--local mod_mclx_core = minetest.get_modpath("mclx_core") --local mod_mclx_core = minetest.get_modpath("mclx_core")
-- Localize some functions for faster access
local vector = vector local vector = vector
local math = math local math = math
local string = string local string = string
@ -127,16 +129,15 @@ function mcl_buckets.register_liquid(def)
if pointed_thing.type ~= "node" then if pointed_thing.type ~= "node" then
return return
end end
-- Call on_rightclick if the pointed node defines it
local new_stack = mcl_util.call_on_rightclick(itemstack, user, pointed_thing)
if new_stack then
return new_stack
end
local node = minetest.get_node(pointed_thing.under) local node = minetest.get_node(pointed_thing.under)
local place_pos = pointed_thing.under local place_pos = pointed_thing.under
local nn = node.name local nn = node.name
-- Call on_rightclick if the pointed node defines it
if user and not user:get_player_control().sneak then
if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].on_rightclick then
return minetest.registered_nodes[nn].on_rightclick(place_pos, node, user, itemstack) or itemstack
end
end
local node_place local node_place
if type(def.source_place) == "function" then if type(def.source_place) == "function" then
@ -306,16 +307,20 @@ minetest.register_craftitem("mcl_buckets:bucket_empty", {
return itemstack return itemstack
end end
end]] end]]
-- Must be pointing to node
if pointed_thing.type ~= "node" then if pointed_thing.type ~= "node" then
return itemstack return itemstack
end end
-- Call on_rightclick if the pointed node defines it
local new_stack = mcl_util.call_on_rightclick(itemstack, user, pointed_thing)
if new_stack then
return new_stack
end
local node = minetest.get_node(pointed_thing.under) local node = minetest.get_node(pointed_thing.under)
local nn = node.name local nn = node.name
if user and not user:get_player_control().sneak then
if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].on_rightclick then
return minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
end
end
local new_bucket local new_bucket
local liquid_node = bucket_raycast(user) local liquid_node = bucket_raycast(user)
if liquid_node then if liquid_node then

2
mods/ITEMS/mcl_buckets/mod.conf
View File

@ -1,6 +1,6 @@
name = mcl_buckets name = mcl_buckets
author = Kahrl author = Kahrl
description = description =
depends = mcl_worlds depends = mcl_worlds, mcl_util
optional_depends = mcl_core, mclx_core, doc optional_depends = mcl_core, mclx_core, doc