Version MFF.

This commit is contained in:
sys4-fr 2018-09-08 14:42:39 +02:00
parent a1ed3acd7a
commit 85b55f57a4
193 changed files with 121 additions and 85 deletions

0
.gitignore vendored Normal file → Executable file
View File

0
LICENSE Normal file → Executable file
View File

0
README Normal file → Executable file
View File

9
autocrafter.lua Normal file → Executable file
View File

@ -183,7 +183,14 @@ local function update_meta(meta, enabled)
default.gui_bg_img.. default.gui_bg_img..
default.gui_slots.. default.gui_slots..
default.get_hotbar_bg(0,7) .. default.get_hotbar_bg(0,7) ..
"list[current_player;main;0,7;8,4;]") "list[current_player;main;0,7;8,4;]" ..
"listring[current_player;main]"..
"listring[context;src]" ..
"listring[context;dst]" ..
"listring[current_player;main]"..
"listring[context;recipe]" ..
"listring[context;output]"
)
-- toggling the button doesn't quite call for running a recipe change check -- toggling the button doesn't quite call for running a recipe change check
-- so instead we run a minimal version for infotext setting only -- so instead we run a minimal version for infotext setting only

0
autoplace_pipes.lua Normal file → Executable file
View File

0
autoplace_tubes.lua Normal file → Executable file
View File

0
changelog.txt Normal file → Executable file
View File

0
common.lua Normal file → Executable file
View File

0
compat.lua Normal file → Executable file
View File

0
crafts.lua Normal file → Executable file
View File

0
decorative_tubes.lua Normal file → Executable file
View File

0
default_settings.txt Normal file → Executable file
View File

0
depends.txt Normal file → Executable file
View File

2
devices.lua Normal file → Executable file
View File

@ -35,6 +35,8 @@ local pipes_devicelist = {
"storage_tank_10" "storage_tank_10"
} }
local rules = pipeworks.mesecons_rules -- Enough with the undefined global variable // MFF (Mg|01/07/2016 for #68)
-- Now define the nodes. -- Now define the nodes.
local states = { "on", "off" } local states = { "on", "off" }

14
filter-injector.lua Normal file → Executable file
View File

@ -45,7 +45,8 @@ local function set_filter_formspec(data, meta)
"Sequence slots Randomly", "Sequence slots Randomly",
"Sequence slots by Rotation"}).. "Sequence slots by Rotation"})..
exmatch_button.. exmatch_button..
"list[current_player;main;0,4.5;8,4;]" "list[current_player;main;0,4.5;8,4;]" ..
"listring[]"
end end
meta:set_string("formspec", formspec) meta:set_string("formspec", formspec)
end end
@ -143,6 +144,17 @@ local function punch_filter(data, filtpos, filtnode, msg)
local dir = minetest.facedir_to_right_dir(filtnode.param2) local dir = minetest.facedir_to_right_dir(filtnode.param2)
local frompos = vector.subtract(filtpos, dir) local frompos = vector.subtract(filtpos, dir)
local fromnode = minetest.get_node(frompos) local fromnode = minetest.get_node(frompos)
-- Fix crash with connected_chests (sys4 fix for MFF)
if fromnode and fromnode.name == "connected_chests:chest_right" then
local v_mul = vector.multiply(dir, 2)
frompos = vector.subtract(filtpos, v_mul)
fromnode = minetest.get_node(frompos)
if fromnode and fromnode.name ~= "connected_chests:chest_left" then
return
end
end
if not fromnode then return end if not fromnode then return end
local fromdef = minetest.registered_nodes[fromnode.name] local fromdef = minetest.registered_nodes[fromnode.name]
if not fromdef then return end if not fromdef then return end

0
flowing_logic.lua Normal file → Executable file
View File

2
init.lua Normal file → Executable file
View File

@ -113,5 +113,5 @@ if pipeworks.enable_autocrafter then dofile(pipeworks.modpath.."/autocrafter.lua
minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty") minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")
print("Pipeworks loaded!") minetest.log("Pipeworks loaded!")

2
item_transport.lua Normal file → Executable file
View File

@ -252,7 +252,7 @@ luaentity.register_entity("pipeworks:tubed_item", {
-- Using add_item instead of item_drop since this makes pipeworks backward -- Using add_item instead of item_drop since this makes pipeworks backward
-- compatible with Minetest 0.4.13. -- compatible with Minetest 0.4.13.
-- Using item_drop here makes Minetest 0.4.13 crash. -- Using item_drop here makes Minetest 0.4.13 crash.
minetest.add_item(drop_pos, stack) --minetest.add_item(drop_pos, stack) --Don't drop pipeworks items to reduce lag.
self:remove() self:remove()
return return
end end

0
legacy.lua Normal file → Executable file
View File

14
luaentity.lua Normal file → Executable file
View File

@ -29,7 +29,7 @@ local function read_entities()
end end
local function write_entities() local function write_entities()
for _, entity in pairs(luaentity.entities) do for _, entity in pairs(luaentity.entities or {}) do
setmetatable(entity, nil) setmetatable(entity, nil)
for _, attached in pairs(entity._attached_entities) do for _, attached in pairs(entity._attached_entities) do
if attached.entity then if attached.entity then
@ -53,11 +53,7 @@ end
local active_blocks = {} -- These only contain active blocks near players (i.e., not forceloaded ones) local active_blocks = {} -- These only contain active blocks near players (i.e., not forceloaded ones)
local handle_active_blocks_step = 2 local handle_active_blocks_step = 2
local handle_active_blocks_timer = 0 local function active_blocks_step()
minetest.register_globalstep(function(dtime)
handle_active_blocks_timer = handle_active_blocks_timer + dtime
if handle_active_blocks_timer >= handle_active_blocks_step then
handle_active_blocks_timer = handle_active_blocks_timer - handle_active_blocks_step
local active_block_range = tonumber(minetest.setting_get("active_block_range")) or 2 local active_block_range = tonumber(minetest.setting_get("active_block_range")) or 2
local new_active_blocks = {} local new_active_blocks = {}
for _, player in ipairs(minetest.get_connected_players()) do for _, player in ipairs(minetest.get_connected_players()) do
@ -76,8 +72,10 @@ minetest.register_globalstep(function(dtime)
end end
active_blocks = new_active_blocks active_blocks = new_active_blocks
-- todo: callbacks on block load/unload -- todo: callbacks on block load/unload
end
end) minetest.after(handle_active_blocks_step, active_blocks_step)
end
minetest.after(0, active_blocks_step)
local function is_active(pos) local function is_active(pos)
return active_blocks[minetest.hash_node_position(get_blockpos(pos))] ~= nil return active_blocks[minetest.hash_node_position(get_blockpos(pos))] ~= nil

0
models.lua Normal file → Executable file
View File

0
models/pipeworks_entry_panel.obj Normal file → Executable file
View File

0
models/pipeworks_flow_sensor.obj Normal file → Executable file
View File

0
models/pipeworks_fountainhead.obj Normal file → Executable file
View File

0
models/pipeworks_pipe_10.obj Normal file → Executable file
View File

0
models/pipeworks_pipe_2.obj Normal file → Executable file
View File

0
models/pipeworks_pipe_3.obj Normal file → Executable file
View File

0
models/pipeworks_pipe_4.obj Normal file → Executable file
View File

0
models/pipeworks_pipe_5.obj Normal file → Executable file
View File

0
models/pipeworks_pipe_6.obj Normal file → Executable file
View File

0
models/pipeworks_pipe_7.obj Normal file → Executable file
View File

0
models/pipeworks_pipe_8.obj Normal file → Executable file
View File

0
models/pipeworks_pipe_9.obj Normal file → Executable file
View File

0
models/pipeworks_pump.obj Normal file → Executable file
View File

0
models/pipeworks_spigot.obj Normal file → Executable file
View File

0
models/pipeworks_spigot_pouring.obj Normal file → Executable file
View File

0
models/pipeworks_valve_off.obj Normal file → Executable file
View File

0
models/pipeworks_valve_on.obj Normal file → Executable file
View File

0
pipes.lua Normal file → Executable file
View File

0
routing_tubes.lua Normal file → Executable file
View File

2
signal_tubes.lua Normal file → Executable file
View File

@ -1,5 +1,5 @@
if pipeworks.enable_detector_tube then if pipeworks.enable_detector_tube then
local detector_tube_step = 2 * tonumber(minetest.setting_get("dedicated_server_step")) local detector_tube_step = 1 --MFF crabman(2/1/2016 bug,step too short) 2 * tonumber(minetest.setting_get("dedicated_server_step"))
pipeworks.register_tube("pipeworks:detector_tube_on", { pipeworks.register_tube("pipeworks:detector_tube_on", {
description = "Detecting Pneumatic Tube Segment on (you hacker you)", description = "Detecting Pneumatic Tube Segment on (you hacker you)",
inventory_image = "pipeworks_detector_tube_inv.png", inventory_image = "pipeworks_detector_tube_inv.png",

0
sorting_tubes.lua Normal file → Executable file
View File

0
teleport_tube.lua Normal file → Executable file
View File

BIN
textures/homedecor_oil_extract.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 289 B

0
textures/homedecor_paraffin.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 345 B

BIN
textures/homedecor_plastic_sheeting.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 290 B

After

Width:  |  Height:  |  Size: 293 B

0
textures/pipeworks_accelerator_tube_end.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
textures/pipeworks_accelerator_tube_inv.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 665 B

After

Width:  |  Height:  |  Size: 665 B

0
textures/pipeworks_accelerator_tube_noctr.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
textures/pipeworks_accelerator_tube_plain.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
textures/pipeworks_accelerator_tube_short.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 661 B

After

Width:  |  Height:  |  Size: 661 B

0
textures/pipeworks_autocrafter.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 140 B

After

Width:  |  Height:  |  Size: 140 B

0
textures/pipeworks_black.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 83 B

After

Width:  |  Height:  |  Size: 83 B

0
textures/pipeworks_blue.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 83 B

After

Width:  |  Height:  |  Size: 83 B

0
textures/pipeworks_button_interm.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

0
textures/pipeworks_button_off.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

0
textures/pipeworks_button_on.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

0
textures/pipeworks_conductor_tube_end.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
textures/pipeworks_conductor_tube_inv.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
textures/pipeworks_conductor_tube_noctr.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
textures/pipeworks_conductor_tube_on_end.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
textures/pipeworks_conductor_tube_on_noctr.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
textures/pipeworks_conductor_tube_on_plain.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
textures/pipeworks_conductor_tube_plain.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
textures/pipeworks_conductor_tube_short.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 839 B

After

Width:  |  Height:  |  Size: 839 B

0
textures/pipeworks_crossing_tube_end.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
textures/pipeworks_crossing_tube_inv.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 535 B

After

Width:  |  Height:  |  Size: 535 B

0
textures/pipeworks_crossing_tube_noctr.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1005 B

After

Width:  |  Height:  |  Size: 1005 B

0
textures/pipeworks_crossing_tube_plain.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
textures/pipeworks_crossing_tube_short.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 575 B

After

Width:  |  Height:  |  Size: 575 B

0
textures/pipeworks_deployer_back.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 275 B

After

Width:  |  Height:  |  Size: 275 B

BIN
textures/pipeworks_deployer_bottom.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 801 B

After

Width:  |  Height:  |  Size: 801 B

0
textures/pipeworks_deployer_front_off.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 669 B

After

Width:  |  Height:  |  Size: 669 B

0
textures/pipeworks_deployer_front_on.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 543 B

After

Width:  |  Height:  |  Size: 543 B

BIN
textures/pipeworks_deployer_side.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 823 B

After

Width:  |  Height:  |  Size: 823 B

BIN
textures/pipeworks_deployer_side1.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 823 B

After

Width:  |  Height:  |  Size: 823 B

BIN
textures/pipeworks_deployer_side2.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 823 B

After

Width:  |  Height:  |  Size: 823 B

0
textures/pipeworks_deployer_top.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 800 B

After

Width:  |  Height:  |  Size: 800 B

0
textures/pipeworks_detector_tube_end.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
textures/pipeworks_detector_tube_inv.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 795 B

After

Width:  |  Height:  |  Size: 795 B

0
textures/pipeworks_detector_tube_noctr.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 892 B

After

Width:  |  Height:  |  Size: 892 B

0
textures/pipeworks_detector_tube_plain.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
textures/pipeworks_detector_tube_short.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 526 B

After

Width:  |  Height:  |  Size: 526 B

0
textures/pipeworks_dispenser_back.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
textures/pipeworks_dispenser_bottom.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
textures/pipeworks_dispenser_front_off.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
textures/pipeworks_dispenser_front_on.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
textures/pipeworks_dispenser_side1.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
textures/pipeworks_dispenser_side2.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
textures/pipeworks_dispenser_top.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
textures/pipeworks_entry_panel.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

0
textures/pipeworks_filter_input.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 190 B

After

Width:  |  Height:  |  Size: 190 B

0
textures/pipeworks_filter_output.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 175 B

0
textures/pipeworks_filter_side.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 190 B

After

Width:  |  Height:  |  Size: 190 B

0
textures/pipeworks_filter_top.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 195 B

BIN
textures/pipeworks_flow_sensor_off.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
textures/pipeworks_flow_sensor_on.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

0
textures/pipeworks_fountainhead.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

0
textures/pipeworks_grating_sides.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

0
textures/pipeworks_grating_top.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Some files were not shown because too many files have changed in this diff Show More