From ed818fe0ac735fb11e0d1bc27980271a7add32fa Mon Sep 17 00:00:00 2001
From: Maciej Kasatkin <mk@realbadangel.pl>
Date: Tue, 11 Sep 2012 23:27:24 +0200
Subject: [PATCH] Cleaning the code
---
electric_furnace.lua | 177 +++++++++++++++++++++++++
init.lua | 3
battery_box.lua | 212 ------------------------------
3 files changed, 181 insertions(+), 211 deletions(-)
diff --git a/electric.lua b/battery_box.lua
similarity index 62%
rename from electric.lua
rename to battery_box.lua
index 0faee79..120ca42 100644
--- a/electric.lua
+++ b/battery_box.lua
@@ -15,8 +15,6 @@
minetest.register_alias("battery", "technic:battery")
minetest.register_alias("battery_box", "technic:battery_box")
-minetest.register_alias("electric_furnace", "technic:electric_furnace")
-
minetest.register_craft({
output = 'technic:battery 1',
@@ -35,15 +33,6 @@
{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
}
})
-
-minetest.register_craft({
- output = 'technic:electric_furnace',
- recipe = {
- {'default:brick', 'default:brick', 'default:brick'},
- {'default:brick', '', 'default:brick'},
- {'default:steel_ingot', 'moreores:copper_ingot', 'default:steel_ingot'},
- }
-})
minetest.register_tool("technic:battery",
@@ -101,186 +90,8 @@
end,
})
-electric_furnace_formspec =
- "invsize[8,9;]"..
- "image[1,1;1,2;technic_power_meter_bg.png]"..
- "list[current_name;src;3,1;1,1;]"..
- "list[current_name;dst;5,1;2,2;]"..
- "list[current_player;main;0,5;8,4;]"..
- "label[0,0;Electric Furnace]"..
- "label[1,3;Power level]"
-
-minetest.register_node("technic:electric_furnace", {
- description = "Electric furnace",
- tiles = {"technic_electric_furnace_top.png", "technic_electric_furnace_bottom.png", "technic_electric_furnace_side.png",
- "technic_electric_furnace_side.png", "technic_electric_furnace_side.png", "technic_electric_furnace_front.png"},
- paramtype2 = "facedir",
- groups = {cracky=2},
- legacy_facedir_simple = true,
- sounds = default.node_sound_stone_defaults(),
- technic_power_machine=1,
- internal_EU_buffer=0;
- interal_EU_buffer_size=2000;
- on_construct = function(pos)
- local meta = minetest.env:get_meta(pos)
- meta:set_float("technic_power_machine", 1)
- meta:set_string("formspec", electric_furnace_formspec)
- meta:set_string("infotext", "Electric furnace")
- local inv = meta:get_inventory()
- inv:set_size("src", 1)
- inv:set_size("dst", 4)
- local EU_used = 0
- local furnace_is_cookin = 0
- local cooked = nil
- meta:set_float("internal_EU_buffer",0)
- meta:set_float("internal_EU_buffer_size",2000)
- end,
- can_dig = function(pos,player)
- local meta = minetest.env:get_meta(pos);
- local inv = meta:get_inventory()
- if not inv:is_empty("dst") then
- return false
- elseif not inv:is_empty("src") then
- return false
- end
- return true
- end,
-})
-
-minetest.register_node("technic:electric_furnace_active", {
- description = "Electric Furnace",
- tiles = {"technic_electric_furnace_top.png", "technic_electric_furnace_bottom.png", "technic_electric_furnace_side.png",
- "technic_electric_furnace_side.png", "technic_electric_furnace_side.png", "technic_electric_furnace_front_active.png"},
- paramtype2 = "facedir",
- light_source = 8,
- drop = "technic:electric_furnace",
- groups = {cracky=2, not_in_creative_inventory=1},
- legacy_facedir_simple = true,
- sounds = default.node_sound_stone_defaults(),
- internal_EU_buffer=0;
- interal_EU_buffer_size=2000;
- technic_power_machine=1,
- on_construct = function(pos)
- local meta = minetest.env:get_meta(pos)
- meta:set_float("technic_power_machine", 1)
- meta:set_string("formspec", electric_furnace_formspec)
- meta:set_string("infotext", "Electric furnace");
- local inv = meta:get_inventory()
- inv:set_size("src", 1)
- inv:set_size("dst", 4)
- local EU_used = 0
- local furnace_is_cookin = 0
- local cooked = nil
- end,
- can_dig = function(pos,player)
- local meta = minetest.env:get_meta(pos);
- local inv = meta:get_inventory()
- if not inv:is_empty("dst") then
- return false
- elseif not inv:is_empty("src") then
- return false
- end
- return true
- end,
-})
-
-minetest.register_abm({
- nodenames = {"technic:electric_furnace","technic:electric_furnace_active"},
- interval = 1,
- chance = 1,
-
- action = function(pos, node, active_object_count, active_object_count_wider)
-
- local meta = minetest.env:get_meta(pos)
- internal_EU_buffer=meta:get_float("internal_EU_buffer")
- internal_EU_buffer_size=meta:get_float("internal_EU_buffer")
- local load = math.floor(internal_EU_buffer/2000 * 100)
- meta:set_string("formspec",
- "invsize[8,9;]"..
- "image[1,1;1,2;technic_power_meter_bg.png^[lowpart:"..
- (load)..":technic_power_meter_fg.png]"..
- "list[current_name;src;3,1;1,1;]"..
- "list[current_name;dst;5,1;2,2;]"..
- "list[current_player;main;0,5;8,4;]"..
- "label[0,0;Electric Furnace]"..
- "label[1,3;Power level]")
-
- local inv = meta:get_inventory()
-
- local furnace_is_cookin = meta:get_float("furnace_is_cookin")
-
-
- local srclist = inv:get_list("src")
- local cooked=nil
-
- if srclist then
- cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
- end
-
-
- if (furnace_is_cookin == 1) then
- if internal_EU_buffer>=150 then
- internal_EU_buffer=internal_EU_buffer-150;
- meta:set_float("internal_EU_buffer",internal_EU_buffer)
- meta:set_float("src_time", meta:get_float("src_time") + 3)
- if cooked and cooked.item and meta:get_float("src_time") >= cooked.time then
- -- check if there's room for output in "dst" list
- if inv:room_for_item("dst",cooked.item) then
- -- Put result in "dst" list
- inv:add_item("dst", cooked.item)
- -- take stuff from "src" list
- srcstack = inv:get_stack("src", 1)
- srcstack:take_item()
- inv:set_stack("src", 1, srcstack)
- else
- print("Furnace inventory full!")
- end
- meta:set_string("src_time", 0)
- end
- end
- end
-
-
-
-
- if srclist then
- cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
- if cooked.time>0 then
- hacky_swap_node(pos,"technic:electric_furnace_active")
- meta:set_string("infotext","Furnace active")
- meta:set_string("furnace_is_cookin",1)
- -- meta:set_string("formspec", electric_furnace_formspec)
- meta:set_string("src_time", 0)
- return
- end
-
- end
-
- hacky_swap_node(pos,"technic:electric_furnace")
- meta:set_string("infotext","Furnace inactive")
- meta:set_string("furnace_is_cookin",0)
- -- meta:set_string("formspec", electric_furnace_formspec)
- meta:set_string("src_time", 0)
-
-
-end,
-})
-
-
-
-
-function take_EU_from_net(pos, EU_to_take)
- local meta = minetest.env:get_meta(pos)
- local pos1=pos
- pos1.z=pos1.z +1
- local meta1 = minetest.env:get_meta(pos1)
- charge=meta1:get_float("battery_charge")
- charge=charge - EU_to_take
- meta1:set_float("battery_charge",charge)
-end
-
- LV_nodes_visited = {}
+LV_nodes_visited = {}
function get_RE_item_load (load1,max_load)
if load1==0 then load1=65535 end
@@ -517,23 +328,4 @@
if minetest.env:get_node(pos1).name == "technic:music_player" then new_node_added=add_new_cable_node(RE_nodes,pos1) end
if minetest.env:get_node(pos1).name == "technic:grinder" then new_node_added=add_new_cable_node(RE_nodes,pos1) end
end
-
-
-function get_connected_charge (charge,pos1)
- local charge1=0
- local meta={}
- if minetest.env:get_node(pos1).name == "technic:battery_box" then
- print ("found batbox")
- meta = minetest.env:get_meta(pos1)
- return meta:get_float("cable_OUT")
- end
-
- if minetest.env:get_node(pos1).name == "technic:lv_cable" then
- meta = minetest.env:get_meta(pos1)
- charge1=meta:get_float("cable_OUT")
- if charge1>charge then
- charge=charge1
- end
- end
-return charge
-end
\ No newline at end of file
+
\ No newline at end of file
diff --git a/electric_furnace.lua b/electric_furnace.lua
new file mode 100644
index 0000000..d4d70ff
--- /dev/null
+++ b/electric_furnace.lua
@@ -0,0 +1,177 @@
+minetest.register_alias("electric_furnace", "technic:electric_furnace")
+
+minetest.register_craft({
+ output = 'technic:electric_furnace',
+ recipe = {
+ {'default:brick', 'default:brick', 'default:brick'},
+ {'default:brick', '', 'default:brick'},
+ {'default:steel_ingot', 'moreores:copper_ingot', 'default:steel_ingot'},
+ }
+})
+
+
+electric_furnace_formspec =
+ "invsize[8,9;]"..
+ "image[1,1;1,2;technic_power_meter_bg.png]"..
+ "list[current_name;src;3,1;1,1;]"..
+ "list[current_name;dst;5,1;2,2;]"..
+ "list[current_player;main;0,5;8,4;]"..
+ "label[0,0;Electric Furnace]"..
+ "label[1,3;Power level]"
+
+minetest.register_node("technic:electric_furnace", {
+ description = "Electric furnace",
+ tiles = {"technic_electric_furnace_top.png", "technic_electric_furnace_bottom.png", "technic_electric_furnace_side.png",
+ "technic_electric_furnace_side.png", "technic_electric_furnace_side.png", "technic_electric_furnace_front.png"},
+ paramtype2 = "facedir",
+ groups = {cracky=2},
+ legacy_facedir_simple = true,
+ sounds = default.node_sound_stone_defaults(),
+ technic_power_machine=1,
+ internal_EU_buffer=0;
+ interal_EU_buffer_size=2000;
+ on_construct = function(pos)
+ local meta = minetest.env:get_meta(pos)
+ meta:set_float("technic_power_machine", 1)
+ meta:set_string("formspec", electric_furnace_formspec)
+ meta:set_string("infotext", "Electric furnace")
+ local inv = meta:get_inventory()
+ inv:set_size("src", 1)
+ inv:set_size("dst", 4)
+ local EU_used = 0
+ local furnace_is_cookin = 0
+ local cooked = nil
+ meta:set_float("internal_EU_buffer",0)
+ meta:set_float("internal_EU_buffer_size",2000)
+
+ end,
+ can_dig = function(pos,player)
+ local meta = minetest.env:get_meta(pos);
+ local inv = meta:get_inventory()
+ if not inv:is_empty("dst") then
+ return false
+ elseif not inv:is_empty("src") then
+ return false
+ end
+ return true
+ end,
+})
+
+minetest.register_node("technic:electric_furnace_active", {
+ description = "Electric Furnace",
+ tiles = {"technic_electric_furnace_top.png", "technic_electric_furnace_bottom.png", "technic_electric_furnace_side.png",
+ "technic_electric_furnace_side.png", "technic_electric_furnace_side.png", "technic_electric_furnace_front_active.png"},
+ paramtype2 = "facedir",
+ light_source = 8,
+ drop = "technic:electric_furnace",
+ groups = {cracky=2, not_in_creative_inventory=1},
+ legacy_facedir_simple = true,
+ sounds = default.node_sound_stone_defaults(),
+ internal_EU_buffer=0;
+ interal_EU_buffer_size=2000;
+ technic_power_machine=1,
+ on_construct = function(pos)
+ local meta = minetest.env:get_meta(pos)
+ meta:set_float("technic_power_machine", 1)
+ meta:set_string("formspec", electric_furnace_formspec)
+ meta:set_string("infotext", "Electric furnace");
+ local inv = meta:get_inventory()
+ inv:set_size("src", 1)
+ inv:set_size("dst", 4)
+ local EU_used = 0
+ local furnace_is_cookin = 0
+ local cooked = nil
+ end,
+ can_dig = function(pos,player)
+ local meta = minetest.env:get_meta(pos);
+ local inv = meta:get_inventory()
+ if not inv:is_empty("dst") then
+ return false
+ elseif not inv:is_empty("src") then
+ return false
+ end
+ return true
+ end,
+})
+
+minetest.register_abm({
+ nodenames = {"technic:electric_furnace","technic:electric_furnace_active"},
+ interval = 1,
+ chance = 1,
+
+ action = function(pos, node, active_object_count, active_object_count_wider)
+
+ local meta = minetest.env:get_meta(pos)
+ internal_EU_buffer=meta:get_float("internal_EU_buffer")
+ internal_EU_buffer_size=meta:get_float("internal_EU_buffer")
+ local load = math.floor(internal_EU_buffer/2000 * 100)
+ meta:set_string("formspec",
+ "invsize[8,9;]"..
+ "image[1,1;1,2;technic_power_meter_bg.png^[lowpart:"..
+ (load)..":technic_power_meter_fg.png]"..
+ "list[current_name;src;3,1;1,1;]"..
+ "list[current_name;dst;5,1;2,2;]"..
+ "list[current_player;main;0,5;8,4;]"..
+ "label[0,0;Electric Furnace]"..
+ "label[1,3;Power level]")
+
+ local inv = meta:get_inventory()
+
+ local furnace_is_cookin = meta:get_float("furnace_is_cookin")
+
+
+ local srclist = inv:get_list("src")
+ local cooked=nil
+
+ if srclist then
+ cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
+ end
+
+
+ if (furnace_is_cookin == 1) then
+ if internal_EU_buffer>=150 then
+ internal_EU_buffer=internal_EU_buffer-150;
+ meta:set_float("internal_EU_buffer",internal_EU_buffer)
+ meta:set_float("src_time", meta:get_float("src_time") + 3)
+ if cooked and cooked.item and meta:get_float("src_time") >= cooked.time then
+ -- check if there's room for output in "dst" list
+ if inv:room_for_item("dst",cooked.item) then
+ -- Put result in "dst" list
+ inv:add_item("dst", cooked.item)
+ -- take stuff from "src" list
+ srcstack = inv:get_stack("src", 1)
+ srcstack:take_item()
+ inv:set_stack("src", 1, srcstack)
+ else
+ print("Furnace inventory full!")
+ end
+ meta:set_string("src_time", 0)
+ end
+ end
+ end
+
+
+
+
+ if srclist then
+ cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
+ if cooked.time>0 then
+ hacky_swap_node(pos,"technic:electric_furnace_active")
+ meta:set_string("infotext","Furnace active")
+ meta:set_string("furnace_is_cookin",1)
+ -- meta:set_string("formspec", electric_furnace_formspec)
+ meta:set_string("src_time", 0)
+ return
+ end
+
+ end
+
+ hacky_swap_node(pos,"technic:electric_furnace")
+ meta:set_string("infotext","Furnace inactive")
+ meta:set_string("furnace_is_cookin",0)
+ -- meta:set_string("formspec", electric_furnace_formspec)
+ meta:set_string("src_time", 0)
+
+
+end,
+})
diff --git a/init.lua b/init.lua
index fc921d6..6629b38 100644
--- a/init.lua
+++ b/init.lua
@@ -20,7 +20,8 @@
dofile(minetest.get_modpath("technic").."/silver_chest.lua")
dofile(minetest.get_modpath("technic").."/gold_chest.lua")
dofile(minetest.get_modpath("technic").."/mithril_chest.lua")
-dofile(minetest.get_modpath("technic").."/electric.lua")
+dofile(minetest.get_modpath("technic").."/electric_furnace.lua")
+dofile(minetest.get_modpath("technic").."/battery_box.lua")
dofile(minetest.get_modpath("technic").."/wires.lua")
dofile(minetest.get_modpath("technic").."/dyes.lua")
dofile(minetest.get_modpath("technic").."/ores.lua")
--
Gitblit v1.8.0