From 855937aec336db066ab82dfd6008878dda8610f7 Mon Sep 17 00:00:00 2001 From: unknown <24964441+wsor4035@users.noreply.github.com> Date: Fri, 2 Dec 2022 15:54:21 -0500 Subject: [PATCH] make all nodes diggable in mcl* survival mode --- autocrafter.lua | 3 ++- decorative_tubes.lua | 6 ++++-- devices.lua | 50 ++++++++++++++++++++++++++++--------------- filter-injector.lua | 3 ++- legacy.lua | 3 ++- lua_tube.lua | 6 ++++-- pipes.lua | 8 ++++--- routing_tubes.lua | 3 ++- trashcan.lua | 3 ++- tube_registration.lua | 5 +++-- wielder.lua | 3 ++- 11 files changed, 61 insertions(+), 32 deletions(-) diff --git a/autocrafter.lua b/autocrafter.lua index ca578e9..22ff6d7 100644 --- a/autocrafter.lua +++ b/autocrafter.lua @@ -272,7 +272,8 @@ minetest.register_node("pipeworks:autocrafter", { description = S("Autocrafter"), drawtype = "normal", tiles = {"pipeworks_autocrafter.png"}, - groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1, dig_generic = 1}, + groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1, dig_generic = 1, axey=5}, + _mcl_hardness=1.6, tube = {insert_object = function(pos, node, stack, direction) local meta = minetest.get_meta(pos) local inv = meta:get_inventory() diff --git a/decorative_tubes.lua b/decorative_tubes.lua index 910ea91..37ecec2 100644 --- a/decorative_tubes.lua +++ b/decorative_tubes.lua @@ -14,7 +14,8 @@ minetest.register_node("pipeworks:steel_block_embedded_tube", { }, paramtype = "light", paramtype2 = "facedir", - groups = {cracky=1, oddly_breakable_by_hand = 1, tubedevice = 1, dig_glass = 2}, + groups = {cracky=1, oddly_breakable_by_hand = 1, tubedevice = 1, dig_glass = 2, pickaxey=5}, + _mcl_hardness=1.6, legacy_facedir_simple = true, _sound_def = { key = "node_sound_stone_defaults", @@ -62,7 +63,8 @@ minetest.register_node("pipeworks:steel_pane_embedded_tube", { collision_box = pane_box, paramtype = "light", paramtype2 = "facedir", - groups = {cracky=1, oddly_breakable_by_hand = 1, tubedevice = 1, dig_glass = 2}, + groups = {cracky=1, oddly_breakable_by_hand = 1, tubedevice = 1, dig_glass = 2, pickaxey=5}, + _mcl_hardness=1.6, legacy_facedir_simple = true, _sound_def = { key = "node_sound_stone_defaults", diff --git a/devices.lua b/devices.lua index d6bfced..9a08a3c 100644 --- a/devices.lua +++ b/devices.lua @@ -133,9 +133,9 @@ for s in ipairs(states) do local dgroups if states[s] == "off" then - dgroups = {snappy=3, pipe=1, dig_generic = 4} + dgroups = {snappy=3, pipe=1, dig_generic = 4, axey=5} else - dgroups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4} + dgroups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=5} end local pumpname = "pipeworks:pump_"..states[s] @@ -148,6 +148,7 @@ for s in ipairs(states) do paramtype = "light", paramtype2 = "facedir", groups = dgroups, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -202,6 +203,7 @@ for s in ipairs(states) do fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 } }, groups = dgroups, + _mcl_hardness = 1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -251,7 +253,8 @@ minetest.register_node(nodename_valve_loaded, { type = "fixed", fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 } }, - groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4}, + groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -303,7 +306,8 @@ minetest.register_node("pipeworks:grating", { }, sunlight_propagates = true, paramtype = "light", - groups = {snappy=3, pipe=1, dig_generic = 4}, + groups = {snappy=3, pipe=1, dig_generic = 4, axey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -330,7 +334,8 @@ minetest.register_node(nodename_spigot_empty, { sunlight_propagates = true, paramtype = "light", paramtype2 = "facedir", - groups = {snappy=3, pipe=1, dig_generic = 4}, + groups = {snappy=3, pipe=1, dig_generic = 4, axey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -367,7 +372,8 @@ minetest.register_node(nodename_spigot_loaded, { sunlight_propagates = true, paramtype = "light", paramtype2 = "facedir", - groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4}, + groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -425,7 +431,8 @@ minetest.register_node(nodename_panel_empty, { tiles = { "pipeworks_entry_panel.png" }, paramtype = "light", paramtype2 = "facedir", - groups = {snappy=3, pipe=1, dig_generic = 4}, + groups = {snappy=3, pipe=1, dig_generic = 4, axey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -447,7 +454,8 @@ minetest.register_node(nodename_panel_loaded, { tiles = { "pipeworks_entry_panel.png" }, paramtype = "light", paramtype2 = "facedir", - groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4}, + groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -479,7 +487,8 @@ minetest.register_node(nodename_sensor_empty, { sunlight_propagates = true, paramtype = "light", paramtype2 = "facedir", - groups = {snappy=3, pipe=1, dig_generic = 4}, + groups = {snappy=3, pipe=1, dig_generic = 4, axey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -520,7 +529,8 @@ minetest.register_node(nodename_sensor_loaded, { sunlight_propagates = true, paramtype = "light", paramtype2 = "facedir", - groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4}, + groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -567,12 +577,12 @@ new_flow_logic_register.transition_simple_set(sensor_pressure_set, { mesecons=pi -- TODO flow-logic-stub: these don't currently do anything under the new flow logic. for fill = 0, 10 do local filldesc=S("empty") - local sgroups = {snappy=3, pipe=1, tankfill=fill+1, dig_generic = 4} + local sgroups = {snappy=3, pipe=1, tankfill=fill+1, dig_generic = 4, axey=5} local image = nil if fill ~= 0 then filldesc=S("@1% full", 10*fill) - sgroups = {snappy=3, pipe=1, tankfill=fill+1, not_in_creative_inventory=1, dig_generic = 4} + sgroups = {snappy=3, pipe=1, tankfill=fill+1, not_in_creative_inventory=1, dig_generic = 4, axey=5} image = "pipeworks_storage_tank_fittings.png" end @@ -589,7 +599,8 @@ for fill = 0, 10 do inventory_image = image, paramtype = "light", paramtype2 = "facedir", - groups = {snappy=3, pipe=1, tankfill=fill+1, not_in_creative_inventory=1, dig_generic = 4}, + groups = {snappy=3, pipe=1, tankfill=fill+1, not_in_creative_inventory=1, dig_generic = 4, axey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -620,6 +631,7 @@ for fill = 0, 10 do paramtype = "light", paramtype2 = "facedir", groups = sgroups, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -648,7 +660,8 @@ minetest.register_node(nodename_fountain_empty, { tiles = { "pipeworks_fountainhead.png" }, sunlight_propagates = true, paramtype = "light", - groups = {snappy=3, pipe=1, dig_generic = 4}, + groups = {snappy=3, pipe=1, dig_generic = 4, axey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -685,7 +698,8 @@ minetest.register_node(nodename_fountain_loaded, { tiles = { "pipeworks_fountainhead.png" }, sunlight_propagates = true, paramtype = "light", - groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4}, + groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -737,7 +751,8 @@ minetest.register_node(nodename_sp_empty, { tiles = { "pipeworks_straight_pipe_empty.png" }, paramtype = "light", paramtype2 = "facedir", - groups = {snappy=3, pipe=1, dig_generic = 4}, + groups = {snappy=3, pipe=1, dig_generic = 4, axey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -761,7 +776,8 @@ minetest.register_node(nodename_sp_loaded, { tiles = { "pipeworks_straight_pipe_loaded.png" }, paramtype = "light", paramtype2 = "facedir", - groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4}, + groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, diff --git a/filter-injector.lua b/filter-injector.lua index 6e25917..ac98a62 100644 --- a/filter-injector.lua +++ b/filter-injector.lua @@ -388,7 +388,8 @@ for _, data in ipairs({ "pipeworks_"..data.name.."_top.png", }, paramtype2 = "facedir", - groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, mesecon = 2}, + groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, mesecon = 2, axey=5}, + _mcl_hardness=1.6, legacy_facedir_simple = true, _sound_def = { key = "node_sound_wood_defaults", diff --git a/legacy.lua b/legacy.lua index a426a62..f45c375 100644 --- a/legacy.lua +++ b/legacy.lua @@ -26,7 +26,8 @@ if not minetest.get_modpath("auto_tree_tap") and "pipeworks_nodebreaker_back.png","pipeworks_nodebreaker_front_off.png"}, is_ground_content = true, paramtype2 = "facedir", - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1, not_in_creative_inventory=1 }, + groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1, not_in_creative_inventory=1, axey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_stone_defaults", }, diff --git a/lua_tube.lua b/lua_tube.lua index 0898749..cae1bf3 100644 --- a/lua_tube.lua +++ b/lua_tube.lua @@ -865,7 +865,7 @@ for white = 0, 1 do tiles[3] = tiles[3]..tiles_on_off.R270:format(white == 1 and "on" or "off"); tiles[4] = tiles[4]..tiles_on_off.R_90:format(white == 1 and "on" or "off"); - local groups = {snappy = 3, tube = 1, tubedevice = 1, overheat = 1, dig_generic = 4} + local groups = {snappy = 3, tube = 1, tubedevice = 1, overheat = 1, dig_generic = 4, axey=5} if red + blue + yellow + green + black + white ~= 0 then groups.not_in_creative_inventory = 1 end @@ -912,6 +912,7 @@ for white = 0, 1 do paramtype = "light", is_ground_content = false, groups = groups, + _mcl_hardness=1.6, drop = BASENAME.."000000", sunlight_propagates = true, selection_box = selection_box, @@ -1023,7 +1024,8 @@ minetest.register_node(BASENAME .. "_burnt", { is_burnt = true, paramtype = "light", is_ground_content = false, - groups = {snappy = 3, tube = 1, tubedevice = 1, not_in_creative_inventory=1, dig_generic = 4}, + groups = {snappy = 3, tube = 1, tubedevice = 1, not_in_creative_inventory=1, dig_generic = 4, axey=5}, + _mcl_hardness=1.6, drop = BASENAME.."000000", sunlight_propagates = true, selection_box = selection_box, diff --git a/pipes.lua b/pipes.lua index 5ab7c61..1e78417 100644 --- a/pipes.lua +++ b/pipes.lua @@ -37,11 +37,11 @@ for index, connects in ipairs(cconnects) do end --]] - local pgroups = {snappy = 3, pipe = 1, not_in_creative_inventory = 1, dig_generic = 4} + local pgroups = {snappy = 3, pipe = 1, not_in_creative_inventory = 1, dig_generic = 4, axey=5} local pipedesc = S("Pipe Segment").." "..dump(connects) if #connects == 0 then - pgroups = {snappy = 3, tube = 1, dig_generic = 4} + pgroups = {snappy = 3, tube = 1, dig_generic = 4, axey=5} pipedesc = S("Pipe Segment") end @@ -76,6 +76,7 @@ for index, connects in ipairs(cconnects) do fixed = outsel }, groups = pgroups, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_metal_defaults", }, @@ -93,7 +94,7 @@ for index, connects in ipairs(cconnects) do pipenumber = index }) - local pgroups = {snappy = 3, pipe = 1, not_in_creative_inventory = 1, dig_generic = 4} + local pgroups = {snappy = 3, pipe = 1, not_in_creative_inventory = 1, dig_generic = 4, axey=5} minetest.register_node("pipeworks:pipe_"..index.."_loaded", { description = pipedesc, @@ -112,6 +113,7 @@ for index, connects in ipairs(cconnects) do fixed = outsel }, groups = pgroups, + _mcl_hardness = 1.6, _sound_def = { key = "node_sound_metal_defaults", }, diff --git a/routing_tubes.lua b/routing_tubes.lua index 7593322..4ea5c28 100644 --- a/routing_tubes.lua +++ b/routing_tubes.lua @@ -168,7 +168,8 @@ if pipeworks.enable_one_way_tube then paramtype = "light", node_box = {type = "fixed", fixed = {{-1/2, -9/64, -9/64, 1/2, 9/64, 9/64}}}, - groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, tubedevice = 1}, + groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, tubedevice = 1, axey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_wood_defaults", }, diff --git a/trashcan.lua b/trashcan.lua index 3643828..7c3d4e9 100644 --- a/trashcan.lua +++ b/trashcan.lua @@ -10,7 +10,8 @@ minetest.register_node("pipeworks:trashcan", { "pipeworks_trashcan_side.png", "pipeworks_trashcan_side.png", }, - groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1, dig_generic = 4}, + groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1, dig_generic = 4, axey=5}, + _mcl_hardness=1.6, tube = { insert_object = function(pos, node, stack, direction) return ItemStack("") diff --git a/tube_registration.lua b/tube_registration.lua index edb9f5e..0028623 100644 --- a/tube_registration.lua +++ b/tube_registration.lua @@ -61,13 +61,13 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e outimgs[vti[v]] = ends[v] end - local tgroups = {snappy = 3, tube = 1, tubedevice = 1, not_in_creative_inventory = 1, dig_generic = 4} + local tgroups = {snappy = 3, tube = 1, tubedevice = 1, not_in_creative_inventory = 1, dig_generic = 4, axey=5} local tubedesc = string.format("%s %s", desc, dump(connects)) local iimg = type(plain[1]) == "table" and plain[1].name or plain[1] local wscale = {x = 1, y = 1, z = 1} if #connects == 0 then - tgroups = {snappy = 3, tube = 1, tubedevice = 1, dig_generic = 4} + tgroups = {snappy = 3, tube = 1, tubedevice = 1, dig_generic = 4, axey=5} tubedesc = desc iimg=inv outimgs = { @@ -106,6 +106,7 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e fixed = outboxes }, groups = tgroups, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_wood_defaults", }, diff --git a/wielder.lua b/wielder.lua index 6bde2df..e24b8ce 100644 --- a/wielder.lua +++ b/wielder.lua @@ -146,7 +146,7 @@ local function register_wielder(data) data.fixup_node = data.fixup_node or function (pos, node) end data.fixup_oldmetadata = data.fixup_oldmetadata or function (m) return m end for _, state in ipairs({ "off", "on" }) do - local groups = { snappy=2, choppy=2, oddly_breakable_by_hand=2, mesecon=2, tubedevice=1, tubedevice_receiver=1 } + local groups = { snappy=2, choppy=2, oddly_breakable_by_hand=2, mesecon=2, tubedevice=1, tubedevice_receiver=1, axey=5 } if state == "on" then groups.not_in_creative_inventory = 1 end local tile_images = {} for _, face in ipairs({ "top", "bottom", "side2", "side1", "back", "front" }) do @@ -199,6 +199,7 @@ local function register_wielder(data) paramtype2 = "facedir", tubelike = 1, groups = groups, + _mcl_hardness=0.6, _sound_def = { key = "node_sound_stone_defaults", },