Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Sys Quatre 2021-01-19 23:26:45 +01:00
commit 45991bf124
6 changed files with 26 additions and 9 deletions

11
.github/workflows/build.yml vendored Normal file
View File

@ -0,0 +1,11 @@
on: [push, pull_request]
name: build
jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: lint
uses: Roang-zero1/factorio-mod-luacheck@master
with:
luacheckrc_url: ""

View File

@ -7,6 +7,7 @@ read_globals = {
"pipeworks", "pipeworks",
"dump", "dump",
"VoxelArea", "VoxelArea",
"ItemStack",
} }
globals = { globals = {

View File

@ -1,6 +1,8 @@
Digilines Digilines
========== ==========
[![Build status](https://github.com/minetest-mods/digilines/workflows/build/badge.svg)](https://github.com/minetest-mods/digilines/actions)
- The minetest counterpart for bus systems like i2c, SPI, RS232, USB - - The minetest counterpart for bus systems like i2c, SPI, RS232, USB -
- Minetest 5.0.0+ is required to use this mod. - Minetest 5.0.0+ is required to use this mod.

View File

@ -112,9 +112,9 @@ function digilines.transmit(pos, channel, msg, checked)
for _, rule in ipairs(rules) do for _, rule in ipairs(rules) do
local nextPos = digilines.addPosRule(curPos, rule) local nextPos = digilines.addPosRule(curPos, rule)
if digilines.rules_link(curPos, nextPos) then if digilines.rules_link(curPos, nextPos) then
local checkedID = minetest.hash_node_position(nextPos) local checkedID2 = minetest.hash_node_position(nextPos)
if not checked[checkedID] then if not checked[checkedID2] then
checked[checkedID] = true checked[checkedID2] = true
queue_enqueue(queue, nextPos) queue_enqueue(queue, nextPos)
end end
end end

View File

@ -229,7 +229,7 @@ minetest.register_node("digilines:chest", {
last_inventory_take_index = index last_inventory_take_index = index
return stack:get_count() return stack:get_count()
end, end,
on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) on_metadata_inventory_move = function(pos, _, from_index, _, to_index, count, player)
-- See what would happen if we were to move the items back from in the -- See what would happen if we were to move the items back from in the
-- opposite direction. In the event of a normal move, this must -- opposite direction. In the event of a normal move, this must
-- succeed, because a normal move subtracts some items from the from -- succeed, because a normal move subtracts some items from the from

View File

@ -292,12 +292,12 @@ minetest.register_node("digilines:lcd", {
end, end,
on_construct = reset_meta, on_construct = reset_meta,
on_destruct = clearscreen, on_destruct = clearscreen,
on_punch = function(pos, node, puncher, pointed_thing) on_punch = function(pos, _, puncher, _)
if minetest.is_player(puncher) then if minetest.is_player(puncher) then
spawn_entity(pos) spawn_entity(pos)
end end
end, end,
on_rotate = function(pos, node, user, mode, new_param2) on_rotate = function(pos, _, _, mode, new_param2)
if mode ~= screwdriver.ROTATE_FACE then if mode ~= screwdriver.ROTATE_FACE then
return false return false
end end
@ -340,7 +340,10 @@ minetest.register_craft({
output = "digilines:lcd 2", output = "digilines:lcd 2",
recipe = { recipe = {
{"default:steel_ingot", "digilines:wire_std_00000000", "default:steel_ingot"}, {"default:steel_ingot", "digilines:wire_std_00000000", "default:steel_ingot"},
{"mesecons_lightstone:lightstone_green_off","mesecons_lightstone:lightstone_green_off","mesecons_lightstone:lightstone_green_off"}, {"mesecons_lightstone:lightstone_green_off",
"mesecons_lightstone:lightstone_green_off",
"mesecons_lightstone:lightstone_green_off"},
{"default:glass","default:glass","default:glass"} {"default:glass","default:glass","default:glass"}
} }
}) })