From 707fa5a97c0d56e18f16d56f7130ff6220a090a1 Mon Sep 17 00:00:00 2001
From: Sires <ranearodrigo1@gmail.com>
Date: Mon, 26 Aug 2019 19:52:41 +0200
Subject: [PATCH] Fix typos

---
 technic/init.lua |  116 +++++++++++++++++-----------------------------------------
 1 files changed, 34 insertions(+), 82 deletions(-)

diff --git a/technic/init.lua b/technic/init.lua
index abe0439..370c71b 100644
--- a/technic/init.lua
+++ b/technic/init.lua
@@ -1,101 +1,53 @@
--- Minetest 0.4.6 mod: technic
+-- Minetest 0.4.7 mod: technic
 -- namespace: technic
 -- (c) 2012-2013 by RealBadAngel <mk@realbadangel.pl>
 
-technic = {}
+local load_start = os.clock()
 
-technic.dprint = function(string)
-		    if technic.DBG == 1 then
-		       print(string)
-		    end
-		 end
+technic = rawget(_G, "technic") or {}
+technic.creative_mode = minetest.settings:get_bool("creative_mode")
 
-local modpath=minetest.get_modpath("technic")
 
---Read technic config file
+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")
---helper functions
+
+-- Helper functions
 dofile(modpath.."/helpers.lua")
 
---items 
+-- Items
 dofile(modpath.."/items.lua")
 
+-- Craft recipes for items
+dofile(modpath.."/crafts.lua")
+
 -- Register functions
-dofile(modpath.."/register_machine_and_tool.lua")
-dofile(modpath.."/alloy_furnaces_commons.lua") -- Idea: Let the LV, MV, HV version of the furnace support different alloys
+dofile(modpath.."/register.lua")
 
--- Switching station LV,MV,HV
-dofile(modpath.."/switching_station.lua")
-dofile(modpath.."/supply_converter.lua")
+-- Radiation
+dofile(modpath.."/radiation.lua")
 
---LV machines
-dofile(modpath.."/wires.lua")
-dofile(modpath.."/battery_box.lua")
-dofile(modpath.."/alloy_furnace.lua")
-dofile(modpath.."/solar_panel.lua")
-dofile(modpath.."/solar_array_lv.lua")
-dofile(modpath.."/geothermal.lua")
-dofile(modpath.."/water_mill.lua")
-dofile(modpath.."/generator.lua")
-dofile(modpath.."/electric_furnace.lua")
-dofile(modpath.."/tool_workshop.lua")
-dofile(modpath.."/music_player.lua")
-dofile(modpath.."/grinder.lua")
-dofile(modpath.."/cnc.lua")
-dofile(modpath.."/cnc_api.lua")
-dofile(modpath.."/cnc_nodes.lua")
+-- Machines
+dofile(modpath.."/machines/init.lua")
 
---MV machines
-dofile(modpath.."/wires_mv.lua")
-dofile(modpath.."/battery_box_mv.lua")
-dofile(modpath.."/solar_array_mv.lua")
-dofile(modpath.."/electric_furnace_mv.lua")
-dofile(modpath.."/alloy_furnace_mv.lua")
---dofile(modpath.."/forcefield.lua")
----- The power radiator supplies appliances with inductive coupled power:
----- lighting and associated textures is taken directly from VanessaE's homedecor and made electric.
-dofile(modpath.."/power_radiator.lua")
-dofile(modpath.."/lighting.lua")
---
-----HV machines
-dofile(modpath.."/wires_hv.lua")
-dofile(modpath.."/battery_box_hv.lua")
-dofile(modpath.."/solar_array_hv.lua")
+-- Tools
+dofile(modpath.."/tools/init.lua")
 
---Tools
-if technic.config:getBool("enable_mining_drill") then dofile(modpath.."/mining_drill.lua") end
-if technic.config:getBool("enable_mining_laser") then dofile(modpath.."/mining_laser_mk1.lua") end
-if technic.config:getBool("enable_flashlight") then dofile(modpath.."/flashlight.lua") end
-dofile(modpath.."/cans.lua")
-dofile(modpath.."/chainsaw.lua")
-dofile(modpath.."/tree_tap.lua")
-dofile(modpath.."/sonic_screwdriver.lua")
---
----- mesecons and tubes related
-dofile(modpath.."/injector.lua")
-dofile(modpath.."/node_breaker.lua")
-dofile(modpath.."/deployer.lua")
-dofile(modpath.."/constructor.lua")
-dofile(modpath.."/frames.lua")
+-- 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
+if minetest.settings:get_bool("log_mods") then
+	print(S("[Technic] Loaded in %f seconds"):format(os.clock() - load_start))
 end
 
-
--- Swap nodes out. Return the node name.
-function hacky_swap_node(pos,name)
-   local node = minetest.env:get_node(pos)
-   if node.name ~= name then
-      local meta = minetest.env:get_meta(pos)
-      local meta0 = meta:to_table()
-      node.name = name
-      minetest.env:set_node(pos,node)
-      meta = minetest.env:get_meta(pos)
-      meta:from_table(meta0)
-   end
-   return node.name
-end

--
Gitblit v1.8.0