From 167ab93905a8206be2a5f4d9619c4b9f710bb211 Mon Sep 17 00:00:00 2001 From: SmallJoker <mk939@ymail.com> Date: Tue, 14 Jun 2022 20:49:21 +0200 Subject: [PATCH] Maintenance: Remove depends.txt and error on old MT versions --- technic/machines/HV/quarry.lua | 387 +++++++++++++++++++++++++++++++++---------------------- 1 files changed, 232 insertions(+), 155 deletions(-) diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua index 09565f0..1bf1ad6 100644 --- a/technic/machines/HV/quarry.lua +++ b/technic/machines/HV/quarry.lua @@ -1,202 +1,279 @@ local S = technic.getter +local tube_entry = "^pipeworks_tube_connection_metallic.png" +local cable_entry = "^technic_cable_connection_overlay.png" + minetest.register_craft({ recipe = { - {"default:steelblock", "pipeworks:filter", "default:steelblock"}, - {"default:steelblock", "technic:motor", "default:steelblock"}, - {"default:steelblock", "technic:diamond_drill_head", "default:steelblock"}}, + {"technic:carbon_plate", "pipeworks:filter", "technic:composite_plate"}, + {"basic_materials:motor", "technic:machine_casing", "technic:diamond_drill_head"}, + {"technic:carbon_steel_block", "technic:hv_cable", "technic:carbon_steel_block"}}, output = "technic:quarry", }) local quarry_dig_above_nodes = 3 -- How far above the quarry we will dig nodes local quarry_max_depth = 100 +local quarry_demand = 10000 +local quarry_eject_dir = vector.new(0, 1, 0) -local function get_quarry_formspec(size) - return "size[3,1.5]".. - "field[1,0.5;2,1;size;Radius;"..size.."]".. - "button[0,1;3,1;toggle;"..S("Enable/Disable").."]" +local function set_quarry_formspec(meta) + local radius = meta:get_int("size") + local formspec = "size[6,4.3]".. + "list[context;cache;0,1;4,3;]".. + "item_image[4.8,0;1,1;technic:quarry]".. + "label[0,0.2;"..S("%s Quarry"):format("HV").."]".. + "field[4.3,3.5;2,1;size;"..S("Radius:")..";"..radius.."]" + if meta:get_int("enabled") == 0 then + formspec = formspec.."button[4,1;2,1;enable;"..S("Disabled").."]" + else + formspec = formspec.."button[4,1;2,1;disable;"..S("Enabled").."]" + end + local diameter = radius*2 + 1 + local nd = meta:get_int("dug") + local rel_y = quarry_dig_above_nodes - math.floor(nd / (diameter*diameter)) + formspec = formspec.."label[0,4;"..minetest.formspec_escape( + nd == 0 and S("Digging not started") or + (rel_y < -quarry_max_depth and S("Digging finished") or + (meta:get_int("purge_on") == 1 and S("Purging cache") or + S("Digging %d m "..(rel_y > 0 and "above" or "below").." machine") + :format(math.abs(rel_y)))) + ).."]" + formspec = formspec.."button[4,2;2,1;restart;"..S("Restart").."]" + meta:set_string("formspec", formspec) +end + +local function set_quarry_demand(meta) + local radius = meta:get_int("size") + local diameter = radius*2 + 1 + local machine_name = S("%s Quarry"):format("HV") + local do_purge = meta:get_int("purge_on") == 1 + if meta:get_int("enabled") == 0 or do_purge then + local infotext = do_purge and + S("%s purging cache") or S("%s Disabled") + meta:set_string("infotext", infotext:format(machine_name)) + meta:set_int("HV_EU_demand", 0) + elseif meta:get_int("dug") == diameter*diameter * (quarry_dig_above_nodes+1+quarry_max_depth) then + meta:set_string("infotext", S("%s Finished"):format(machine_name)) + meta:set_int("HV_EU_demand", 0) + else + local infotext = meta:get_int("HV_EU_input") >= quarry_demand + and S("%s Active") or S("%s Unpowered") + meta:set_string("infotext", infotext:format(machine_name)) + meta:set_int("HV_EU_demand", quarry_demand) + end end local function quarry_receive_fields(pos, formname, fields, sender) + local player_name = sender:get_player_name() + if minetest.is_protected(pos, player_name) then + minetest.chat_send_player(player_name, "You are not allowed to edit this!") + minetest.record_protection_violation(pos, player_name) + return + end local meta = minetest.get_meta(pos) - local size = tonumber(fields.size) or 0 - - if fields.toggle then - if meta:get_int("enabled") == 0 then - meta:set_int("enabled", 1) - else - meta:set_int("enabled", 0) + if fields.size and string.find(fields.size, "^[0-9]+$") then + local size = tonumber(fields.size) + if size >= 2 and size <= 8 and size ~= meta:get_int("size") then + meta:set_int("size", size) + meta:set_int("dug", 0) end end - - -- Smallest size is 2. Largest is 8. - size = math.max(size, 2) - size = math.min(size, 8) - - if meta:get_int("size") ~= size then - meta:set_int("size", size) - meta:set_string("formspec", get_quarry_formspec(size)) + if fields.enable then meta:set_int("enabled", 1) end + if fields.disable then meta:set_int("enabled", 0) end + if fields.restart then + meta:set_int("dug", 0) + meta:set_int("purge_on", 1) end + set_quarry_formspec(meta) + set_quarry_demand(meta) end -local function get_quarry_center(pos, size) - local node = minetest.get_node(pos) - local back_dir = minetest.facedir_to_dir(node.param2) - local relative_center = vector.multiply(back_dir, size + 1) - local center = vector.add(pos, relative_center) - return center -end - -local function gen_next_digpos(center, digpos, size) - digpos.x = digpos.x + 1 - if digpos.x > center.x + size then - digpos.x = center.x - size - digpos.z = digpos.z + 1 - end - if digpos.z > center.z + size then - digpos.x = center.x - size - digpos.z = center.z - size - digpos.y = digpos.y - 1 - end -end - -local function find_next_digpos(data, area, center, dig_y, size) - local c_air = minetest.get_content_id("air") - - for y = center.y + quarry_dig_above_nodes, dig_y - 1, -1 do - for z = center.z - size, center.z + size do - for x = center.x - size, center.x + size do - if data[area:index(x, y, z)] ~= c_air then - return vector.new(x, y, z) - end - end - end - end -end - -local function quarry_dig(pos, center, size) +local function quarry_handle_purge(pos) local meta = minetest.get_meta(pos) - local drops = {} - local dig_y = meta:get_int("dig_y") - local owner = meta:get_int("owner") - - local vm = VoxelManip() - local p1 = vector.new( - center.x - size, - center.y + quarry_dig_above_nodes, - center.z - size) - local p2 = vector.new( - center.x + size, - dig_y - 1, -- One node lower in case we have finished the current layer - center.z + size) - local e1, e2 = vm:read_from_map(p1, p2) - local area = VoxelArea:new({MinEdge=e1, MaxEdge=e2}) - local data = vm:get_data() - - local digpos = find_next_digpos(data, area, center, dig_y, size) - - if digpos then - if digpos.y < pos.y - quarry_max_depth then - meta:set_int("dig_y", digpos.y) - return drops + local inv = meta:get_inventory() + local i = 0 + for _,stack in ipairs(inv:get_list("cache")) do + i = i + 1 + if stack then + local item = stack:to_table() + if item then + technic.tube_inject_item(pos, pos, quarry_eject_dir, item) + stack:clear() + inv:set_stack("cache", i, stack) + break + end end - if minetest.is_protected and minetest.is_protected(digpos, owner) then - meta:set_int("enabled", 0) - return {} - end - dig_y = digpos.y - local node = minetest.get_node(digpos) - drops = minetest.get_node_drops(node.name, "") - minetest.dig_node(digpos) - if minetest.get_node(digpos).name == node.name then - -- We tried to dig something undigable like a - -- filled chest. Notice that we check for a node - -- change, not for air. This is so that we get drops - -- from things like concrete posts with platforms, - -- which turn into regular concrete posts when dug. - drops = {} - end - elseif not (dig_y < pos.y - quarry_max_depth) then - dig_y = dig_y - 16 end - - meta:set_int("dig_y", dig_y) - return drops + if inv:is_empty("cache") then + meta:set_int("purge_on", 0) + end end -local function send_items(items, pos, node) - for _, item in pairs(items) do - local tube_item = pipeworks.tube_item(vector.new(pos), item) - tube_item:get_luaentity().start_pos = vector.new(pos) - tube_item:setvelocity(vector.new(0, 1, 0)) - tube_item:setacceleration({x=0, y=0, z=0}) +local function quarry_run(pos, node) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + -- initialize cache for the case we load an older world + inv:set_size("cache", 12) + -- toss a coin whether we do an automatic purge. Chance 1:200 + local purge_rand = math.random() + if purge_rand <= 0.005 then + meta:set_int("purge_on", 1) end + + if meta:get_int("enabled") and meta:get_int("HV_EU_input") >= quarry_demand and meta:get_int("purge_on") == 0 then + local pdir = minetest.facedir_to_dir(node.param2) + if pdir.y ~= 0 then + -- faces up or down, not valid, otherwise depth-check would run endless and hang up the server + return + end + + local qdir = pdir.x == 1 and vector.new(0,0,-1) or + (pdir.z == -1 and vector.new(-1,0,0) or + (pdir.x == -1 and vector.new(0,0,1) or + vector.new(1,0,0))) + local radius = meta:get_int("size") + local diameter = radius*2 + 1 + local startpos = vector.add(vector.add(vector.add(pos, + vector.new(0, quarry_dig_above_nodes, 0)), + pdir), + vector.multiply(qdir, -radius)) + local owner = meta:get_string("owner") + local nd = meta:get_int("dug") + while nd < diameter*diameter * (quarry_dig_above_nodes+1+quarry_max_depth) do + local ry = math.floor(nd / (diameter*diameter)) + local ndl = nd % (diameter*diameter) + if ry % 2 == 1 then + ndl = diameter*diameter - 1 - ndl + end + local rq = math.floor(ndl / diameter) + local rp = ndl % diameter + if rq % 2 == 1 then rp = diameter - 1 - rp end + local digpos = vector.add(vector.add(vector.add(startpos, + vector.new(0, -ry, 0)), + vector.multiply(pdir, rp)), + vector.multiply(qdir, rq)) + local can_dig = true + if can_dig and minetest.is_protected and minetest.is_protected(digpos, owner) then + can_dig = false + end + local dignode + if can_dig then + dignode = technic.get_or_load_node(digpos) or minetest.get_node(digpos) + local dignodedef = minetest.registered_nodes[dignode.name] or {diggable=false} + -- doors mod among other thing does NOT like a nil digger... + local fakedigger = pipeworks.create_fake_player({ + name = owner + }) + if not dignodedef.diggable or (dignodedef.can_dig and not dignodedef.can_dig(digpos, fakedigger)) then + can_dig = false + end + end + + if can_dig then + for ay = startpos.y, digpos.y+1, -1 do + local checkpos = {x=digpos.x, y=ay, z=digpos.z} + local checknode = technic.get_or_load_node(checkpos) or minetest.get_node(checkpos) + if checknode.name ~= "air" then + can_dig = false + break + end + end + end + nd = nd + 1 + if can_dig then + minetest.remove_node(digpos) + local drops = minetest.get_node_drops(dignode.name, "") + for _, dropped_item in ipairs(drops) do + local left = inv:add_item("cache", dropped_item) + while not left:is_empty() do + meta:set_int("purge_on", 1) + quarry_handle_purge(pos) + left = inv:add_item("cache", left) + end + end + break + end + end + if nd == diameter*diameter * (quarry_dig_above_nodes+1+quarry_max_depth) then + -- if a quarry is finished, we enable purge mode + meta:set_int("purge_on", 1) + end + meta:set_int("dug", nd) + else + -- if a quarry is disabled or has no power, we enable purge mode + meta:set_int("purge_on", 1) + end + -- if something triggered a purge, we handle it + if meta:get_int("purge_on") == 1 then + quarry_handle_purge(pos) + end + set_quarry_formspec(meta) + set_quarry_demand(meta) +end + +local function send_move_error(player) + minetest.chat_send_player(player:get_player_name(), + S("Manually taking/removing from cache by hand is not possible. ".. + "If you can't wait, restart or disable the quarry to start automatic purge.")) + return 0 end minetest.register_node("technic:quarry", { - description = S("Quarry"), - tiles = {"default_steel_block.png", "default_steel_block.png", - "default_steel_block.png", "default_steel_block.png", - "default_steel_block.png^default_tool_mesepick.png", "default_steel_block.png"}, + description = S("%s Quarry"):format("HV"), + tiles = { + "technic_carbon_steel_block.png"..tube_entry, + "technic_carbon_steel_block.png"..cable_entry, + "technic_carbon_steel_block.png"..cable_entry, + "technic_carbon_steel_block.png"..cable_entry, + "technic_carbon_steel_block.png^default_tool_mesepick.png", + "technic_carbon_steel_block.png"..cable_entry + }, paramtype2 = "facedir", - groups = {cracky=2, tubedevice=1}, + groups = {cracky=2, tubedevice=1, technic_machine=1, technic_hv=1}, + connect_sides = {"bottom", "front", "left", "right"}, tube = { connect_sides = {top = 1}, + -- lower priority than other tubes, so that quarries will prefer any + -- other tube to another quarry, which could lead to server freezes + -- in certain quarry placements (2x2 for example would never eject) + priority = 10, + can_go = function(pos, node, velocity, stack) + -- always eject the same, even if items came in another way + -- this further mitigates loops and generally avoids random sideway movement + -- that can be expected in certain quarry placements + return { quarry_eject_dir } + end }, on_construct = function(pos) - local size = 4 local meta = minetest.get_meta(pos) - meta:set_string("infotext", S("Quarry")) - meta:set_string("formspec", get_quarry_formspec(4)) - meta:set_int("size", size) - meta:set_int("dig_y", pos.y) + meta:set_string("infotext", S("%s Quarry"):format("HV")) + meta:set_int("size", 4) + set_quarry_formspec(meta) + set_quarry_demand(meta) end, after_place_node = function(pos, placer, itemstack) local meta = minetest.get_meta(pos) meta:set_string("owner", placer:get_player_name()) pipeworks.scan_for_tube_objects(pos) end, + can_dig = function(pos,player) + local meta = minetest.get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("cache") + end, after_dig_node = pipeworks.scan_for_tube_objects, on_receive_fields = quarry_receive_fields, -}) - -minetest.register_abm({ - nodenames = {"technic:quarry"}, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local meta = minetest.get_meta(pos) - local size = meta:get_int("size") - local eu_input = meta:get_int("HV_EU_input") - local demand = 10000 - local center = get_quarry_center(pos, size) - local dig_y = meta:get_int("dig_y") - local machine_name = S("Quarry") - - technic.switching_station_timeout_count(pos, "HV") - - if meta:get_int("enabled") == 0 then - meta:set_string("infotext", S("%s Disabled"):format(machine_name)) - meta:set_int("HV_EU_demand", 0) - return - end - - if eu_input < demand then - meta:set_string("infotext", S("%s Unpowered"):format(machine_name)) - elseif eu_input >= demand then - meta:set_string("infotext", S("%s Active"):format(machine_name)) - - local items = quarry_dig(pos, center, size) - send_items(items, pos, node) - - if dig_y < pos.y - quarry_max_depth then - meta:set_string("infotext", S("%s Finished"):format(machine_name)) - end - end - meta:set_int("HV_EU_demand", demand) + technic_run = quarry_run, + allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) + return send_move_error(player) + end, + allow_metadata_inventory_put = function(pos, listname, index, stack, player) + return send_move_error(player) + end, + allow_metadata_inventory_take = function(pos, listname, index, stack, player) + return send_move_error(player) end }) technic.register_machine("HV", "technic:quarry", technic.receiver) - -- Gitblit v1.8.0