From 76a39e71b9f81531e14efd7ec1b0accfefa0fa66 Mon Sep 17 00:00:00 2001
From: Luke aka SwissalpS <Luke@SwissalpS.ws>
Date: Wed, 25 Dec 2019 22:23:34 +0100
Subject: [PATCH] Cleanup duplicate call (#522)
---
technic/init.lua | 44 +++++++++++++++-----------------------------
1 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/technic/init.lua b/technic/init.lua
index 71a7f45..370c71b 100644
--- a/technic/init.lua
+++ b/technic/init.lua
@@ -2,17 +2,21 @@
-- namespace: technic
-- (c) 2012-2013 by RealBadAngel <mk@realbadangel.pl>
-technic = {}
-
local load_start = os.clock()
+
+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 + S("%s", "foo") syntax
-if intllib then
+
+-- Boilerplate to support intllib
+if rawget(_G, "intllib") then
technic.getter = intllib.Getter()
else
- technic.getter = function(s) return s end
+ 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
@@ -22,14 +26,17 @@
-- Helper functions
dofile(modpath.."/helpers.lua")
--- Items
+-- Items
dofile(modpath.."/items.lua")
--- Craft recipes for items
+-- Craft recipes for items
dofile(modpath.."/crafts.lua")
-- Register functions
dofile(modpath.."/register.lua")
+
+-- Radiation
+dofile(modpath.."/radiation.lua")
-- Machines
dofile(modpath.."/machines/init.lua")
@@ -40,28 +47,7 @@
-- Aliases for legacy node/item names
dofile(modpath.."/legacy.lua")
-function has_locked_chest_privilege(meta, player)
- if player:get_player_name() ~= meta:get_string("owner") then
- return false
- end
- return true
-end
-
--- Swap nodes out. Return the node name.
-function hacky_swap_node(pos, name)
- local node = minetest.get_node(pos)
- if node.name ~= name then
- local meta = minetest.get_meta(pos)
- local meta_table = meta:to_table()
- node.name = name
- minetest.set_node(pos, node)
- meta = minetest.get_meta(pos)
- meta:from_table(meta_table)
- end
- return node.name
-end
-
-if minetest.setting_get("log_mod") then
+if minetest.settings:get_bool("log_mods") then
print(S("[Technic] Loaded in %f seconds"):format(os.clock() - load_start))
end
--
Gitblit v1.8.0