parent
761cd3e14b
commit
ddeaf76ade
16
.luacheckrc
16
.luacheckrc
@ -29,19 +29,9 @@ read_globals = {
|
|||||||
"monitoring", "drawers"
|
"monitoring", "drawers"
|
||||||
}
|
}
|
||||||
|
|
||||||
files["concrete/init.lua"].ignore = { "steel_ingot" }
|
-- Remove after network update
|
||||||
files["technic/machines/MV/tool_workshop.lua"].ignore = { "pos" }
|
|
||||||
files["technic/machines/other/frames.lua"].ignore = { "item_texture", "item_type", "adj", "connected", "" }
|
|
||||||
files["technic/machines/register/battery_box.lua"].ignore = { "pos", "tube_upgrade" }
|
|
||||||
files["technic/machines/register/cables.lua"].ignore = { "name", "from_below", "p" }
|
files["technic/machines/register/cables.lua"].ignore = { "name", "from_below", "p" }
|
||||||
files["technic/machines/register/common.lua"].ignore = { "result" }
|
|
||||||
|
|
||||||
files["technic/machines/register/generator.lua"].ignore = { "node" }
|
|
||||||
files["technic/machines/switching_station.lua"].ignore = { "pos1", "tier", "poshash" }
|
files["technic/machines/switching_station.lua"].ignore = { "pos1", "tier", "poshash" }
|
||||||
files["technic/radiation.lua"].ignore = { "LAVA_VISC" }
|
|
||||||
files["technic/tools/chainsaw.lua"].ignore = { "pos" }
|
|
||||||
files["technic/tools/mining_drill.lua"].ignore = { "mode" }
|
|
||||||
files["technic_chests/register.lua"].ignore = { "fs_helpers", "name", "locked_after_place" }
|
|
||||||
|
|
||||||
files["technic_cnc/cnc.lua"].ignore = { "multiplier" }
|
-- Remove after chests update
|
||||||
files["wrench/init.lua"].ignore = { "name", "stack" }
|
files["technic_chests/register.lua"].ignore = { "fs_helpers", "name", "locked_after_place" }
|
||||||
|
@ -16,13 +16,6 @@ for i = 32, 63 do
|
|||||||
"technic:concrete_post_with_platform")
|
"technic:concrete_post_with_platform")
|
||||||
end
|
end
|
||||||
|
|
||||||
local steel_ingot
|
|
||||||
if minetest.get_modpath("technic_worldgen") then
|
|
||||||
steel_ingot = "technic:carbon_steel_ingot"
|
|
||||||
else
|
|
||||||
steel_ingot = "default:steel_ingot"
|
|
||||||
end
|
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
output = 'technic:concrete_post_platform 6',
|
output = 'technic:concrete_post_platform 6',
|
||||||
recipe = {
|
recipe = {
|
||||||
|
@ -60,9 +60,9 @@ local run = function(pos, node)
|
|||||||
repairable = true
|
repairable = true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
technic.handle_machine_pipeworks(pos, tube_upgrade, function (pos, x_velocity, z_velocity)
|
technic.handle_machine_pipeworks(pos, tube_upgrade, function(pos2, x_velocity, z_velocity)
|
||||||
if not repairable then
|
if not repairable then
|
||||||
technic.send_items(pos, x_velocity, z_velocity, "src")
|
technic.send_items(pos2, x_velocity, z_velocity, "src")
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
if not repairable then
|
if not repairable then
|
||||||
|
@ -88,13 +88,6 @@ local function pos_in_list(l, pos)
|
|||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
local function table_empty(table)
|
|
||||||
for _, __ in pairs(table) do
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
|
|
||||||
local function add_table(table, toadd)
|
local function add_table(table, toadd)
|
||||||
local i = 1
|
local i = 1
|
||||||
while true do
|
while true do
|
||||||
@ -398,6 +391,8 @@ minetest.register_entity("technic:frame_entity", {
|
|||||||
local pos = vector.round(self.object:getpos())
|
local pos = vector.round(self.object:getpos())
|
||||||
frames_pos[pos_to_string(pos)] = node.name
|
frames_pos[pos_to_string(pos)] = node.name
|
||||||
|
|
||||||
|
-- This code does nothing currently, so it is disabled to stop luacheck warnings
|
||||||
|
--[[
|
||||||
local stack = ItemStack(node.name)
|
local stack = ItemStack(node.name)
|
||||||
local itemtable = stack:to_table()
|
local itemtable = stack:to_table()
|
||||||
local itemname = nil
|
local itemname = nil
|
||||||
@ -412,6 +407,7 @@ minetest.register_entity("technic:frame_entity", {
|
|||||||
item_texture = minetest.registered_items[itemname].inventory_image
|
item_texture = minetest.registered_items[itemname].inventory_image
|
||||||
item_type = minetest.registered_items[itemname].type
|
item_type = minetest.registered_items[itemname].type
|
||||||
end
|
end
|
||||||
|
--]]
|
||||||
local prop = {
|
local prop = {
|
||||||
is_visible = true,
|
is_visible = true,
|
||||||
textures = { node.name },
|
textures = { node.name },
|
||||||
@ -579,8 +575,8 @@ local function connected(pos, c, adj)
|
|||||||
minetest.registered_nodes[nodename].frames_can_connect(pos1, vect)) then
|
minetest.registered_nodes[nodename].frames_can_connect(pos1, vect)) then
|
||||||
c[#c + 1] = pos1
|
c[#c + 1] = pos1
|
||||||
if minetest.registered_nodes[nodename].frame == 1 then
|
if minetest.registered_nodes[nodename].frame == 1 then
|
||||||
local adj = minetest.registered_nodes[nodename].frame_connect_all(nodename)
|
local adj2 = minetest.registered_nodes[nodename].frame_connect_all(nodename)
|
||||||
connected(pos1, c, adj)
|
connected(pos1, c, adj2)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -798,7 +794,7 @@ local function template_drops(pos, node, oldmeta, digger)
|
|||||||
drops = { "technic:template 1" }
|
drops = { "technic:template 1" }
|
||||||
else
|
else
|
||||||
local dcc = minetest.deserialize(cc)
|
local dcc = minetest.deserialize(cc)
|
||||||
if not table_empty(dcc) then
|
if next(dcc) ~= nil then
|
||||||
drops = {}
|
drops = {}
|
||||||
for sp, _ in pairs(dcc) do
|
for sp, _ in pairs(dcc) do
|
||||||
local ssp = pos_from_string(sp)
|
local ssp = pos_from_string(sp)
|
||||||
@ -918,9 +914,9 @@ minetest.register_tool("technic:template_tool", {
|
|||||||
-- Template motor
|
-- Template motor
|
||||||
local function get_template_nodes(pos)
|
local function get_template_nodes(pos)
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
local connected = meta:get_string("connected")
|
local connected_to = meta:get_string("connected")
|
||||||
if connected == "" then return {} end
|
if connected_to == "" then return {} end
|
||||||
local adj = minetest.deserialize(connected)
|
local adj = minetest.deserialize(connected_to)
|
||||||
local c = {}
|
local c = {}
|
||||||
for _, vect in ipairs(adj) do
|
for _, vect in ipairs(adj) do
|
||||||
local pos1 = vector.add(pos, vect)
|
local pos1 = vector.add(pos, vect)
|
||||||
|
@ -225,11 +225,11 @@ function technic.register_battery_box(data)
|
|||||||
if data.tube then
|
if data.tube then
|
||||||
local inv = meta:get_inventory()
|
local inv = meta:get_inventory()
|
||||||
technic.handle_machine_pipeworks(pos, tube_upgrade,
|
technic.handle_machine_pipeworks(pos, tube_upgrade,
|
||||||
function(pos, x_velocity, z_velocity)
|
function(pos2, x_velocity, z_velocity)
|
||||||
if tool_full and not inv:is_empty("src") then
|
if tool_full and not inv:is_empty("src") then
|
||||||
technic.send_items(pos, x_velocity, z_velocity, "src")
|
technic.send_items(pos2, x_velocity, z_velocity, "src")
|
||||||
elseif tool_empty and not inv:is_empty("dst") then
|
elseif tool_empty and not inv:is_empty("dst") then
|
||||||
technic.send_items(pos, x_velocity, z_velocity, "dst")
|
technic.send_items(pos2, x_velocity, z_velocity, "dst")
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
@ -303,9 +303,9 @@ function technic.register_battery_box(data)
|
|||||||
drop = "technic:"..ltier.."_battery_box0",
|
drop = "technic:"..ltier.."_battery_box0",
|
||||||
on_construct = function(pos)
|
on_construct = function(pos)
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
local EU_upgrade, tube_upgrade = 0, 0
|
local EU_upgrade = 0
|
||||||
if data.upgrade then
|
if data.upgrade then
|
||||||
EU_upgrade, tube_upgrade = technic.handle_machine_upgrades(meta)
|
EU_upgrade = technic.handle_machine_upgrades(meta)
|
||||||
end
|
end
|
||||||
local max_charge = data.max_charge * (1 + EU_upgrade / 10)
|
local max_charge = data.max_charge * (1 + EU_upgrade / 10)
|
||||||
local charge = meta:get_int("internal_EU_charge")
|
local charge = meta:get_int("internal_EU_charge")
|
||||||
@ -344,9 +344,9 @@ function technic.register_battery_box(data)
|
|||||||
meta = minetest.get_meta(pos)
|
meta = minetest.get_meta(pos)
|
||||||
if not pipeworks.may_configure(pos, sender) then return end
|
if not pipeworks.may_configure(pos, sender) then return end
|
||||||
fs_helpers.on_receive_fields(pos, fields)
|
fs_helpers.on_receive_fields(pos, fields)
|
||||||
local EU_upgrade, tube_upgrade = 0, 0
|
local EU_upgrade = 0
|
||||||
if data.upgrade then
|
if data.upgrade then
|
||||||
EU_upgrade, tube_upgrade = technic.handle_machine_upgrades(meta)
|
EU_upgrade = technic.handle_machine_upgrades(meta)
|
||||||
end
|
end
|
||||||
local max_charge = data.max_charge * (1 + EU_upgrade / 10)
|
local max_charge = data.max_charge * (1 + EU_upgrade / 10)
|
||||||
local charge = meta:get_int("internal_EU_charge")
|
local charge = meta:get_int("internal_EU_charge")
|
||||||
|
@ -84,13 +84,13 @@ function technic.send_items(pos, x_velocity, z_velocity, output_name)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- FIXME: This funtion is never used anywhere, what is it for?
|
||||||
function technic.smelt_item(meta, result, speed)
|
function technic.smelt_item(meta, result, speed)
|
||||||
local inv = meta:get_inventory()
|
local inv = meta:get_inventory()
|
||||||
meta:set_int("cook_time", meta:get_int("cook_time") + 1)
|
meta:set_int("cook_time", meta:get_int("cook_time") + 1)
|
||||||
if meta:get_int("cook_time") < result.time / speed then
|
if meta:get_int("cook_time") < result.time / speed then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
local result
|
|
||||||
local afterfuel
|
local afterfuel
|
||||||
result, afterfuel = minetest.get_craft_result({method = "cooking", width = 1, items = inv:get_list("src")})
|
result, afterfuel = minetest.get_craft_result({method = "cooking", width = 1, items = inv:get_list("src")})
|
||||||
|
|
||||||
|
@ -205,7 +205,7 @@ function technic.register_generator(data)
|
|||||||
local timer = minetest.get_node_timer(pos)
|
local timer = minetest.get_node_timer(pos)
|
||||||
timer:start(1)
|
timer:start(1)
|
||||||
end,
|
end,
|
||||||
on_timer = function(pos, node)
|
on_timer = function(pos)
|
||||||
-- Connected back?
|
-- Connected back?
|
||||||
if technic.get_timeout(tier, pos) > 0 then return false end
|
if technic.get_timeout(tier, pos) > 0 then return false end
|
||||||
|
|
||||||
|
@ -465,7 +465,7 @@ for _, state in pairs({"flowing", "source"}) do
|
|||||||
liquidtype = state,
|
liquidtype = state,
|
||||||
liquid_alternative_flowing = "technic:corium_flowing",
|
liquid_alternative_flowing = "technic:corium_flowing",
|
||||||
liquid_alternative_source = "technic:corium_source",
|
liquid_alternative_source = "technic:corium_source",
|
||||||
liquid_viscosity = LAVA_VISC,
|
liquid_viscosity = 7,
|
||||||
liquid_renewable = false,
|
liquid_renewable = false,
|
||||||
damage_per_second = 6,
|
damage_per_second = 6,
|
||||||
post_effect_color = {a=192, r=80, g=160, b=80},
|
post_effect_color = {a=192, r=80, g=160, b=80},
|
||||||
|
@ -242,18 +242,12 @@ end
|
|||||||
local function mining_drill_mk2_setmode(user,itemstack)
|
local function mining_drill_mk2_setmode(user,itemstack)
|
||||||
local player_name=user:get_player_name()
|
local player_name=user:get_player_name()
|
||||||
local item=itemstack:to_table()
|
local item=itemstack:to_table()
|
||||||
local mode = nil
|
local meta=minetest.deserialize(item["metadata"]) or {}
|
||||||
local meta=minetest.deserialize(item["metadata"])
|
|
||||||
if meta==nil then
|
|
||||||
meta={}
|
|
||||||
mode=0
|
|
||||||
end
|
|
||||||
if meta["mode"]==nil then
|
if meta["mode"]==nil then
|
||||||
minetest.chat_send_player(player_name, S("Use while sneaking to change Mining Drill Mk%d modes."):format(2))
|
minetest.chat_send_player(player_name, S("Use while sneaking to change Mining Drill Mk%d modes."):format(2))
|
||||||
meta["mode"]=0
|
meta["mode"]=0
|
||||||
mode=0
|
|
||||||
end
|
end
|
||||||
mode=(meta["mode"])
|
local mode=meta["mode"]
|
||||||
mode=mode+1
|
mode=mode+1
|
||||||
if mode>=5 then mode=1 end
|
if mode>=5 then mode=1 end
|
||||||
minetest.chat_send_player(player_name, S("Mining Drill Mk%d Mode %d"):format(2, mode)..": "..mining_drill_mode_text[mode][1])
|
minetest.chat_send_player(player_name, S("Mining Drill Mk%d Mode %d"):format(2, mode)..": "..mining_drill_mode_text[mode][1])
|
||||||
@ -266,17 +260,12 @@ end
|
|||||||
local function mining_drill_mk3_setmode(user,itemstack)
|
local function mining_drill_mk3_setmode(user,itemstack)
|
||||||
local player_name=user:get_player_name()
|
local player_name=user:get_player_name()
|
||||||
local item=itemstack:to_table()
|
local item=itemstack:to_table()
|
||||||
local meta=minetest.deserialize(item["metadata"])
|
local meta=minetest.deserialize(item["metadata"]) or {}
|
||||||
if meta==nil then
|
|
||||||
meta={}
|
|
||||||
mode=0
|
|
||||||
end
|
|
||||||
if meta["mode"]==nil then
|
if meta["mode"]==nil then
|
||||||
minetest.chat_send_player(player_name, S("Use while sneaking to change Mining Drill Mk%d modes."):format(3))
|
minetest.chat_send_player(player_name, S("Use while sneaking to change Mining Drill Mk%d modes."):format(3))
|
||||||
meta["mode"]=0
|
meta["mode"]=0
|
||||||
mode=0
|
|
||||||
end
|
end
|
||||||
mode=(meta["mode"])
|
local mode=meta["mode"]
|
||||||
mode=mode+1
|
mode=mode+1
|
||||||
if mode>=6 then mode=1 end
|
if mode>=6 then mode=1 end
|
||||||
minetest.chat_send_player(player_name, S("Mining Drill Mk%d Mode %d"):format(3, mode)..": "..mining_drill_mode_text[mode][1])
|
minetest.chat_send_player(player_name, S("Mining Drill Mk%d Mode %d"):format(3, mode)..": "..mining_drill_mode_text[mode][1])
|
||||||
|
@ -163,7 +163,7 @@ local function form_handler(pos, formname, fields, sender)
|
|||||||
local inv = meta:get_inventory()
|
local inv = meta:get_inventory()
|
||||||
local inputstack = inv:get_stack("src", 1)
|
local inputstack = inv:get_stack("src", 1)
|
||||||
local inputname = inputstack:get_name()
|
local inputname = inputstack:get_name()
|
||||||
local multiplier = 0
|
local multiplier
|
||||||
local size = meta:get_int("size")
|
local size = meta:get_int("size")
|
||||||
if size < 1 then size = 1 end
|
if size < 1 then size = 1 end
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ local function get_pickup_name(name)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local function restore(pos, placer, itemstack)
|
local function restore(pos, placer, itemstack)
|
||||||
local name = itemstack:get_name()
|
local itemname = itemstack:get_name()
|
||||||
local node = minetest.get_node(pos)
|
local node = minetest.get_node(pos)
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
local inv = meta:get_inventory()
|
local inv = meta:get_inventory()
|
||||||
@ -43,7 +43,7 @@ local function restore(pos, placer, itemstack)
|
|||||||
if not data then
|
if not data then
|
||||||
minetest.remove_node(pos)
|
minetest.remove_node(pos)
|
||||||
minetest.log("error", placer:get_player_name().." wanted to place "..
|
minetest.log("error", placer:get_player_name().." wanted to place "..
|
||||||
name.." at "..minetest.pos_to_string(pos)..
|
itemname.." at "..minetest.pos_to_string(pos)..
|
||||||
", but it had no data.")
|
", but it had no data.")
|
||||||
minetest.log("verbose", "itemstack: "..itemstack:to_string())
|
minetest.log("verbose", "itemstack: "..itemstack:to_string())
|
||||||
return true
|
return true
|
||||||
@ -120,13 +120,13 @@ minetest.register_tool("wrench:wrench", {
|
|||||||
minetest.record_protection_violation(pos, player_name)
|
minetest.record_protection_violation(pos, player_name)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
local name = minetest.get_node(pos).name
|
local nname = minetest.get_node(pos).name
|
||||||
local def = wrench.registered_nodes[name]
|
local def = wrench.registered_nodes[nname]
|
||||||
if not def then
|
if not def then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local stack = ItemStack(get_pickup_name(name))
|
local stack = ItemStack(get_pickup_name(nname))
|
||||||
local player_inv = placer:get_inventory()
|
local player_inv = placer:get_inventory()
|
||||||
if not player_inv:room_for_item("main", stack) then
|
if not player_inv:room_for_item("main", stack) then
|
||||||
return
|
return
|
||||||
@ -144,15 +144,15 @@ minetest.register_tool("wrench:wrench", {
|
|||||||
end
|
end
|
||||||
|
|
||||||
local metadata = {}
|
local metadata = {}
|
||||||
metadata.name = name
|
metadata.name = nname
|
||||||
metadata.version = LATEST_SERIALIZATION_VERSION
|
metadata.version = LATEST_SERIALIZATION_VERSION
|
||||||
|
|
||||||
local inv = meta:get_inventory()
|
local inv = meta:get_inventory()
|
||||||
local lists = {}
|
local lists = {}
|
||||||
for _, listname in pairs(def.lists or {}) do
|
for _, listname in pairs(def.lists or {}) do
|
||||||
local list = inv:get_list(listname)
|
local list = inv:get_list(listname)
|
||||||
for i, stack in pairs(list) do
|
for i, s in pairs(list) do
|
||||||
list[i] = stack:to_string()
|
list[i] = s:to_string()
|
||||||
end
|
end
|
||||||
lists[listname] = list
|
lists[listname] = list
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user