From df644d7f7736fce4e92a75d53f44b3df6671ceeb Mon Sep 17 00:00:00 2001
From: sdzen <sdzen@techie.com>
Date: Wed, 07 Aug 2013 02:08:22 +0200
Subject: [PATCH] Merge pull request #76 from kol0/patch-2
---
technic/init.lua | 91 +++++++++++++++------------------------------
1 files changed, 31 insertions(+), 60 deletions(-)
diff --git a/technic/init.lua b/technic/init.lua
index eabf48e..da67c07 100644
--- a/technic/init.lua
+++ b/technic/init.lua
@@ -1,10 +1,18 @@
--- Minetest 0.4.6 mod: technic
+-- Minetest 0.4.7 mod: technic
-- namespace: technic
-- (c) 2012-2013 by RealBadAngel <mk@realbadangel.pl>
technic = {}
-modpath=minetest.get_modpath("technic")
+local modpath = minetest.get_modpath("technic")
+
+technic.modpath = modpath
+
+technic.dprint = function(string)
+ if technic.DBG == 1 then
+ print(string)
+ end
+end
--Read technic config file
dofile(modpath.."/config.lua")
@@ -14,70 +22,33 @@
--items
dofile(modpath.."/items.lua")
---LV machines
-dofile(modpath.."/wires.lua")
-dofile(modpath.."/battery_box.lua")
-dofile(modpath.."/alloy_furnaces_commons.lua")
-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.."/tool_workshop.lua")
-dofile(modpath.."/music_player.lua")
-dofile(modpath.."/generator.lua")
-dofile(modpath.."/grinder.lua")
-dofile(modpath.."/cnc.lua")
-dofile(modpath.."/cnc_api.lua")
-dofile(modpath.."/cnc_nodes.lua")
+-- Register functions
+dofile(modpath.."/register_machine_and_tool.lua")
---MV machines
-dofile(modpath.."/wires_mv.lua")
-dofile(modpath.."/battery_box_mv.lua")
-dofile(modpath.."/solar_panel_mv.lua")
-dofile(modpath.."/electric_furnace_mv.lua")
-dofile(modpath.."/alloy_furnace_mv.lua")
-dofile(modpath.."/forcefield.lua")
+-- Machines
+dofile(modpath.."/machines/init.lua")
---HV machines
-dofile(modpath.."/wires_hv.lua")
-dofile(modpath.."/battery_box_hv.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")
+-- 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
+ 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.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
+ 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