fluid system overhaul

common.lua

@@ -211,19 +211,21 @@ function fs_helpers.cycling_button(meta, base, meta_name, values)
 	return base..";"..(texture_name and texture_name..";" or "")..field..";"..minetest.formspec_escape(text)..(addopts and ";"..addopts or "").."]"
 end
 
-function fs_helpers.get_inv(y)
+function fs_helpers.get_inv(y,x)
+	local x = x or 0
 	local fs = {}
 	if minetest.get_modpath("i3") then
-		local inv_x = i3.settings.legacy_inventory and 0.75 or 0.22
+		local inv_x = (i3.settings.legacy_inventory and 0.75 or 0.22) + x
 		local inv_y = (y + 0.4) or 6.9
 		local size, spacing = 1, 0.1
 		local hotbar_len = i3.settings.hotbar_len or (i3.settings.legacy_inventory and 8 or 9)
-		local inv_size = i3.settings.inv_size or (hotbar_len * 4)
+		local hotbar_width = 4
+		local inv_size = i3.settings.inv_size or (hotbar_len * hotbar_width)
 
 		table.insert(fs, "style_type[box;colors=#77777710,#77777710,#777,#777]")
 
 		for i = 0, hotbar_len - 1 do
-			table.insert(fs, "box["..(i * size + inv_x + (i * spacing))..","..inv_y..";"..size..","..size..";]")
+			table.insert(fs, "box["..(inv_x + (i * (spacing + size)))..","..inv_y..";"..size..","..size..";]")
 		end
 
 		table.insert(fs, "style_type[list;size="..size..";spacing="..spacing.."]")
@@ -232,14 +234,14 @@ function fs_helpers.get_inv(y)
 		table.insert(fs, "style_type[box;colors=#666]")
 		for i=0, 2 do
 			for j=0, hotbar_len - 1 do
-				table.insert(fs, "box["..0.2+(j*0.1)+(j*size)..","..(inv_y+size+spacing+0.05)+(i*0.1)+(i*size)..";"..size..","..size..";]")
+				table.insert(fs, "box["..inv_x+(j*(spacing+size))..","..(inv_y+size+spacing+0.05)+(i*(spacing+size))..";"..size..","..size..";]")
 			end
 		end
 
 		table.insert(fs, "style_type[list;size="..size..";spacing="..spacing.."]")
-		table.insert(fs, "list[current_player;main;"..inv_x..","..(inv_y + 1.15)..";"..hotbar_len..","..(inv_size / hotbar_len)..";"..hotbar_len.."]")
+		table.insert(fs, "list[current_player;main;"..inv_x..","..(inv_y + 1.15)..";"..hotbar_len..","..hotbar_width..";"..hotbar_len.."]")
 	elseif minetest.get_modpath("mcl_formspec") then
-		local inv_x = 0.22
+		local inv_x = 0.22 + x
 		local inv_y = (y + 0.4) or 6.9
 		local size, spacing = 1, 0.1
 		local hotbar_len = 9
@@ -248,7 +250,7 @@ function fs_helpers.get_inv(y)
 		table.insert(fs, "style_type[box;colors=#77777710,#77777710,#777,#777]")
 
 		for i = 0, hotbar_len - 1 do
-			table.insert(fs, "box["..(i * size + inv_x + (i * spacing))..","..inv_y..";"..size..","..size..";]")
+			table.insert(fs, "box["..(inv_x + (i * (spacing + size)))..","..inv_y..";"..size..","..size..";]")
 		end
 
 		table.insert(fs, "style_type[list;size="..size..";spacing="..spacing.."]")
@@ -257,14 +259,14 @@ function fs_helpers.get_inv(y)
 		table.insert(fs, "style_type[box;colors=#666]")
 		for i=0, 2 do
 			for j=0, hotbar_len - 1 do
-				table.insert(fs, "box["..0.2+(j*0.1)+(j*size)..","..(inv_y+size+spacing+0.05)+(i*0.1)+(i*size)..";"..size..","..size..";]")
+				table.insert(fs, "box["..inv_x+(j*(spacing+size))..","..(inv_y+size+spacing+0.05)+(i*(spacing+size))..";"..size..","..size..";]")
 			end
 		end
 
 		table.insert(fs, "style_type[list;size="..size..";spacing="..spacing.."]")
 		table.insert(fs, "list[current_player;main;"..inv_x..","..(inv_y + 1.15)..";"..hotbar_len..","..(inv_size / hotbar_len)..";"..hotbar_len.."]")
 	else
-		table.insert(fs, "list[current_player;main;0.22,"..y..";8,4;]")
+		table.insert(fs, "list[current_player;main;".. (0.22 + x) ..","..y..";8,4;]")
 	end
 
 	return table.concat(fs, "")

crafts.lua

@@ -316,3 +316,51 @@ if pipeworks.enable_node_breaker then
 		}
 	})
 end
+
+if pipeworks.enable_autocrafter then
+
+local buckets = {}
+if core.get_modpath("bucket") then
+	buckets.air = "bucket:bucket_empty"
+	buckets.water = "bucket:bucket_water"
+	buckets.river_water = "bucket:bucket_river_water"
+	buckets.lava = "bucket:bucket_lava"
+elseif core.get_modpath("mcl_buckets") then
+	buckets.air = "mcl_buckets:bucket_empty"
+	buckets.water = "mcl_buckets:bucket_water"
+	buckets.river_water = "mcl_buckets:bucket_river_water"
+	buckets.lava = "mcl_buckets:bucket_lava"
+end
+
+if buckets.air and buckets.water then
+	local def = {
+		fluid = {type = "water", amount = 1},
+		output = ItemStack(buckets.water),
+		items = {
+			buckets.air, "", "", "", "", "", "", "", ""
+		}
+	}
+	pipeworks.fluid_recipes:register(def)
+end
+if buckets.air and buckets.lava then
+	local def = {
+		fluid = {type = "lava", amount = 1},
+		output = ItemStack(buckets.lava),
+		items = {
+			buckets.air, "", "", "", "", "", "", "", ""
+		}
+	}
+	pipeworks.fluid_recipes:register(def)
+end
+if buckets.river_water and buckets.lava then
+	local def = {
+		fluid = {type = "river_water", amount = 1},
+		output = ItemStack(buckets.river_water),
+		items = {
+			buckets.air, "", "", "", "", "", "", "", ""
+		}
+	}
+	pipeworks.fluid_recipes:register(def)
+end
+
+end

default_settings.lua

@@ -48,7 +48,7 @@ pipeworks.toggles = {}
 -- setting to nil inhibits all flow logic, useful for debugging ABM crashes,
 -- or for rendering the pipes purely decorative.
 ]]
-pipeworks.toggles.pipe_mode = "classic"
+pipeworks.toggles.pipe_mode = "pressure"
 --[[
 -- force-enable finite water handling mode.
 -- this changes the way that water node placement is handled;

devices.lua

@@ -127,6 +127,32 @@ local pipes_devicelist = {
 
 -- Now define the nodes.
 
+local sourcename = "pipeworks:source_loaded"
+local tile = table.copy(core.registered_nodes[pipeworks.liquids.water.source].tiles[1])
+tile.name = tile.name .. "^pipeworks_source_frame.png"
+core.register_node(sourcename, {
+	description = S("Infinite Water Source"),
+	tiles = { tile },
+	paramtype = "light",
+	groups = {snappy=3, pipe=1, dig_generic = 4, axey=1, handy=1, pickaxey=1},
+	is_ground_content = false,
+	_mcl_hardness=0.8,
+	_sound_def = {
+		key = "node_sound_metal_defaults",
+	},
+	walkable = true,
+	pipe_connections = { top = 1, bottom = 1, front = 1, back = 1, left = 1, right = 1},
+	after_place_node = function(pos)
+		pipeworks.scan_for_pipe_objects(pos)
+	end,
+	after_dig_node = function(pos)
+		pipeworks.scan_for_pipe_objects(pos)
+	end
+})
+
+new_flow_logic_register.simple(sourcename)
+new_flow_logic_register.intake(sourcename, 4, function() return 4 end)
+
 local states = { "on", "off" }
 
 for s in ipairs(states) do
@@ -579,7 +605,16 @@ new_flow_logic_register.directional_horizonal_rotate(nodename_sensor_loaded, tru
 -- activate flow sensor at roughly half the pressure pumps drive pipes
 local sensor_pressure_set = { { nodename_sensor_empty, 0.0 }, { nodename_sensor_loaded, 1.0 } }
 new_flow_logic_register.transition_simple_set(sensor_pressure_set, { mesecons=pipeworks.mesecons_rules })
-
+core.register_abm({
+	label = "flow sensor info",
+	nodenames = { "pipeworks:flow_sensor_empty", "pipeworks:flow_sensor_loaded" },
+	interval = 1,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		local meta = core.get_meta(pos)
+		meta:set_string("infotext", S("Pressure: @1", meta:get("pipeworks.water_pressure")))
+	end
+})
 
 
 -- tanks

init.lua

@@ -10,12 +10,19 @@ pipeworks = {
 	modpath = minetest.get_modpath("pipeworks"),
 	liquids = {
 		water = {
+			def = core.registered_nodes["mapgen_water_source"],
 			source = minetest.registered_nodes["mapgen_water_source"].name,
 			flowing = minetest.registered_nodes["mapgen_water_source"].liquid_alternative_flowing
 		},
 		river_water = {
+			def = core.registered_nodes["mapgen_river_water_source"],
 			source = minetest.registered_nodes["mapgen_river_water_source"].name,
 			flowing = minetest.registered_nodes["mapgen_river_water_source"].liquid_alternative_flowing
+		},
+		lava = {
+			def = core.registered_nodes["mapgen_lava_source"],
+			source = core.registered_nodes["mapgen_lava_source"].name,
+			flowing = core.registered_nodes["mapgen_lava_source"].liquid_alternative_flowing
 		}
 	}
 }
@@ -51,6 +58,17 @@ if minetest.get_modpath("signs_lib") then
 	dofile(pipeworks.modpath.."/signs_compat.lua")
 end
 
+local logicdir = "/pressure_logic/"
+
+-- note that even with these files the new flow logic is not yet default.
+-- registration will take place but no actual ABMs/node logic will be installed,
+-- unless the toggle flag is specifically enabled in the per-world settings flag.
+-- -- disregard previous comments, new flow logic is default now
+dofile(pipeworks.modpath..logicdir.."flowable_node_registry.lua")
+dofile(pipeworks.modpath..logicdir.."abms.lua")
+dofile(pipeworks.modpath..logicdir.."abm_register.lua")
+dofile(pipeworks.modpath..logicdir.."flowable_node_registry_install.lua")
+
 dofile(pipeworks.modpath.."/common.lua")
 dofile(pipeworks.modpath.."/models.lua")
 dofile(pipeworks.modpath.."/autoplace_pipes.lua")
@@ -80,16 +98,6 @@ if pipeworks.enable_sand_tube or pipeworks.enable_mese_sand_tube then
 	dofile(pipeworks.modpath.."/tubes/vacuum.lua")
 end
 
-local logicdir = "/pressure_logic/"
-
--- note that even with these files the new flow logic is not yet default.
--- registration will take place but no actual ABMs/node logic will be installed,
--- unless the toggle flag is specifically enabled in the per-world settings flag.
-dofile(pipeworks.modpath..logicdir.."flowable_node_registry.lua")
-dofile(pipeworks.modpath..logicdir.."abms.lua")
-dofile(pipeworks.modpath..logicdir.."abm_register.lua")
-dofile(pipeworks.modpath..logicdir.."flowable_node_registry_install.lua")
-
 if pipeworks.enable_pipes then
 	dofile(pipeworks.modpath.."/pipes.lua")
 end

mod.conf

@@ -1,5 +1,5 @@
 name = pipeworks
 description = This mod uses mesh nodes and nodeboxes to supply a complete set of 3D pipes and tubes, along with devices that work with them.
 depends = basic_materials, xcompat, fakelib
-optional_depends = mesecons, mesecons_mvps, digilines, signs_lib, unified_inventory, default, screwdriver, fl_mapgen, sound_api, i3, hades_core, hades_furnaces, hades_chests, mcl_mapgen_core, mcl_barrels, mcl_furnaces, mcl_experience, vizlib
+optional_depends = mesecons, mesecons_mvps, digilines, signs_lib, unified_inventory, default, screwdriver, fl_mapgen, sound_api, i3, hades_core, hades_furnaces, hades_chests, mcl_mapgen_core, mcl_barrels, mcl_furnaces, mcl_experience, vizlib, bucket, mcl_buckets
 min_minetest_version = 5.5.0

trashcan.lua

@@ -1,5 +1,6 @@
 local S = minetest.get_translator("pipeworks")
-minetest.register_node("pipeworks:trashcan", {
+local voidname = "pipeworks:trashcan"
+minetest.register_node(voidname, {
 	description = S("Trash Can"),
 	drawtype = "normal",
 	tiles = {
@@ -20,6 +21,7 @@ minetest.register_node("pipeworks:trashcan", {
 		connect_sides = {left = 1, right = 1, front = 1, back = 1, top = 1, bottom = 1},
 		priority = 1, -- Lower than anything else
 	},
+	pipe_connections = { top = 1, bottom = 1, front = 1, back = 1, left = 1, right = 1},
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
 		local size = "10.2,9"
@@ -48,5 +50,13 @@ minetest.register_node("pipeworks:trashcan", {
 	on_metadata_inventory_put = function(pos, listname, index, stack, player)
 		minetest.get_meta(pos):get_inventory():set_stack(listname, index, ItemStack(""))
 	end,
+	after_place_node = function(pos)
+		pipeworks.scan_for_pipe_objects(pos)
+	end,
+	after_dig_node = function(pos)
+		pipeworks.scan_for_pipe_objects(pos)
+	end,
 })
-pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = "pipeworks:trashcan"
+pipeworks.ui_cat_tube_list[#pipeworks.ui_cat_tube_list+1] = voidname
+pipeworks.flowables.register.simple(voidname)
+pipeworks.flowables.register.output(voidname, 0, 0, function() return 4 end, function()end)