forked from mtcontrib/pipeworks
Compare commits
23 Commits
e04fb691ad
...
2021-02-19
Author | SHA1 | Date | |
---|---|---|---|
a735d1a155 | |||
a2c0dd1130 | |||
f0ef43823c | |||
17a602a5a1 | |||
2294a23582 | |||
b2d2ccbcba | |||
8322f256c5 | |||
ba7eb19317 | |||
065c953eba | |||
9a63d17e4a | |||
d814357ddf | |||
c2fe5fe956 | |||
9dbaa5f4f6 | |||
d93396600f | |||
c966a8a57d | |||
61b061f669 | |||
fe91d5eb46 | |||
eb1064ca6d | |||
f54e25ec52 | |||
dedb0dd54e | |||
477a024034 | |||
34cb0e7682 | |||
505fc7cc49 |
@ -47,7 +47,7 @@ local function autocraft(inventory, craft)
|
||||
end
|
||||
-- consume material
|
||||
for itemname, number in pairs(consumption) do
|
||||
for i = 1, number do -- We have to do that since remove_item does not work if count > stack_max
|
||||
for _ = 1, number do -- We have to do that since remove_item does not work if count > stack_max
|
||||
inventory:remove_item("src", ItemStack(itemname))
|
||||
end
|
||||
end
|
||||
@ -73,7 +73,7 @@ local function run_autocrafter(pos, elapsed)
|
||||
return false
|
||||
end
|
||||
|
||||
for step = 1, math.floor(elapsed/craft_time) do
|
||||
for _ = 1, math.floor(elapsed/craft_time) do
|
||||
local continue = autocraft(inventory, craft)
|
||||
if not continue then return false end
|
||||
end
|
||||
@ -106,7 +106,6 @@ local function after_recipe_change(pos, inventory)
|
||||
inventory:set_stack("output", 1, "")
|
||||
return
|
||||
end
|
||||
local recipe_changed = false
|
||||
local recipe = inventory:get_list("recipe")
|
||||
|
||||
local hash = minetest.hash_node_position(pos)
|
||||
@ -389,6 +388,27 @@ minetest.register_node("pipeworks:autocrafter", {
|
||||
end
|
||||
end
|
||||
after_recipe_change(pos,inv)
|
||||
elseif msg == "get_recipe" then
|
||||
local meta = minetest.get_meta(pos)
|
||||
local inv = meta:get_inventory()
|
||||
local recipe = {}
|
||||
for y=0,2,1 do
|
||||
local row = {}
|
||||
for x=1,3,1 do
|
||||
local slot = y*3+x
|
||||
table.insert(row, inv:get_stack("recipe",slot):get_name())
|
||||
end
|
||||
table.insert(recipe, row)
|
||||
end
|
||||
local setchan = meta:get_string("channel")
|
||||
local output = inv:get_stack("output", 1)
|
||||
digiline:receptor_send(pos, digiline.rules.default, setchan, {
|
||||
recipe = recipe,
|
||||
result = {
|
||||
name = output:get_name(),
|
||||
count = output:get_count(),
|
||||
}
|
||||
})
|
||||
elseif msg == "off" then
|
||||
update_meta(meta, false)
|
||||
minetest.get_node_timer(pos):stop()
|
||||
|
@ -81,7 +81,7 @@ local function tube_autoroute(pos)
|
||||
local basename = nodedef.basename
|
||||
if nodedef.style == "old" then
|
||||
local nsurround = ""
|
||||
for i, n in ipairs(active) do
|
||||
for _, n in ipairs(active) do
|
||||
nsurround = nsurround..n
|
||||
end
|
||||
nctr.name = basename.."_"..nsurround
|
||||
|
16
common.lua
16
common.lua
@ -86,10 +86,9 @@ function pipeworks.table_contains(tbl, element)
|
||||
end
|
||||
|
||||
function pipeworks.table_extend(tbl, tbl2)
|
||||
local index = #tbl + 1
|
||||
for _, elt in ipairs(tbl2) do
|
||||
tbl[index] = elt
|
||||
index = index + 1
|
||||
local oldlength = #tbl
|
||||
for i = 1,#tbl2 do
|
||||
tbl[oldlength + i] = tbl2[i]
|
||||
end
|
||||
end
|
||||
|
||||
@ -115,7 +114,7 @@ local fs_helpers = {}
|
||||
pipeworks.fs_helpers = fs_helpers
|
||||
function fs_helpers.on_receive_fields(pos, fields)
|
||||
local meta = minetest.get_meta(pos)
|
||||
for field, value in pairs(fields) do
|
||||
for field in pairs(fields) do
|
||||
if pipeworks.string_startswith(field, "fs_helpers_cycling:") then
|
||||
local l = field:split(":")
|
||||
local new_value = tonumber(l[2])
|
||||
@ -224,7 +223,7 @@ function pipeworks.create_fake_player(def, is_dynamic)
|
||||
return self._inventory:set_stack(def.wield_list,
|
||||
self._wield_index, item)
|
||||
end
|
||||
_wielded_item = ItemStack(item)
|
||||
self._wielded_item = ItemStack(item)
|
||||
end,
|
||||
get_wielded_item = function(self, item)
|
||||
if self._inventory and def.wield_list then
|
||||
@ -243,17 +242,18 @@ function pipeworks.create_fake_player(def, is_dynamic)
|
||||
set_bone_position = delay(),
|
||||
hud_change = delay(),
|
||||
}
|
||||
local _trash
|
||||
-- Getter & setter functions
|
||||
p.get_inventory_formspec, p.set_inventory_formspec
|
||||
= get_set_wrap("formspec", is_dynamic)
|
||||
p.get_breath, p.set_breath = get_set_wrap("breath", is_dynamic)
|
||||
p.get_hp, p.set_hp = get_set_wrap("hp", is_dynamic)
|
||||
p.get_pos, p.set_pos = get_set_wrap("pos", is_dynamic)
|
||||
_trash, p.move_to = get_set_wrap("pos", is_dynamic)
|
||||
p.get_wield_index, p.set_wield_index = get_set_wrap("wield_index", true)
|
||||
p.get_properties, p.set_properties = get_set_wrap("properties", false)
|
||||
|
||||
-- For players, move_to and get_pos do the same
|
||||
p.move_to = p.get_pos
|
||||
|
||||
-- Backwards compatibilty
|
||||
p.getpos = p.get_pos
|
||||
p.setpos = p.set_pos
|
||||
|
@ -65,7 +65,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||
local node = minetest.get_node(pos)
|
||||
|
||||
open_chests[pn] = nil
|
||||
for k, v in pairs(open_chests) do
|
||||
for _, v in pairs(open_chests) do
|
||||
if v.pos.x == pos.x and v.pos.y == pos.y and v.pos.z == pos.z then
|
||||
return true
|
||||
end
|
||||
@ -77,10 +77,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||
pipeworks.after_place(pos)
|
||||
end)
|
||||
minetest.sound_play(sound, {gain = 0.3, pos = pos, max_hear_distance = 10})
|
||||
end
|
||||
|
||||
elseif pipeworks.may_configure(pos, player) then
|
||||
-- Pipeworks Switch
|
||||
if pipeworks.may_configure(pos, player) and not fields.quit then
|
||||
fs_helpers.on_receive_fields(pos, fields)
|
||||
minetest.show_formspec(player:get_player_name(), "pipeworks:chest_formspec", get_chest_formspec(pos))
|
||||
end
|
||||
@ -232,7 +230,7 @@ override.tiles = {
|
||||
}
|
||||
|
||||
-- Add the extra groups
|
||||
for i,v in ipairs({override_protected, override, override_open, override_protected_open}) do
|
||||
for _,v in ipairs({override_protected, override, override_open, override_protected_open}) do
|
||||
v.groups.tubedevice = 1
|
||||
v.groups.tubedevice_receiver = 1
|
||||
end
|
||||
|
@ -7,7 +7,7 @@ local DS = minetest.get_translator("default")
|
||||
|
||||
local fs_helpers = pipeworks.fs_helpers
|
||||
|
||||
tube_entry = "^pipeworks_tube_connection_stony.png"
|
||||
local tube_entry = "^pipeworks_tube_connection_stony.png"
|
||||
|
||||
local function active_formspec(fuel_percent, item_percent, pos, meta)
|
||||
local formspec =
|
||||
|
16
devices.lua
16
devices.lua
@ -10,7 +10,7 @@ function pipeworks.fix_after_rotation(pos, node, user, mode, new_param2)
|
||||
|
||||
if string.find(node.name, "spigot") then new_param2 = new_param2 % 4 end
|
||||
|
||||
newnode = string.gsub(node.name, "_on", "_off")
|
||||
local newnode = string.gsub(node.name, "_on", "_off")
|
||||
minetest.swap_node(pos, { name = newnode, param2 = new_param2 })
|
||||
pipeworks.scan_for_pipe_objects(pos)
|
||||
|
||||
@ -36,9 +36,7 @@ function pipeworks.rotate_on_place(itemstack, placer, pointed_thing)
|
||||
local under = pointed_thing.under
|
||||
local fdir = minetest.dir_to_facedir(placer:get_look_dir())
|
||||
local undernode = minetest.get_node(under)
|
||||
local abovenode = minetest.get_node(above)
|
||||
local uname = undernode.name
|
||||
local aname = abovenode.name
|
||||
local isabove = (above.x == under.x) and (above.z == under.z) and (pitch > 0)
|
||||
local pos1 = above
|
||||
|
||||
@ -105,6 +103,7 @@ if minetest.get_modpath("mesecons") then
|
||||
}
|
||||
end
|
||||
|
||||
--[[
|
||||
local pipes_devicelist = {
|
||||
"pump",
|
||||
"valve",
|
||||
@ -120,14 +119,15 @@ local pipes_devicelist = {
|
||||
"storage_tank_9",
|
||||
"storage_tank_10"
|
||||
}
|
||||
--]]
|
||||
|
||||
-- Now define the nodes.
|
||||
|
||||
local states = { "on", "off" }
|
||||
local dgroups = ""
|
||||
|
||||
for s in ipairs(states) do
|
||||
|
||||
local dgroups
|
||||
if states[s] == "off" then
|
||||
dgroups = {snappy=3, pipe=1}
|
||||
else
|
||||
@ -465,7 +465,7 @@ minetest.register_node(nodename_sensor_empty, {
|
||||
end,
|
||||
on_construct = function(pos)
|
||||
if mesecon then
|
||||
mesecon.receptor_off(pos, rules)
|
||||
mesecon.receptor_off(pos, pipeworks.mesecons_rules)
|
||||
end
|
||||
end,
|
||||
selection_box = {
|
||||
@ -504,7 +504,7 @@ minetest.register_node(nodename_sensor_loaded, {
|
||||
end,
|
||||
on_construct = function(pos)
|
||||
if mesecon then
|
||||
mesecon.receptor_on(pos, rules)
|
||||
mesecon.receptor_on(pos, pipeworks.mesecons_rules)
|
||||
end
|
||||
end,
|
||||
selection_box = {
|
||||
@ -626,7 +626,7 @@ minetest.register_node(nodename_fountain_empty, {
|
||||
end,
|
||||
on_construct = function(pos)
|
||||
if mesecon then
|
||||
mesecon.receptor_on(pos, rules)
|
||||
mesecon.receptor_on(pos, pipeworks.mesecons_rules)
|
||||
end
|
||||
end,
|
||||
selection_box = {
|
||||
@ -661,7 +661,7 @@ minetest.register_node(nodename_fountain_loaded, {
|
||||
end,
|
||||
on_construct = function(pos)
|
||||
if mesecon then
|
||||
mesecon.receptor_on(pos, rules)
|
||||
mesecon.receptor_on(pos, pipeworks.mesecons_rules)
|
||||
end
|
||||
end,
|
||||
selection_box = {
|
||||
|
@ -1,10 +1,6 @@
|
||||
local S = minetest.get_translator("pipeworks")
|
||||
local fs_helpers = pipeworks.fs_helpers
|
||||
|
||||
local function delay(x)
|
||||
return (function() return x end)
|
||||
end
|
||||
|
||||
local function set_filter_infotext(data, meta)
|
||||
local infotext = S("@1 Filter-Injector", data.wise_desc)
|
||||
if meta:get_int("slotseq_mode") == 2 then
|
||||
@ -326,7 +322,8 @@ local function punch_filter(data, filtpos, filtnode, msg)
|
||||
end
|
||||
local pos = vector.add(frompos, vector.multiply(dir, 1.4))
|
||||
local start_pos = vector.add(frompos, dir)
|
||||
local item1 = pipeworks.tube_inject_item(pos, start_pos, dir, item, fakePlayer:get_player_name())
|
||||
pipeworks.tube_inject_item(pos, start_pos, dir, item,
|
||||
fakePlayer:get_player_name())
|
||||
return true -- only fire one item, please
|
||||
end
|
||||
end
|
||||
|
8
init.lua
8
init.lua
@ -6,8 +6,6 @@
|
||||
|
||||
pipeworks = {}
|
||||
|
||||
local DEBUG = false
|
||||
|
||||
pipeworks.worldpath = minetest.get_worldpath()
|
||||
pipeworks.modpath = minetest.get_modpath("pipeworks")
|
||||
local S = minetest.get_translator("pipeworks")
|
||||
@ -71,8 +69,8 @@ function pipeworks.may_configure(pos, player)
|
||||
local meta = minetest.get_meta(pos)
|
||||
local owner = meta:get_string("owner")
|
||||
|
||||
if owner ~= "" then -- wielders and filters
|
||||
return owner == name
|
||||
if owner ~= "" and owner == name then -- wielders and filters
|
||||
return true
|
||||
end
|
||||
return not minetest.is_protected(pos, name)
|
||||
end
|
||||
@ -150,4 +148,4 @@ end
|
||||
|
||||
minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")
|
||||
|
||||
print("Pipeworks loaded!")
|
||||
minetest.log("info", "Pipeworks loaded!")
|
||||
|
@ -42,7 +42,7 @@ minetest.register_globalstep(function(dtime)
|
||||
return
|
||||
end
|
||||
tube_item_count = {}
|
||||
for id, entity in pairs(luaentity.entities) do
|
||||
for _, entity in pairs(luaentity.entities) do
|
||||
if entity.name == "pipeworks:tubed_item" then
|
||||
local h = minetest.hash_node_position(vector.round(entity._pos))
|
||||
tube_item_count[h] = (tube_item_count[h] or 0) + 1
|
||||
@ -194,6 +194,7 @@ minetest.register_entity("pipeworks:tubed_item", {
|
||||
|
||||
from_data = function(self, itemstring)
|
||||
local stack = ItemStack(itemstring)
|
||||
--[[
|
||||
local itemtable = stack:to_table()
|
||||
local itemname = nil
|
||||
if itemtable then
|
||||
@ -205,6 +206,7 @@ minetest.register_entity("pipeworks:tubed_item", {
|
||||
item_texture = minetest.registered_items[itemname].inventory_image
|
||||
item_type = minetest.registered_items[itemname].type
|
||||
end
|
||||
--]]
|
||||
self.object:set_properties({
|
||||
is_visible = true,
|
||||
textures = {stack:get_name()}
|
||||
@ -391,7 +393,7 @@ if minetest.get_modpath("mesecons_mvps") then
|
||||
for _, n in ipairs(moved_nodes) do
|
||||
moved[minetest.hash_node_position(n.oldpos)] = vector.subtract(n.pos, n.oldpos)
|
||||
end
|
||||
for id, entity in pairs(luaentity.entities) do
|
||||
for _, entity in pairs(luaentity.entities) do
|
||||
if entity.name == "pipeworks:tubed_item" then
|
||||
local pos = entity:get_pos()
|
||||
local rpos = vector.round(pos)
|
||||
|
@ -1,6 +1,6 @@
|
||||
# textdomain: pipeworks
|
||||
# License: CC-by-SA 4.0
|
||||
# Author: wzy2006 <3450354617@qq.com>
|
||||
# Author: pevernow <3450354617@qq.com>
|
||||
|
||||
## digilines interfacing
|
||||
Channel=频道
|
||||
@ -12,23 +12,23 @@ Allow splitting incoming stacks from tubes=允许从管道中拆分传入堆栈
|
||||
Unknown item=通道
|
||||
unconfigured Autocrafter: unknown recipe=未配置的自动工作台: 未知配方
|
||||
unconfigured Autocrafter=未配置的自动工作台
|
||||
'@1' Autocrafter (@2)=自动建造者 '@1' (@2)
|
||||
'@1' Autocrafter (@2)=自动工作台 '@1' (@2)
|
||||
Save=保存
|
||||
paused '@1' Autocrafter=暂停的自动建造者
|
||||
Autocrafter=自动建造者
|
||||
paused '@1' Autocrafter=暂停的自动工作台
|
||||
Autocrafter=自动工作台
|
||||
|
||||
## compat-furnaces
|
||||
Allow splitting incoming material (not fuel) stacks from tubes=允许从管子中分离进来的材料(不是燃料)堆
|
||||
|
||||
## decorative tubes
|
||||
Airtight steelblock embedded tube=密封管集成到一块钢中
|
||||
Airtight panel embedded tube=密封面板嵌入式管
|
||||
Airtight steelblock embedded tube=密封嵌入式铁块管道
|
||||
Airtight panel embedded tube=密封嵌入式片状管道
|
||||
|
||||
## devices
|
||||
Pump/Intake Module=泵/进气模块
|
||||
Valve=阀门
|
||||
Decorative grating=Decorative grating
|
||||
Spigot outlet=出气口
|
||||
Spigot outlet=龙头
|
||||
Airtight Pipe entry/exit=密闭管进/出
|
||||
Flow Sensor=流量传感器
|
||||
Flow sensor (on)=流量传感器(上)
|
||||
@ -49,7 +49,7 @@ Exact match - on=完全匹配-开启
|
||||
Prefer item types:=偏好物品类型 :
|
||||
Itemwise=逐项
|
||||
Stackwise=堆叠方式
|
||||
Digiline=digiline
|
||||
Digiline=Digiline
|
||||
|
||||
## legacy
|
||||
Auto-Tap=自动轴阀
|
||||
@ -60,35 +60,35 @@ Pipe Segment (legacy)=管道(旧版)
|
||||
|
||||
|
||||
## routing tubes
|
||||
Pneumatic tube segment=空气管道
|
||||
Pneumatic tube segment=普通管道
|
||||
Broken Tube=断管
|
||||
High Priority Tube Segment=高优先级管段
|
||||
Accelerating Pneumatic Tube Segment=加速气动管道
|
||||
Crossing Pneumatic Tube Segment=交叉气动管道
|
||||
Accelerating Pneumatic Tube Segment=加速管道
|
||||
Crossing Pneumatic Tube Segment=定向管道
|
||||
One way tube=单向管
|
||||
|
||||
## signal tubes
|
||||
Detecting Pneumatic Tube Segment on=带有传感器的气动软管段(运行中)
|
||||
Detecting Pneumatic Tube Segment=检测气动管道
|
||||
Digiline Detecting Pneumatic Tube Segment=Digiline检测气动管道
|
||||
Detecting Pneumatic Tube Segment on=检测管道(运行中)
|
||||
Detecting Pneumatic Tube Segment=检测管道
|
||||
Digiline Detecting Pneumatic Tube Segment=Digiline检测管道
|
||||
Digiline Detecting Tube=Digiline检测管
|
||||
Conducting Pneumatic Tube Segment=传导空气管道
|
||||
Conducting Pneumatic Tube Segment on=导通气动管道
|
||||
Conducting Pneumatic Tube Segment=传导管道
|
||||
Conducting Pneumatic Tube Segment on=传导管道(运行中)
|
||||
Digiline Conducting Pneumatic Tube Segment=Digiline传导式气动管道
|
||||
Mesecon and Digiline Conducting Pneumatic Tube Segment=Mesecon和Digiline传导气动管道
|
||||
Mesecon and Digiline Conducting Pneumatic Tube Segment on=Mesecon和Digiline传导气动管道(运行中)
|
||||
Mesecon and Digiline Conducting Pneumatic Tube Segment=Mesecon和Digiline传导管道
|
||||
Mesecon and Digiline Conducting Pneumatic Tube Segment on=Mesecon和Digiline传导管道(运行中)
|
||||
|
||||
## sorting tubes
|
||||
Sorting Pneumatic Tube Segment=排序气动管道
|
||||
Sorting pneumatic tube=分选气动管
|
||||
Sorting Pneumatic Tube Segment=分类管道
|
||||
Sorting pneumatic tube=分类管道
|
||||
|
||||
## teleport tube
|
||||
Receive=接收
|
||||
channels are public by default=频道默认为公开
|
||||
use <player>:<channel> for fully private channels=49/5000将<player>:<channel>用于完全私人的频道
|
||||
use <player>;<channel> for private receivers=使用<player>;<channel>进行私人接待
|
||||
Teleporting Pneumatic Tube Segment=传送气动管道
|
||||
unconfigured Teleportation Tube=未配置的传送管
|
||||
use <player>:<channel> for fully private channels=将<player>:<channel>用于完全私人的频道
|
||||
use <player>;<channel> for private receivers=使用<player>;<channel>作为私人接收器
|
||||
Teleporting Pneumatic Tube Segment=传送管道
|
||||
unconfigured Teleportation Tube=未配置的传送管道
|
||||
Sorry, channel '@1' is reserved for exclusive use by @2=抱歉,频道‘@1’保留供‘@2’专用
|
||||
Sorry, receiving from channel '@1' is reserved for @2=抱歉,从频道'@1'接收的内容已保留给'@2'
|
||||
Teleportation Tube @1 on '@2'=传送管'@1'在'@2'上
|
||||
@ -97,14 +97,14 @@ Teleportation Tube @1 on '@2'=传送管'@1'在'@2'上
|
||||
Trash Can=垃圾箱
|
||||
|
||||
## tube registration
|
||||
Pneumatic tube segment (legacy)=空气管道(旧式)
|
||||
Pneumatic tube segment (legacy)=普通管道(旧式)
|
||||
|
||||
## vacuum tubes
|
||||
Vacuuming Pneumatic Tube Segment=吸尘气动管道
|
||||
Adjustable Vacuuming Pneumatic Tube Segment=可调式真空气动管道
|
||||
Adjustable Vacuuming Pneumatic Tube Segment (@1m)=可调式吸尘气动管道(@1m)
|
||||
Vacuuming Pneumatic Tube Segment=拾取管道
|
||||
Adjustable Vacuuming Pneumatic Tube Segment=高级拾取管道
|
||||
Adjustable Vacuuming Pneumatic Tube Segment (@1m)=高级拾取管道(@1m)
|
||||
|
||||
## wielder
|
||||
Node Breaker=节点断路器
|
||||
Deployer=部署者
|
||||
Dispenser=饮水机
|
||||
Node Breaker=方块破坏器
|
||||
Deployer=放置器
|
||||
Dispenser=投掷器
|
||||
|
@ -969,7 +969,7 @@ for white = 0, 1 do
|
||||
can_go = function(pos, node, velocity, stack)
|
||||
local src = {name = nil}
|
||||
-- add color of the incoming tube explicitly; referring to rules, in case they change later
|
||||
for color, rule in pairs(rules) do
|
||||
for _, rule in pairs(rules) do
|
||||
if (-velocity.x == rule.x and -velocity.y == rule.y and -velocity.z == rule.z) then
|
||||
src.name = rule.name
|
||||
break
|
||||
@ -993,7 +993,7 @@ for white = 0, 1 do
|
||||
on_blast = function(pos, intensity)
|
||||
if not intensity or intensity > 1 + 3^0.5 then
|
||||
minetest.remove_node(pos)
|
||||
return {string.format("%s_%s", name, dropname)}
|
||||
return
|
||||
end
|
||||
minetest.swap_node(pos, {name = "pipeworks:broken_tube_1"})
|
||||
pipeworks.scan_for_tube_objects(pos)
|
||||
@ -1070,7 +1070,7 @@ minetest.register_node(BASENAME .. "_burnt", {
|
||||
on_blast = function(pos, intensity)
|
||||
if not intensity or intensity > 1 + 3^0.5 then
|
||||
minetest.remove_node(pos)
|
||||
return {string.format("%s_%s", name, dropname)}
|
||||
return
|
||||
end
|
||||
minetest.swap_node(pos, {name = "pipeworks:broken_tube_1"})
|
||||
pipeworks.scan_for_tube_objects(pos)
|
||||
|
@ -318,19 +318,20 @@ end
|
||||
function luaentity.get_objects_inside_radius(pos, radius)
|
||||
local objects = {}
|
||||
local index = 1
|
||||
for id, entity in pairs(luaentity.entities) do
|
||||
for _, entity in pairs(luaentity.entities) do
|
||||
if vector.distance(pos, entity:get_pos()) <= radius then
|
||||
objects[index] = entity
|
||||
index = index + 1
|
||||
end
|
||||
end
|
||||
return objects
|
||||
end
|
||||
|
||||
local move_entities_globalstep_part2 = function(dtime)
|
||||
if not luaentity.entities then
|
||||
luaentity.entities = read_entities()
|
||||
end
|
||||
for id, entity in pairs(luaentity.entities) do
|
||||
for _, entity in pairs(luaentity.entities) do
|
||||
local master = entity._attached_entities_master
|
||||
local master_def = master and entity._attached_entities[master]
|
||||
local master_entity = master_def and master_def.entity
|
||||
@ -340,6 +341,8 @@ local move_entities_globalstep_part2 = function(dtime)
|
||||
entity._velocity = master_entity:get_velocity()
|
||||
entity._acceleration = master_entity:get_acceleration()
|
||||
else
|
||||
entity._velocity = entity._velocity or vector.new(0,0,0)
|
||||
entity._acceleration = entity._acceleration or vector.new(0,0,0)
|
||||
entity._pos = vector.add(vector.add(
|
||||
entity._pos,
|
||||
vector.multiply(entity._velocity, dtime)),
|
||||
|
@ -11,7 +11,7 @@ local new_flow_logic_register = pipeworks.flowables.register
|
||||
local polys = ""
|
||||
if pipeworks.enable_lowpoly then polys = "_lowpoly" end
|
||||
|
||||
local vti = {4, 3, 2, 1, 6, 5}
|
||||
--~ local vti = {4, 3, 2, 1, 6, 5}
|
||||
local cconnects = {{}, {1}, {1, 2}, {1, 3}, {1, 3, 5}, {1, 2, 3}, {1, 2, 3, 5}, {1, 2, 3, 4}, {1, 2, 3, 4, 5}, {1, 2, 3, 4, 5, 6}}
|
||||
for index, connects in ipairs(cconnects) do
|
||||
local outsel = {}
|
||||
@ -30,10 +30,12 @@ for index, connects in ipairs(cconnects) do
|
||||
table.insert(outsel, pipeworks.pipe_selectboxes[v])
|
||||
end
|
||||
|
||||
--[[
|
||||
if #connects == 1 then
|
||||
local v = connects[1]
|
||||
v = v-1 + 2*(v%2) -- Opposite side
|
||||
end
|
||||
--]]
|
||||
|
||||
local pgroups = {snappy = 3, pipe = 1, not_in_creative_inventory = 1}
|
||||
local pipedesc = S("Pipe Segment").." "..dump(connects)
|
||||
|
@ -29,7 +29,7 @@ end
|
||||
|
||||
|
||||
|
||||
local formatvec = function(vec) local sep="," return "("..tostring(vec.x)..sep..tostring(vec.y)..sep..tostring(vec.z)..")" end
|
||||
--~ local formatvec = function(vec) local sep="," return "("..tostring(vec.x)..sep..tostring(vec.y)..sep..tostring(vec.z)..")" end
|
||||
|
||||
|
||||
|
||||
@ -39,7 +39,7 @@ local formatvec = function(vec) local sep="," return "("..tostring(vec.x)..sep..
|
||||
local check_for_liquids_v2 = function(pos, limit)
|
||||
local coords = make_coords_offsets(pos, false)
|
||||
local total = 0
|
||||
for index, tpos in ipairs(coords) do
|
||||
for _, tpos in ipairs(coords) do
|
||||
if total >= limit then break end
|
||||
local name = minetest.get_node(tpos).name
|
||||
if name == "default:water_source" then
|
||||
@ -69,11 +69,13 @@ end
|
||||
|
||||
|
||||
-- logging is unreliable when something is crashing...
|
||||
--[[
|
||||
local nilexplode = function(caller, label, value)
|
||||
if value == nil then
|
||||
error(caller..": "..label.." was nil")
|
||||
end
|
||||
end
|
||||
--]]
|
||||
|
||||
|
||||
|
||||
@ -151,7 +153,7 @@ local get_neighbour_positions = function(pos, node)
|
||||
|
||||
-- then, check each possible neighbour to see if they can be reached from this node.
|
||||
local connections = {}
|
||||
for index, offset in ipairs(candidates) do
|
||||
for _, offset in ipairs(candidates) do
|
||||
local npos = vector.add(pos, offset)
|
||||
local neighbour = minetest.get_node(npos)
|
||||
local nodename = neighbour.name
|
||||
@ -185,13 +187,12 @@ flowlogic.balance_pressure = function(pos, node, currentpressure)
|
||||
-- local dname = "flowlogic.balance_pressure()@"..formatvec(pos).." "
|
||||
-- check the pressure of all nearby flowable nodes, and average it out.
|
||||
|
||||
-- pressure handles to average over
|
||||
local connections = {}
|
||||
-- unconditionally include self in nodes to average over.
|
||||
-- result of averaging will be returned as new pressure for main flow logic callback
|
||||
local totalv = currentpressure
|
||||
local totalc = 1
|
||||
|
||||
-- pressure handles to average over
|
||||
local connections = get_neighbour_positions(pos, node)
|
||||
|
||||
-- for each neighbour, add neighbour's pressure to the total to balance out
|
||||
@ -287,7 +288,7 @@ flowlogic.run_output = function(pos, node, currentpressure, oldpressure, outputd
|
||||
local upper = outputdef.upper
|
||||
local lower = outputdef.lower
|
||||
local result = currentpressure
|
||||
local threshold = nil
|
||||
local threshold
|
||||
if finitemode then threshold = lower else threshold = upper end
|
||||
if currentpressure > threshold then
|
||||
local takenpressure = outputdef.outputfn(pos, node, currentpressure, finitemode)
|
||||
@ -316,7 +317,7 @@ flowlogic.run_transition = function(node, currentpressure)
|
||||
local nodename_prev = simplesetdef[1].nodename
|
||||
local result_nodename = node.name
|
||||
|
||||
for index, element in ipairs(simplesetdef) do
|
||||
for _, element in ipairs(simplesetdef) do
|
||||
-- find the highest element that is below the current pressure.
|
||||
local threshold = element.threshold
|
||||
if threshold > currentpressure then
|
||||
@ -338,7 +339,9 @@ flowlogic.run_transition = function(node, currentpressure)
|
||||
end
|
||||
|
||||
if not found then
|
||||
pipeworks.logger("flowlogic.run_transition() BUG no transition definitions found! nodename="..nodename.." currentpressure="..tostring(currentpressure))
|
||||
pipeworks.logger("flowlogic.run_transition() BUG no transition " ..
|
||||
"definitions found! node.name=" .. node.name ..
|
||||
" currentpressure=" .. tostring(currentpressure))
|
||||
end
|
||||
|
||||
return result
|
||||
|
@ -26,8 +26,8 @@ local insertbase = function(nodename)
|
||||
end
|
||||
|
||||
local regwarning = function(kind, nodename)
|
||||
local tail = ""
|
||||
if pipeworks.toggles.pipe_mode ~= "pressure" then tail = " but pressure logic not enabled" end
|
||||
--~ local tail = ""
|
||||
--~ if pipeworks.toggles.pipe_mode ~= "pressure" then tail = " but pressure logic not enabled" end
|
||||
--pipeworks.logger(kind.." flow logic registry requested for "..nodename..tail)
|
||||
end
|
||||
|
||||
@ -106,7 +106,7 @@ register.directional_horizonal_rotate = function(nodename, doubleended)
|
||||
end
|
||||
local directionfn = function(node, direction)
|
||||
local result = false
|
||||
for index, endvec in ipairs(getends(node)) do
|
||||
for _, endvec in ipairs(getends(node)) do
|
||||
if vector.equals(direction, endvec) then result = true end
|
||||
end
|
||||
return result
|
||||
|
@ -23,7 +23,7 @@ end
|
||||
local function migrate_tube_db()
|
||||
local tmp_db = {}
|
||||
tp_tube_db.version = nil
|
||||
for key, val in pairs(tp_tube_db) do
|
||||
for _, val in pairs(tp_tube_db) do
|
||||
if(val.channel ~= "") then -- skip unconfigured tubes
|
||||
tmp_db[hash(val)] = val
|
||||
end
|
||||
@ -261,3 +261,11 @@ if minetest.get_modpath("mesecons_mvps") ~= nil then
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
-- Expose teleport tube database API for other mods
|
||||
pipeworks.tptube = {
|
||||
hash = hash,
|
||||
save_tube_db = save_tube_db,
|
||||
get_db = function() return tp_tube_db or read_tube_db() end,
|
||||
tp_tube_db_version = tp_tube_db_version
|
||||
}
|
||||
|
@ -1,10 +1,6 @@
|
||||
local S = minetest.get_translator("pipeworks")
|
||||
local assumed_eye_pos = vector.new(0, 1.5, 0)
|
||||
|
||||
local function vector_copy(v)
|
||||
return { x = v.x, y = v.y, z = v.z }
|
||||
end
|
||||
|
||||
local function delay(x)
|
||||
return (function() return x end)
|
||||
end
|
||||
@ -353,7 +349,7 @@ if pipeworks.enable_node_breaker then
|
||||
{pos=pointed_thing.under, gain=sound.gain})
|
||||
end
|
||||
wieldstack = virtplayer:get_wielded_item()
|
||||
else
|
||||
--~ else
|
||||
--pipeworks.logger(dname.."couldn't dig node!")
|
||||
end
|
||||
end
|
||||
@ -378,7 +374,7 @@ if pipeworks.enable_node_breaker then
|
||||
minetest.register_craft({
|
||||
output = "pipeworks:nodebreaker_off",
|
||||
recipe = {
|
||||
{ "pipeworks:gear", "pipeworks:gear", "pipeworks:gear" },
|
||||
{ "basic_materials:gear_steel", "basic_materials:gear_steel", "basic_materials:gear_steel" },
|
||||
{ "default:stone", "mesecons:piston", "default:stone" },
|
||||
{ "group:wood", "mesecons:mesecon", "group:wood" },
|
||||
}
|
||||
|
Reference in New Issue
Block a user