Merge remote-tracking branch 'upstream/master'

Sends the same events from tubelib interaction as would be sent from pipeworks

 * Moved the tube_can_insert and tube_insert_object callbacks out of the node definition so they can be re-used in the tubelib registration
 * Optionally required tubelib and registered callbacks for pushing and pulling
 * Used "speculative pull" variable to only send a "take" event if tubelib's unpull is not called after a pull - this happens when it tries to take an item but there is no room, so it fails

.luacheckrc

@@ -12,4 +12,6 @@ read_globals = {
 
 globals = {
 	"digilines",
+	"tubelib",
+	"tubelib2"
 }

README.inventory

@@ -54,6 +54,9 @@ overflow <itemstack> <count>
 Tricky situation:
 if you have a blank spot and put say 82 torches down your pipeline, followed by 99 coal, the 82 torches will go in the chest, and the chest will see that 1 more torch can fit since that would only go to 83. Since 1 more torch can fit, no "full" message will fire off. Then when the coal hits the chest, the "fail" message will fire and the coal will bounce out. The chest couldn't predict that coal would be coming next, so it couldn't know that the chest is full, for coal, while not full for torches.
 
+The inventory is also compatible with [`tubelib`](https://github.com/joe7575/techpack/tree/master/tubelib), which generally works in the same way as [`pipeworks`](https://gitlab.com/VanessaE/pipeworks) but transfers happen immediately and do not "bounce". This means that the messages should be identical to the messages sent by [`pipeworks`](https://gitlab.com/VanessaE/pipeworks), except that items will not send the "lost" message when they cannot fit.
+One oddity is that "take" messages will be asynchronous because, if an item does not fit in the chest, the event will need to be canceled. This means that it is possible (though highly unlikely) to recieve a "put" message into a slot which you have not yet recieved a "take" message for, there will not actually be two stacks in the same slot, though it may briefly appear that way until the "take" message is recieved.
+
 TODO: 
     - make chest.lua a mixin that gets both default and locked chests
     - digiline aware furnaces

init.lua

@@ -1,5 +1,5 @@
-
 digilines = {}
+digilines.S = minetest.get_translator("digilines")
 
 -- Backwards compatibility code.
 -- We define a proxy table whose methods can be called with the

inventory.lua

@@ -1,3 +1,5 @@
+local S = digilines.S
+
 local pipeworks_enabled = minetest.get_modpath("pipeworks") ~= nil
 
 -- Sends a message onto the Digilines network.
@@ -51,9 +53,102 @@ local last_inventory_put_stack
 -- that should be removed once that’s fixed.
 local last_inventory_take_index
 
+local tube_can_insert = function(pos, _, stack, direction)
+	local ret = minetest.get_meta(pos):get_inventory():room_for_item("main", stack)
+	if not ret then
+		-- The stack cannot be accepted. It will never be passed to
+		-- insert_object, but it should be reported as a toverflow.
+		-- Here, direction = direction item is moving, which is into
+		-- side.
+		local side = vector.multiply(direction, -1)
+		send_message(pos, "toverflow", stack, nil, nil, side)
+	end
+	return ret
+end
+
+local tube_insert_object = function(pos, _, original_stack, direction)
+	-- Here, direction = direction item is moving, which is into side.
+	local side = vector.multiply(direction, -1)
+	local inv = minetest.get_meta(pos):get_inventory()
+	local inv_contents = inv:get_list("main")
+	local any_put = false
+	local stack = original_stack
+	local stack_name = stack:get_name()
+	local stack_count = stack:get_count()
+	-- Walk the inventory, adding items to existing stacks of the same
+	-- type.
+	for i = 1, #inv_contents do
+		local existing_stack = inv_contents[i]
+		if not existing_stack:is_empty() and existing_stack:get_name() == stack_name then
+			local leftover = existing_stack:add_item(stack)
+			local leftover_count = leftover:get_count()
+			if leftover_count ~= stack_count then
+				-- We put some items into the slot. Update the slot in
+				-- the inventory, tell Digilines listeners about it,
+				-- and keep looking for the a place to put the
+				-- leftovers if any.
+				any_put = true
+				inv:set_stack("main", i, existing_stack)
+				local stack_that_was_put
+				if leftover_count == 0 then
+					stack_that_was_put = stack
+				else
+					stack_that_was_put = ItemStack(stack)
+					stack_that_was_put:set_count(stack_count - leftover_count)
+				end
+				send_message(pos, "tput", stack_that_was_put, nil, i, side)
+				stack = leftover
+				stack_count = leftover_count
+				if stack_count == 0 then
+					break
+				end
+			end
+		end
+	end
+	if stack_count ~= 0 then
+		-- Walk the inventory, adding items to empty slots.
+		for i = 1, #inv_contents do
+			local existing_stack = inv_contents[i]
+			if existing_stack:is_empty() then
+				local leftover = existing_stack:add_item(stack)
+				local leftover_count = leftover:get_count()
+				if leftover_count ~= stack_count then
+					-- We put some items into the slot. Update the slot in
+					-- the inventory, tell Digilines listeners about it,
+					-- and keep looking for the a place to put the
+					-- leftovers if any.
+					any_put = true
+					inv:set_stack("main", i, existing_stack)
+					local stack_that_was_put
+					if leftover_count == 0 then
+						stack_that_was_put = stack
+					else
+						stack_that_was_put = ItemStack(stack)
+						stack_that_was_put:set_count(stack_count - leftover_count)
+					end
+					send_message(pos, "tput", stack_that_was_put, nil, i, side)
+					stack = leftover
+					stack_count = leftover_count
+					if stack_count == 0 then
+						break
+					end
+				end
+			end
+		end
+	end
+	if any_put then
+		check_full(pos, original_stack)
+	end
+	if stack_count ~= 0 then
+		-- Some items could not be added and bounced back. Report them.
+		send_message(pos, "toverflow", stack, nil, nil, side)
+	end
+	return stack
+end
+
 minetest.register_alias("digilines_inventory:chest", "digilines:chest")
 minetest.register_node("digilines:chest", {
-	description = "Digiline Chest",
+	description = S("Digiline Chest"),
 	tiles = {
 		"default_chest_top.png"..tubeconn,
 		"default_chest_top.png"..tubeconn,
@@ -68,14 +163,14 @@ minetest.register_node("digilines:chest", {
 	sounds = default.node_sound_wood_defaults(),
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
-		meta:set_string("infotext", "Digiline Chest")
+		meta:set_string("infotext", S("Digiline Chest"))
 		meta:set_string("formspec", "size[8,10]"..
 			((default and default.gui_bg) or "")..
 			((default and default.gui_bg_img) or "")..
 			((default and default.gui_slots) or "")..
-			"label[0,0;Digiline Chest]"..
+			"label[0,0;" .. S("Digiline Chest") .. "]" ..
 			"list[current_name;main;0,1;8,4;]"..
-			"field[2,5.5;5,1;channel;Channel;${channel}]"..
+			"field[2,5.5;5,1;channel;" .. S("Channel") .. ";${channel}]"..
 			((default and default.get_hotbar_bg) and default.get_hotbar_bg(0,6) or "")..
 			"list[current_player;main;0,6;8,4;]"..
 			"listring[]")
@@ -109,97 +204,8 @@ minetest.register_node("digilines:chest", {
 			return not pipeworks.connects.facingFront(i,param2)
 		end,
 		input_inventory = "main",
-		can_insert = function(pos, _, stack, direction)
+		can_insert = tube_can_insert,
-			local ret = minetest.get_meta(pos):get_inventory():room_for_item("main", stack)
+		insert_object = tube_insert_object,
-			if not ret then
-				-- The stack cannot be accepted. It will never be passed to
-				-- insert_object, but it should be reported as a toverflow.
-				-- Here, direction = direction item is moving, which is into
-				-- side.
-				local side = vector.multiply(direction, -1)
-				send_message(pos, "toverflow", stack, nil, nil, side)
-			end
-			return ret
-		end,
-		insert_object = function(pos, _, original_stack, direction)
-			-- Here, direction = direction item is moving, which is into side.
-			local side = vector.multiply(direction, -1)
-			local inv = minetest.get_meta(pos):get_inventory()
-			local inv_contents = inv:get_list("main")
-			local any_put = false
-			local stack = original_stack
-			local stack_name = stack:get_name()
-			local stack_count = stack:get_count()
-			-- Walk the inventory, adding items to existing stacks of the same
-			-- type.
-			for i = 1, #inv_contents do
-				local existing_stack = inv_contents[i]
-				if not existing_stack:is_empty() and existing_stack:get_name() == stack_name then
-					local leftover = existing_stack:add_item(stack)
-					local leftover_count = leftover:get_count()
-					if leftover_count ~= stack_count then
-						-- We put some items into the slot. Update the slot in
-						-- the inventory, tell Digilines listeners about it,
-						-- and keep looking for the a place to put the
-						-- leftovers if any.
-						any_put = true
-						inv:set_stack("main", i, existing_stack)
-						local stack_that_was_put
-						if leftover_count == 0 then
-							stack_that_was_put = stack
-						else
-							stack_that_was_put = ItemStack(stack)
-							stack_that_was_put:set_count(stack_count - leftover_count)
-						end
-						send_message(pos, "tput", stack_that_was_put, nil, i, side)
-						stack = leftover
-						stack_count = leftover_count
-						if stack_count == 0 then
-							break
-						end
-					end
-				end
-			end
-			if stack_count ~= 0 then
-				-- Walk the inventory, adding items to empty slots.
-				for i = 1, #inv_contents do
-					local existing_stack = inv_contents[i]
-					if existing_stack:is_empty() then
-						local leftover = existing_stack:add_item(stack)
-						local leftover_count = leftover:get_count()
-						if leftover_count ~= stack_count then
-							-- We put some items into the slot. Update the slot in
-							-- the inventory, tell Digilines listeners about it,
-							-- and keep looking for the a place to put the
-							-- leftovers if any.
-							any_put = true
-							inv:set_stack("main", i, existing_stack)
-							local stack_that_was_put
-							if leftover_count == 0 then
-								stack_that_was_put = stack
-							else
-								stack_that_was_put = ItemStack(stack)
-								stack_that_was_put:set_count(stack_count - leftover_count)
-							end
-							send_message(pos, "tput", stack_that_was_put, nil, i, side)
-							stack = leftover
-							stack_count = leftover_count
-							if stack_count == 0 then
-								break
-							end
-						end
-					end
-				end
-			end
-			if any_put then
-				check_full(pos, original_stack)
-			end
-			if stack_count ~= 0 then
-				-- Some items could not be added and bounced back. Report them.
-				send_message(pos, "toverflow", stack, nil, nil, side)
-			end
-			return stack
-		end,
 		remove_items = function(pos, _, stack, dir, count)
 			-- Here, stack is the ItemStack in our own inventory that is being
 			-- pulled from, NOT the stack that is actually pulled out.
@@ -310,6 +316,96 @@ minetest.register_node("digilines:chest", {
 	end
 })
 
+if minetest.global_exists("tubelib") then
+	local speculative_pull = nil
+	local pull_succeeded = function(passed_speculative_pull)
+		if passed_speculative_pull.canceled then return end
+
+		send_message(passed_speculative_pull.pos, "ttake", passed_speculative_pull.taken,
+				passed_speculative_pull.index, nil, vector.multiply(passed_speculative_pull.dir, -1))
+		check_empty(passed_speculative_pull.pos)
+	end
+	local function tube_side(pos, side)
+		if side == "U" then return {x=0,y=-1,z=0}
+		elseif side == "D" then return {x=0,y=1,z=0}
+		end
+		local param2 = minetest.get_node(pos).param2
+		return vector.multiply(
+			minetest.facedir_to_dir(
+				tubelib2.side_to_dir(side, param2) - 1),
+			-1)
+	end
+	tubelib.register_node("digilines:chest", {}, {
+		on_pull_stack = function(pos, side, _)
+			local inv = minetest.get_meta(pos):get_inventory()
+			for i, stack in pairs(inv:get_list("main")) do
+				if not stack:is_empty() then
+					speculative_pull = {
+						canceled = false,
+						pos = pos,
+						taken = stack,
+						index = i,
+						dir = tube_side(pos, side)
+					}
+					minetest.after(0, pull_succeeded, speculative_pull)
+					inv:set_stack("main", i, nil)
+					return stack
+				end
+			end
+			return nil
+		end,
+		on_pull_item = function(pos, side, _)
+			local inv = minetest.get_meta(pos):get_inventory()
+			for i, stack in pairs(inv:get_list("main")) do
+				if not stack:is_empty() then
+					local taken = stack:take_item(1)
+					speculative_pull = {
+						canceled = false,
+						pos = pos,
+						taken = taken,
+						index = i,
+						dir = tube_side(pos, side)
+					}
+					minetest.after(0, pull_succeeded, speculative_pull)
+					inv:set_stack("main", i, stack)
+					return taken
+				end
+			end
+			return nil
+		end,
+		on_push_item = function(pos, side, item, _)
+			local dir_vec = tube_side(pos, side)
+			if not tube_can_insert(pos, nil, item, dir_vec) then
+				return false
+			end
+			tube_insert_object(pos, nil, item, dir_vec)
+			return true
+		end,
+		on_unpull_item = function(pos, _, item, _)
+			local inv = minetest.get_meta(pos):get_inventory()
+			if not inv:room_for_item("main", item) then
+				return false
+			end
+
+			local existing_stack = inv:get_stack("main", speculative_pull.index)
+			local leftover = existing_stack:add_item(item)
+			if not leftover:is_empty() then
+				return false
+			end
+
+			inv:set_stack("main", speculative_pull.index, existing_stack)
+
+			-- Cancel speculative pull
+			-- this on_unpull_item callback should be called
+			-- immediately after on_pull_item if it fails
+			-- so this should be procedural
+			speculative_pull.canceled = true
+			speculative_pull = nil
+			return true
+		end,
+	})
+end
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "digilines:chest",

lcd.lua

@@ -1,3 +1,5 @@
+local S = digilines.S
+
 --* parts are currently not possible because you cannot set the pitch of an entity from lua
 
 -- Font: 04.jp.org
@@ -270,7 +272,7 @@ local lcd_box = {
 minetest.register_alias("digilines_lcd:lcd", "digilines:lcd")
 minetest.register_node("digilines:lcd", {
 	drawtype = "nodebox",
-	description = "Digiline LCD",
+	description = S("Digiline LCD"),
 	inventory_image = "lcd_lcd.png",
 	wield_image = "lcd_lcd.png",
 	tiles = {"lcd_anyside.png"},

lightsensor.lua

@@ -1,3 +1,5 @@
+local S = digilines.S
+
 local GET_COMMAND = "GET"
 
 local lsensor_nodebox =
@@ -31,7 +33,7 @@ end
 
 minetest.register_alias("digilines_lightsensor:lightsensor", "digilines:lightsensor")
 minetest.register_node("digilines:lightsensor", {
-	description = "Digiline Lightsensor",
+	description = S("Digiline Lightsensor"),
 	drawtype = "nodebox",
 	tiles = {"digilines_lightsensor.png"},
 
@@ -61,3 +63,11 @@ minetest.register_node("digilines:lightsensor", {
 		end
 	end,
 })
+
+minetest.register_craft({
+	output = "digilines:lightsensor",
+	recipe = {
+		{"default:glass","default:glass","default:glass"},
+		{"default:steel_ingot", "digilines:wire_std_00000000", "default:steel_ingot"},
+	}
+})

locale/digilines.zh_TW.tr

@@ -0,0 +1,17 @@
+# textdomain: digilines
+
+### inventory.lua ###
+Digiline Chest=訊纜儲物箱
+Channel=頻道
+
+### lcd.lua ###
+Digiline LCD=訊纜 LCD
+
+### lightsensor.lua ###
+Digiline Lightsensor=訊纜光感應器
+
+### rtc.lua ###
+Digiline Real Time Clock (RTC)=訊纜實時時鐘
+
+### wire_std.lua ###
+Digiline=訊纜

locale/template.txt

@@ -0,0 +1,17 @@
+# textdomain: digilines
+
+### inventory.lua ###
+Digiline Chest=
+Channel=
+
+### lcd.lua ###
+Digiline LCD=
+
+### lightsensor.lua ###
+Digiline Lightsensor=
+
+### rtc.lua ###
+Digiline Real Time Clock (RTC)=
+
+### wire_std.lua ###
+Digiline=

mod.conf

@@ -1,5 +1,6 @@
 name = digilines
 depends = default
+optional_depends = tubelib,tubelib2
 description = """
 This mod adds digiline wires, an RTC (Real Time Clock), a light sensor as well as an LCD Screen. 
 Can be used together with the luacontroller from mesecons.

rtc.lua

@@ -1,3 +1,5 @@
+local S = digilines.S
+
 local GET_COMMAND = "GET"
 
 local rtc_nodebox =
@@ -26,7 +28,7 @@ end
 
 minetest.register_alias("digilines_rtc:rtc", "digilines:rtc")
 minetest.register_node("digilines:rtc", {
-	description = "Digiline Real Time Clock (RTC)",
+	description = S("Digiline Real Time Clock (RTC)"),
 	drawtype = "nodebox",
 	tiles = {"digilines_rtc.png"},
 
@@ -57,3 +59,12 @@ minetest.register_node("digilines:rtc", {
 		end
 	end,
 })
+
+minetest.register_craft({
+	output = "digilines:rtc",
+	recipe = {
+		{"", "dye:black", ""},
+		{"default:steel_ingot", "default:mese_crystal_fragment", "default:steel_ingot"},
+		{"", "digilines:wire_std_00000000", ""}
+	}
+})

wire_std.lua

@@ -1,3 +1,5 @@
+local S = digilines.S
+
 -- naming scheme: wire:(xp)(zp)(xm)(zm)_on/off
 -- The conditions in brackets define whether there is a digiline at that place or not
 -- 1 = there is one; 0 = there is none
@@ -36,7 +38,7 @@ for zmy=0, 1 do
 
 	if nodeid == "00000000" then
 		groups = {dig_immediate = 3}
-		wiredesc = "Digiline"
+		wiredesc = S("Digiline")
 	else
 		groups = {dig_immediate = 3, not_in_creative_inventory = 1}
 	end