From 11f2b4f4b317a25972733e3d3fe9f2dc6ce31c6a Mon Sep 17 00:00:00 2001 From: David Leal <halfpacho@gmail.com> Date: Sat, 05 Sep 2020 18:54:37 +0200 Subject: [PATCH] Fix warning reported by LuaCheck (#563) --- technic/init.lua | 108 +++++++++++++++++++---------------------------------- 1 files changed, 39 insertions(+), 69 deletions(-) diff --git a/technic/init.lua b/technic/init.lua index 184c8b9..370c71b 100644 --- a/technic/init.lua +++ b/technic/init.lua @@ -1,83 +1,53 @@ --- Minetest 0.4.4 : technic +-- Minetest 0.4.7 mod: technic +-- namespace: technic +-- (c) 2012-2013 by RealBadAngel <mk@realbadangel.pl> -modpath=minetest.get_modpath("technic") +local load_start = os.clock() ---Read technic config file +technic = rawget(_G, "technic") or {} +technic.creative_mode = minetest.settings:get_bool("creative_mode") + + +local modpath = minetest.get_modpath("technic") +technic.modpath = modpath + + +-- Boilerplate to support intllib +if rawget(_G, "intllib") then + technic.getter = intllib.Getter() +else + technic.getter = function(s,a,...)if a==nil then return s end a={a,...}return s:gsub("(@?)@(%(?)(%d+)(%)?)",function(e,o,n,c)if e==""then return a[tonumber(n)]..(o==""and c or"")else return"@"..o..n..c end end) end +end +local S = technic.getter + +-- Read configuration file dofile(modpath.."/config.lua") --- world gen -dofile(modpath.."/ores.lua") -if enable_rubber_tree_generation==true then dofile(modpath.."/rubber.lua") end +-- Helper functions +dofile(modpath.."/helpers.lua") --- chests -dofile(modpath.."/chest_commons.lua") -dofile(modpath.."/iron_chest.lua") -dofile(modpath.."/copper_chest.lua") -dofile(modpath.."/silver_chest.lua") -dofile(modpath.."/gold_chest.lua") -dofile(modpath.."/mithril_chest.lua") - ---items -dofile(modpath.."/concrete.lua") +-- Items dofile(modpath.."/items.lua") ---LV machines -dofile(modpath.."/alloy_furnace.lua") -dofile(modpath.."/solar_panel.lua") -dofile(modpath.."/geothermal.lua") -dofile(modpath.."/water_mill.lua") -dofile(modpath.."/electric_furnace.lua") -dofile(modpath.."/battery_box.lua") -dofile(modpath.."/wires.lua") -dofile(modpath.."/tool_workshop.lua") -dofile(modpath.."/music_player.lua") -dofile(modpath.."/generator.lua") -dofile(modpath.."/grinder.lua") +-- Craft recipes for items +dofile(modpath.."/crafts.lua") ---MV machines -dofile(modpath.."/wires_mv.lua") -dofile(modpath.."/solar_panel_mv.lua") -dofile(modpath.."/battery_box_mv.lua") -dofile(modpath.."/electric_furnace_mv.lua") +-- Register functions +dofile(modpath.."/register.lua") ---Tools -if enable_mining_drill==true then dofile(modpath.."/mining_drill.lua") end -if enable_mining_laser==true then dofile(modpath.."/mining_laser_mk1.lua") end -if enable_flashlight==true then dofile(modpath.."/flashlight.lua") end -dofile(modpath.."/cans.lua") -dofile(modpath.."/chainsaw.lua") -dofile(modpath.."/tree_tap.lua") -dofile(modpath.."/screwdriver.lua") -dofile(modpath.."/sonic_screwdriver.lua") +-- Radiation +dofile(modpath.."/radiation.lua") --- mesecons and tubes related ---dofile(modpath.."/injector.lua") -dofile(modpath.."/node_breaker.lua") -dofile(modpath.."/deployer.lua") -dofile(modpath.."/constructor.lua") +-- Machines +dofile(modpath.."/machines/init.lua") -if enable_item_drop then dofile(modpath.."/item_drop.lua") end -if enable_item_pickup then dofile(modpath.."/item_pickup.lua") end +-- Tools +dofile(modpath.."/tools/init.lua") -function has_locked_chest_privilege(meta, player) - if player:get_player_name() ~= meta:get_string("owner") then - return false - end - return true +-- Aliases for legacy node/item names +dofile(modpath.."/legacy.lua") + +if minetest.settings:get_bool("log_mods") then + print(S("[Technic] Loaded in %f seconds"):format(os.clock() - load_start)) end - -function hacky_swap_node(pos,name) - local node = minetest.env:get_node(pos) - local meta = minetest.env:get_meta(pos) - local meta0 = meta:to_table() - if node.name == name then - return nil - end - node.name = name - local meta0 = meta:to_table() - minetest.env:set_node(pos,node) - meta = minetest.env:get_meta(pos) - meta:from_table(meta0) - return 1 -end -- Gitblit v1.8.0