From 718a5beda197cd0a775fd41aedfb5b1bbd5d1d8b Mon Sep 17 00:00:00 2001 From: ZettaScript <contact@zettascript.org> Date: Thu, 20 Oct 2022 17:56:10 +0200 Subject: [PATCH] Supply converter: demany only the needed power (#577) --- technic/tools/cans.lua | 101 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 67 insertions(+), 34 deletions(-) diff --git a/technic/tools/cans.lua b/technic/tools/cans.lua index f46a401..6507f7a 100644 --- a/technic/tools/cans.lua +++ b/technic/tools/cans.lua @@ -12,6 +12,14 @@ itemstack:set_wear(temp) end +local function get_can_level(itemstack) + if itemstack:get_metadata() == "" then + return 0 + else + return tonumber(itemstack:get_metadata()) + end +end + function technic.register_can(d) local data = {} for k, v in pairs(d) do data[k] = v end @@ -22,46 +30,53 @@ wear_represents = "content_level", liquids_pointable = true, on_use = function(itemstack, user, pointed_thing) - if pointed_thing.type ~= "node" then + if pointed_thing.type ~= "node" then return end + local node = minetest.get_node(pointed_thing.under) + if node.name ~= data.liquid_source_name then return end + local charge = get_can_level(itemstack) + if charge == data.can_capacity then return end + if minetest.is_protected(pointed_thing.under, user:get_player_name()) then + minetest.log("action", user:get_player_name().. + " tried to take "..node.name.. + " at protected position "..minetest.pos_to_string(pointed_thing.under).. + " with a "..data.can_name) return end - node = minetest.get_node(pointed_thing.under) - - local charge = nil - if itemstack:get_metadata() == "" then - charge = 0 - else - charge = tonumber(itemstack:get_metadata()) + minetest.remove_node(pointed_thing.under) + charge = charge + 1 + itemstack:set_metadata(tostring(charge)) + set_can_wear(itemstack, charge, data.can_capacity) + return itemstack + end, + on_place = function(itemstack, user, pointed_thing) + if pointed_thing.type ~= "node" then return end + local pos = pointed_thing.under + local node_name = minetest.get_node(pos).name + local def = minetest.registered_nodes[node_name] or {} + if def.on_rightclick and user and not user:get_player_control().sneak then + return def.on_rightclick(pos, minetest.get_node(pos), user, itemstack, pointed_thing) end - if node.name == data.liquid_source_name then - if charge < data.can_capacity then - minetest.remove_node(pointed_thing.under) - charge = charge + 1 - itemstack:set_metadata(tostring(charge)) - set_can_wear(itemstack, charge, data.can_capacity) - end - return itemstack + if not def.buildable_to or node_name == data.liquid_source_name then + pos = pointed_thing.above + node_name = minetest.get_node(pos).name + def = minetest.registered_nodes[node_name] or {} + -- Try to place node above the pointed source, or abort. + if not def.buildable_to or node_name == data.liquid_source_name then return end end - if charge == 0 then + local charge = get_can_level(itemstack) + if charge == 0 then return end + if minetest.is_protected(pos, user:get_player_name()) then + minetest.log("action", user:get_player_name().. + " tried to place "..data.liquid_source_name.. + " at protected position "..minetest.pos_to_string(pos).. + " with a "..data.can_name) return end - - if node.name == data.liquid_flowing_name then - minetest.set_node(pointed_thing.under, {name=data.liquid_source_name}) - charge = charge - 1 - itemstack:set_metadata(tostring(charge)) - set_can_wear(itemstack, charge, data.can_capacity) - return itemstack - end - - node = minetest.get_node(pointed_thing.above) - if node.name == "air" then - minetest.set_node(pointed_thing.above, {name=data.liquid_source_name}) - charge = charge - 1 - itemstack:set_metadata(tostring(charge)) - set_can_wear(itemstack, charge, data.can_capacity) - return itemstack - end + minetest.set_node(pos, {name=data.liquid_source_name}) + charge = charge - 1 + itemstack:set_metadata(tostring(charge)) + set_can_wear(itemstack, charge, data.can_capacity) + return itemstack end, on_refill = function(stack) stack:set_metadata(tostring(data.can_capacity)) @@ -106,3 +121,21 @@ {'technic:zinc_ingot', 'technic:stainless_steel_ingot', 'technic:zinc_ingot'}, } }) + +technic.register_can({ + can_name = 'technic:river_water_can', + can_description = S("River Water Can"), + can_inventory_image = "technic_river_water_can.png", + can_capacity = 16, + liquid_source_name = "default:river_water_source", + liquid_flowing_name = "default:river_water_flowing", +}) + +minetest.register_craft({ + output = 'technic:river_water_can 1', + recipe = { + {'technic:zinc_ingot', 'technic:rubber', 'technic:zinc_ingot'}, + {'default:steel_ingot', '', 'default:steel_ingot'}, + {'technic:zinc_ingot', 'default:steel_ingot', 'technic:zinc_ingot'}, + } +}) -- Gitblit v1.8.0