From fb4fef783b605dcdc73554019ef46d8354614ad4 Mon Sep 17 00:00:00 2001 From: Louis Royer <55180044+louisroyer@users.noreply.github.com> Date: Sun, 26 Apr 2020 11:33:12 +0200 Subject: [PATCH] Shapeless locked chests crafts (chest + lockpad) (#530) --- technic_cnc/cnc.lua | 157 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 113 insertions(+), 44 deletions(-) diff --git a/technic_cnc/cnc.lua b/technic_cnc/cnc.lua index 642560f..1116aee 100644 --- a/technic_cnc/cnc.lua +++ b/technic_cnc/cnc.lua @@ -7,19 +7,70 @@ -- I could imagine some form of API allowing modders to come with their own node -- box definitions and easily stuff it in the this machine for production. -local technic_modpath = minetest.get_modpath("technic") +local S = technic_cnc.getter -local S = technic.getter +local allow_metadata_inventory_put +local allow_metadata_inventory_take +local allow_metadata_inventory_move +local can_dig +local desc_tr = S("CNC Machine") -minetest.register_craft({ - output = 'technic:cnc', - recipe = { - {'default:glass', 'technic:diamond_drill_head', 'default:glass'}, - {'technic:control_logic_unit', 'technic:machine_casing', 'basic_materials:motor'}, - {'technic:carbon_steel_ingot', 'technic:lv_cable', 'technic:carbon_steel_ingot'}, - }, -}) +if technic_cnc.use_technic then + minetest.register_craft({ + output = 'technic:cnc', + recipe = { + {'default:glass', 'technic:diamond_drill_head', 'default:glass'}, + {'technic:control_logic_unit', 'technic:machine_casing', 'basic_materials:motor'}, + {'technic:carbon_steel_ingot', 'technic:lv_cable', 'technic:carbon_steel_ingot'}, + }, + }) + allow_metadata_inventory_put = technic.machine_inventory_put + allow_metadata_inventory_take = technic.machine_inventory_take + allow_metadata_inventory_move = technic.machine_inventory_move + can_dig = technic.machine_can_dig + desc_tr = S("%s CNC Machine"):format("LV") +else + minetest.register_craft({ + output = 'technic:cnc', + recipe = { + {'default:glass', 'default:diamond', 'default:glass'}, + {'basic_materials:ic', 'default:steelblock', 'basic_materials:motor'}, + {'default:steel_ingot', 'default:mese', 'default:steel_ingot'}, + }, + }) + + allow_metadata_inventory_put = function(pos, listname, index, stack, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + return stack:get_count() + end + + allow_metadata_inventory_take = function(pos, listname, index, stack, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + return stack:get_count() + end + + allow_metadata_inventory_move = function(pos, from_list, from_index, + to_list, to_index, count, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + return count + end + + can_dig = function(pos, player) + if player and minetest.is_protected(pos, player:get_player_name()) then return false end + local meta = minetest.get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("dst") + and inv:is_empty("src") + and default.can_interact_with_node(player, pos) + end +end local shape = {} local onesize_products = { @@ -41,7 +92,7 @@ twocurvededge = 1, } local twosize_products = { - element_straight = 4, + element_straight = 2, element_end = 2, element_cross = 1, element_t = 1, @@ -91,30 +142,32 @@ "listring[current_name;src]".. "listring[current_player;main]" -local size = 1; - -- The form handler is declared here because we need it in both the inactive and active modes -- in order to be able to change programs wile it is running. local function form_handler(pos, formname, fields, sender) + local meta = minetest.get_meta(pos) + -- REGISTER MILLING PROGRAMS AND OUTPUTS: ------------------------------------------ -- Program for half/full size if fields["full"] then - size = 1 + meta:set_int("size", 1) return end if fields["half"] then - size = 2 + meta:set_int("size", 2) return end -- Resolve the node name and the number of items to make - local meta = minetest.get_meta(pos) local inv = meta:get_inventory() local inputstack = inv:get_stack("src", 1) local inputname = inputstack:get_name() local multiplier = 0 + local size = meta:get_int("size") + if size < 1 then size = 1 end + for k, _ in pairs(fields) do -- Set a multipier for the half/full size capable blocks if twosize_products[k] ~= nil then @@ -140,7 +193,19 @@ break end end - return + + if not technic_cnc.use_technic then + local result = meta:get_string("cnc_product") + + if not inv:is_empty("src") + and minetest.registered_nodes[result] + and inv:room_for_item("dst", result) then + local srcstack = inv:get_stack("src", 1) + srcstack:take_item() + inv:set_stack("src", 1, srcstack) + inv:add_item("dst", result.." "..meta:get_int("cnc_multiplier")) + end + end end -- Action code performing the transformation @@ -148,7 +213,7 @@ local meta = minetest.get_meta(pos) local inv = meta:get_inventory() local eu_input = meta:get_int("LV_EU_input") - local machine_name = S("%s CNC Machine"):format("LV") + local machine_name = desc_tr local machine_node = "technic:cnc" local demand = 450 @@ -183,7 +248,7 @@ -- The actual block inactive state minetest.register_node(":technic:cnc", { - description = S("%s CNC Machine"):format("LV"), + description = desc_tr, tiles = {"technic_cnc_top.png", "technic_cnc_bottom.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front.png"}, groups = {cracky=2, technic_machine=1, technic_lv=1}, @@ -192,40 +257,44 @@ legacy_facedir_simple = true, on_construct = function(pos) local meta = minetest.get_meta(pos) - meta:set_string("infotext", S("%s CNC Machine"):format("LV")) + meta:set_string("infotext", desc_tr) meta:set_float("technic_power_machine", 1) meta:set_string("formspec", cnc_formspec) local inv = meta:get_inventory() inv:set_size("src", 1) inv:set_size("dst", 4) end, - can_dig = technic.machine_can_dig, - allow_metadata_inventory_put = technic.machine_inventory_put, - allow_metadata_inventory_take = technic.machine_inventory_take, - allow_metadata_inventory_move = technic.machine_inventory_move, + can_dig = can_dig, + allow_metadata_inventory_put = allow_metadata_inventory_put, + allow_metadata_inventory_take = allow_metadata_inventory_take, + allow_metadata_inventory_move = allow_metadata_inventory_move, on_receive_fields = form_handler, - technic_run = run, + technic_run = technic_cnc.use_technic and run, }) -- Active state block -minetest.register_node(":technic:cnc_active", { - description = S("%s CNC Machine"):format("LV"), - tiles = {"technic_cnc_top_active.png", "technic_cnc_bottom.png", "technic_cnc_side.png", - "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front_active.png"}, - groups = {cracky=2, technic_machine=1, technic_lv=1, not_in_creative_inventory=1}, - connect_sides = {"bottom", "back", "left", "right"}, - paramtype2 = "facedir", - drop = "technic:cnc", - legacy_facedir_simple = true, - can_dig = technic.machine_can_dig, - allow_metadata_inventory_put = technic.machine_inventory_put, - allow_metadata_inventory_take = technic.machine_inventory_take, - allow_metadata_inventory_move = technic.machine_inventory_move, - on_receive_fields = form_handler, - technic_run = run, - technic_disabled_machine_name = "technic:cnc", -}) +if technic_cnc.use_technic then -technic.register_machine("LV", "technic:cnc", technic.receiver) -technic.register_machine("LV", "technic:cnc_active", technic.receiver) + minetest.register_node(":technic:cnc_active", { + description = desc_tr, + tiles = {"technic_cnc_top_active.png", "technic_cnc_bottom.png", "technic_cnc_side.png", + "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front_active.png"}, + groups = {cracky=2, technic_machine=1, technic_lv=1, not_in_creative_inventory=1}, + connect_sides = {"bottom", "back", "left", "right"}, + paramtype2 = "facedir", + drop = "technic:cnc", + legacy_facedir_simple = true, + can_dig = can_dig, + allow_metadata_inventory_put = allow_metadata_inventory_put, + allow_metadata_inventory_take = allow_metadata_inventory_take, + allow_metadata_inventory_move = allow_metadata_inventory_move, + on_receive_fields = form_handler, + technic_run = run, + technic_disabled_machine_name = "technic:cnc", + }) + technic.register_machine("LV", "technic:cnc", technic.receiver) + technic.register_machine("LV", "technic:cnc_active", technic.receiver) +else + minetest.register_alias("technic:cnc_active", "technic:cnc") +end -- Gitblit v1.8.0