MineApocalypse/pipeworks
MineApocalypse/pipeworks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Is ground content (#110)

Browse Source 
* trashcan isn't ground content

* pipes aren't ground content

* auto tree tap isn't ground content

* filter-injectors aren't ground content

* devices aren't ground content

also some whitespace indentation fixes

* is_ground_content

* autocrafter isn't ground content

* tubes aren't ground content

* pane_embedded_tube isn't ground content

* embedded_tube isn't ground content

* routing tubes aren't ground content

* whitespace fix indentation
This commit is contained in:
Luke aka SwissalpS 2024-02-27 00:44:40 +01:00 committed by GitHub
parent 96dca7e540
commit c7b153f1ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 61 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
autocrafter.lua
View File

@ -433,6 +433,7 @@ minetest.register_node("pipeworks:autocrafter", {
drawtype = "normal", drawtype = "normal",
tiles = {"pipeworks_autocrafter.png"}, tiles = {"pipeworks_autocrafter.png"},
groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1, dig_generic = 1, axey=1, handy=1, pickaxey=1}, groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1, dig_generic = 1, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
tube = {insert_object = function(pos, node, stack, direction) tube = {insert_object = function(pos, node, stack, direction)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)

5
changelog.txt
View File

@ -3,6 +3,11 @@ Changelog
2024-02-26 (SwissalpS)
set is_ground_content to false for various nodes.
2023-06-22 (SwissalpS, rubenwardy) 2023-06-22 (SwissalpS, rubenwardy)
groups support in recipe. Set recipe as usual via recipe formspec or digilines. groups support in recipe. Set recipe as usual via recipe formspec or digilines.
Autocrafter now resolves matching recipe using groups so that items in input Autocrafter now resolves matching recipe using groups so that items in input

64
devices.lua
View File

@ -148,6 +148,7 @@ for s in ipairs(states) do
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = dgroups, groups = dgroups,
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
@ -203,6 +204,7 @@ for s in ipairs(states) do
fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 } fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 }
}, },
groups = dgroups, groups = dgroups,
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
@ -254,10 +256,11 @@ minetest.register_node(nodename_valve_loaded, {
fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 } 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, axey=1, handy=1, pickaxey=1}, groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
}, },
walkable = true, walkable = true,
on_place = pipeworks.rotate_on_place, on_place = pipeworks.rotate_on_place,
after_dig_node = function(pos) after_dig_node = function(pos)
@ -307,10 +310,11 @@ minetest.register_node("pipeworks:grating", {
sunlight_propagates = true, sunlight_propagates = true,
paramtype = "light", paramtype = "light",
groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1}, groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
}, },
walkable = true, walkable = true,
pipe_connections = { top = 1 }, pipe_connections = { top = 1 },
after_place_node = function(pos) after_place_node = function(pos)
@ -335,10 +339,11 @@ minetest.register_node(nodename_spigot_empty, {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1}, groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
}, },
walkable = true, walkable = true,
pipe_connections = { left=1, right=1, front=1, back=1, pipe_connections = { left=1, right=1, front=1, back=1,
left_param2 = 3, right_param2 = 1, front_param2 = 2, back_param2 = 0 }, left_param2 = 3, right_param2 = 1, front_param2 = 2, back_param2 = 0 },
@ -373,10 +378,11 @@ minetest.register_node(nodename_spigot_loaded, {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1}, groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
}, },
walkable = true, walkable = true,
pipe_connections = { left=1, right=1, front=1, back=1, pipe_connections = { left=1, right=1, front=1, back=1,
left_param2 = 3, right_param2 = 1, front_param2 = 2, back_param2 = 0 }, left_param2 = 3, right_param2 = 1, front_param2 = 2, back_param2 = 0 },
@ -432,10 +438,11 @@ minetest.register_node(nodename_panel_empty, {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1}, groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
}, },
walkable = true, walkable = true,
on_place = pipeworks.rotate_on_place, on_place = pipeworks.rotate_on_place,
after_dig_node = function(pos) after_dig_node = function(pos)
@ -455,10 +462,11 @@ minetest.register_node(nodename_panel_loaded, {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1}, groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
}, },
walkable = true, walkable = true,
on_place = pipeworks.rotate_on_place, on_place = pipeworks.rotate_on_place,
after_dig_node = function(pos) after_dig_node = function(pos)
@ -488,10 +496,11 @@ minetest.register_node(nodename_sensor_empty, {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1}, groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
}, },
walkable = true, walkable = true,
on_place = pipeworks.rotate_on_place, on_place = pipeworks.rotate_on_place,
after_dig_node = function(pos) after_dig_node = function(pos)
@ -530,10 +539,11 @@ minetest.register_node(nodename_sensor_loaded, {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1}, groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
}, },
walkable = true, walkable = true,
on_place = pipeworks.rotate_on_place, on_place = pipeworks.rotate_on_place,
after_dig_node = function(pos) after_dig_node = function(pos)
@ -600,6 +610,7 @@ for fill = 0, 10 do
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=3, pipe=1, tankfill=fill+1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1}, groups = {snappy=3, pipe=1, tankfill=fill+1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
@ -631,6 +642,7 @@ for fill = 0, 10 do
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = sgroups, groups = sgroups,
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
@ -661,10 +673,11 @@ minetest.register_node(nodename_fountain_empty, {
sunlight_propagates = true, sunlight_propagates = true,
paramtype = "light", paramtype = "light",
groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1}, groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
}, },
walkable = true, walkable = true,
pipe_connections = { bottom = 1 }, pipe_connections = { bottom = 1 },
after_place_node = function(pos) after_place_node = function(pos)
@ -699,10 +712,11 @@ minetest.register_node(nodename_fountain_loaded, {
sunlight_propagates = true, sunlight_propagates = true,
paramtype = "light", paramtype = "light",
groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1}, groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
}, },
walkable = true, walkable = true,
pipe_connections = { bottom = 1 }, pipe_connections = { bottom = 1 },
after_place_node = function(pos) after_place_node = function(pos)
@ -752,10 +766,11 @@ minetest.register_node(nodename_sp_empty, {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1}, groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
}, },
walkable = true, walkable = true,
on_place = pipeworks.rotate_on_place, on_place = pipeworks.rotate_on_place,
after_dig_node = function(pos) after_dig_node = function(pos)
@ -777,10 +792,11 @@ minetest.register_node(nodename_sp_loaded, {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1}, groups = {snappy=3, pipe=1, not_in_creative_inventory=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
}, },
walkable = true, walkable = true,
on_place = pipeworks.rotate_on_place, on_place = pipeworks.rotate_on_place,
after_dig_node = function(pos) after_dig_node = function(pos)

1
filter-injector.lua
View File

@ -389,6 +389,7 @@ for _, data in ipairs({
}, },
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, mesecon = 2, axey=1, handy=1, pickaxey=1}, groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, mesecon = 2, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
legacy_facedir_simple = true, legacy_facedir_simple = true,
_sound_def = { _sound_def = {

2
legacy.lua
View File

@ -24,7 +24,7 @@ if not minetest.get_modpath("auto_tree_tap") and
description = S("Auto-Tap"), description = S("Auto-Tap"),
tiles = {"pipeworks_nodebreaker_top_off.png","pipeworks_nodebreaker_bottom_off.png","pipeworks_nodebreaker_side2_off.png","pipeworks_nodebreaker_side1_off.png", tiles = {"pipeworks_nodebreaker_top_off.png","pipeworks_nodebreaker_bottom_off.png","pipeworks_nodebreaker_side2_off.png","pipeworks_nodebreaker_side1_off.png",
"pipeworks_nodebreaker_back.png","pipeworks_nodebreaker_front_off.png"}, "pipeworks_nodebreaker_back.png","pipeworks_nodebreaker_front_off.png"},
is_ground_content = true, is_ground_content = false,
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1, not_in_creative_inventory=1, axey=1, handy=1, pickaxey=1}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1, not_in_creative_inventory=1, axey=1, handy=1, pickaxey=1},
_mcl_hardness=0.8, _mcl_hardness=0.8,

4
pipes.lua
View File

@ -76,6 +76,7 @@ for index, connects in ipairs(cconnects) do
fixed = outsel fixed = outsel
}, },
groups = pgroups, groups = pgroups,
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
@ -113,6 +114,7 @@ for index, connects in ipairs(cconnects) do
fixed = outsel fixed = outsel
}, },
groups = pgroups, groups = pgroups,
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_metal_defaults", key = "node_sound_metal_defaults",
@ -151,6 +153,7 @@ if REGISTER_COMPATIBILITY then
paramtype = "light", paramtype = "light",
description = S("Pipe Segment (legacy)"), description = S("Pipe Segment (legacy)"),
groups = {not_in_creative_inventory = 1, pipe_to_update = 1}, groups = {not_in_creative_inventory = 1, pipe_to_update = 1},
is_ground_content = false,
drop = "pipeworks:pipe_1_empty", drop = "pipeworks:pipe_1_empty",
after_place_node = function(pos) after_place_node = function(pos)
pipeworks.scan_for_pipe_objects(pos) pipeworks.scan_for_pipe_objects(pos)
@ -163,6 +166,7 @@ if REGISTER_COMPATIBILITY then
sunlight_propagates = true, sunlight_propagates = true,
paramtype = "light", paramtype = "light",
groups = {not_in_creative_inventory = 1, pipe_to_update = 1}, groups = {not_in_creative_inventory = 1, pipe_to_update = 1},
is_ground_content = false,
drop = "pipeworks:pipe_1_empty", drop = "pipeworks:pipe_1_empty",
after_place_node = function(pos) after_place_node = function(pos)
pipeworks.scan_for_pipe_objects(pos) pipeworks.scan_for_pipe_objects(pos)

1
trashcan.lua
View File

@ -11,6 +11,7 @@ minetest.register_node("pipeworks:trashcan", {
"pipeworks_trashcan_side.png", "pipeworks_trashcan_side.png",
}, },
groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1, dig_generic = 4, axey=1, handy=1, pickaxey=1}, groups = {snappy = 3, tubedevice = 1, tubedevice_receiver = 1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
tube = { tube = {
insert_object = function(pos, node, stack, direction) insert_object = function(pos, node, stack, direction)

1
tubes/embedded_tube.lua
View File

@ -27,6 +27,7 @@ function pipeworks.register_embedded_tube(nodename, opts)
pickaxey=1, pickaxey=1,
handy=1 handy=1
}, },
is_ground_content = false,
_mcl_hardness = 0.8, _mcl_hardness = 0.8,
legacy_facedir_simple = true, legacy_facedir_simple = true,
_sound_def = { _sound_def = {

5
tubes/pane_embedded_tube.lua
View File

@ -31,11 +31,12 @@ minetest.register_node("pipeworks:steel_pane_embedded_tube", {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {cracky=1, oddly_breakable_by_hand = 1, tubedevice = 1, dig_glass = 2, pickaxey=1, handy=1}, groups = {cracky=1, oddly_breakable_by_hand = 1, tubedevice = 1, dig_glass = 2, pickaxey=1, handy=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
legacy_facedir_simple = true, legacy_facedir_simple = true,
_sound_def = { _sound_def = {
key = "node_sound_stone_defaults", key = "node_sound_stone_defaults",
}, },
tube = { tube = {
connect_sides = {front = 1, back = 1,}, connect_sides = {front = 1, back = 1,},
priority = 50, priority = 50,

2
tubes/registration.lua
View File

@ -106,6 +106,7 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e
fixed = outboxes fixed = outboxes
}, },
groups = tgroups, groups = tgroups,
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_wood_defaults", key = "node_sound_wood_defaults",
@ -227,6 +228,7 @@ local register_all_tubes = function(name, desc, plain, noctrs, ends, short, inv,
description = S("Pneumatic tube segment (legacy)"), description = S("Pneumatic tube segment (legacy)"),
after_place_node = pipeworks.after_place, after_place_node = pipeworks.after_place,
groups = {not_in_creative_inventory = 1, tube_to_update = 1, tube = 1}, groups = {not_in_creative_inventory = 1, tube_to_update = 1, tube = 1},
is_ground_content = false,
tube = {connect_sides = {front = 1, back = 1, left = 1, right = 1, top = 1, bottom = 1}}, tube = {connect_sides = {front = 1, back = 1, left = 1, right = 1, top = 1, bottom = 1}},
drop = name.."_1", drop = name.."_1",
}) })

2
tubes/routing.lua
View File

@ -50,6 +50,7 @@ pipeworks.register_tube("pipeworks:broken_tube", {
node_def = { node_def = {
drop = "pipeworks:tube_1", drop = "pipeworks:tube_1",
groups = {not_in_creative_inventory = 1, tubedevice_receiver = 1}, groups = {not_in_creative_inventory = 1, tubedevice_receiver = 1},
is_ground_content = false,
tube = { tube = {
insert_object = function(pos, node, stack, direction) insert_object = function(pos, node, stack, direction)
minetest.item_drop(stack, nil, pos) minetest.item_drop(stack, nil, pos)
@ -179,6 +180,7 @@ if pipeworks.enable_one_way_tube then
node_box = {type = "fixed", node_box = {type = "fixed",
fixed = {{-1/2, -9/64, -9/64, 1/2, 9/64, 9/64}}}, 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, axey=1, handy=1, pickaxey=1}, groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, tubedevice = 1, axey=1, handy=1, pickaxey=1},
is_ground_content = false,
_mcl_hardness=0.8, _mcl_hardness=0.8,
_sound_def = { _sound_def = {
key = "node_sound_wood_defaults", key = "node_sound_wood_defaults",