From: kpoppel Date: Mon, 3 Jun 2013 21:42:44 +0000 (+0200) Subject: Removing ununsed textures. X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=4f1a44a80b5522db60125f3018c0ce80fbb9e3b4;p=zefram%2Fminetest%2Ftechnic.git Removing ununsed textures. Added more safety to item_drop to get around a fatal server halt issue. --- diff --git a/item_drop/item_entity.lua b/item_drop/item_entity.lua index 3d1a83b..5da8285 100644 --- a/item_drop/item_entity.lua +++ b/item_drop/item_entity.lua @@ -109,7 +109,7 @@ minetest.register_entity(":__builtin:item", { return end - if minetest.registered_nodes[name].liquidtype == "flowing" then + if minetest.registered_nodes[name] and minetest.registered_nodes[name].liquidtype == "flowing" then get_flowing_dir = function(self) local pos = self.object:getpos() local param2 = minetest.env:get_node(pos).param2 diff --git a/technic/solar_panel_mv.lua b/technic/solar_panel_mv.lua deleted file mode 100644 index 4deb42e..0000000 --- a/technic/solar_panel_mv.lua +++ /dev/null @@ -1,78 +0,0 @@ -minetest.register_node("technic:solar_panel_mv", { - tiles = {"technic_mv_solar_panel_top.png", "technic_mv_solar_panel_bottom.png", "technic_mv_solar_panel_side.png", - "technic_mv_solar_panel_side.png", "technic_mv_solar_panel_side.png", "technic_mv_solar_panel_side.png"}, - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, - sounds = default.node_sound_wood_defaults(), - description="MV Solar Panel", - active = false, - technic_mv_power_machine=1, - internal_EU_buffer=0; - internal_EU_buffer_size=10000; - drawtype = "nodebox", - paramtype = "light", - is_ground_content = true, - node_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, - }, - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, - }, - on_construct = function(pos) - local meta = minetest.env:get_meta(pos) - meta:set_float("technic_mv_power_machine", 1) - meta:set_float("internal_EU_buffer", 0) - meta:set_float("internal_EU_buffer_size", 10000) - - meta:set_string("infotext", "MV Solar Panel") - meta:set_float("active", false) - end, -}) - -minetest.register_craft({ - output = 'technic:solar_panel_mv 1', - recipe = { - {'technic:solar_panel', 'technic:solar_panel','technic:solar_panel'}, - {'technic:solar_panel', 'technic:mv_transformer','technic:solar_panel'}, - {'', 'technic:mv_cable',''}, - - } -}) - -minetest.register_abm( - {nodenames = {"technic:solar_panel_mv"}, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - - local pos1={} - pos1.y=pos.y+1 - pos1.x=pos.x - pos1.z=pos.z - - local light = minetest.env:get_node_light(pos1, nil) - local meta = minetest.env:get_meta(pos) - if light == nil then light = 0 end - if light >= 14 then - meta:set_string("infotext", "Solar Panel is active ") - meta:set_float("active",1) - local internal_EU_buffer=meta:get_float("internal_EU_buffer") - local internal_EU_buffer_size=meta:get_float("internal_EU_buffer_size") - local charge_to_give=300+(pos1.y/250*300) -- make solar energy depending on height - if charge_to_give<0 then charge_to_give=0 end - if charge_to_give>600 then charge_to_give=600 end - if internal_EU_buffer+charge_to_give>internal_EU_buffer_size then - charge_to_give=internal_EU_buffer_size-internal_EU_buffer - end - internal_EU_buffer=internal_EU_buffer+charge_to_give - meta:set_float("internal_EU_buffer",internal_EU_buffer) - - else - meta:set_string("infotext", "Solar Panel is inactive"); - meta:set_float("active",0) - end - end, -}) - -register_MV_machine ("technic:solar_panel_mv","PR") diff --git a/technic/textures/technic_mv_solar_panel_bottom.png b/technic/textures/technic_mv_solar_panel_bottom.png deleted file mode 100644 index 596e79a..0000000 Binary files a/technic/textures/technic_mv_solar_panel_bottom.png and /dev/null differ diff --git a/technic/textures/technic_mv_solar_panel_side.png b/technic/textures/technic_mv_solar_panel_side.png deleted file mode 100644 index 917b9ed..0000000 Binary files a/technic/textures/technic_mv_solar_panel_side.png and /dev/null differ diff --git a/technic/textures/technic_mv_solar_panel_top.png b/technic/textures/technic_mv_solar_panel_top.png deleted file mode 100644 index cdb7cf7..0000000 Binary files a/technic/textures/technic_mv_solar_panel_top.png and /dev/null differ diff --git a/technic/textures/technic_mv_solarpanel_bottom.png b/technic/textures/technic_mv_solarpanel_bottom.png deleted file mode 100644 index 596e79a..0000000 Binary files a/technic/textures/technic_mv_solarpanel_bottom.png and /dev/null differ diff --git a/technic/textures/technic_mv_solarpanel_side.png b/technic/textures/technic_mv_solarpanel_side.png deleted file mode 100644 index 917b9ed..0000000 Binary files a/technic/textures/technic_mv_solarpanel_side.png and /dev/null differ diff --git a/technic/textures/technic_mv_solarpanel_top.png b/technic/textures/technic_mv_solarpanel_top.png deleted file mode 100644 index cdb7cf7..0000000 Binary files a/technic/textures/technic_mv_solarpanel_top.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_mv_solar_panel_bottom.png b/technic/textures/technicx32/technic_mv_solar_panel_bottom.png deleted file mode 100644 index 94c8222..0000000 Binary files a/technic/textures/technicx32/technic_mv_solar_panel_bottom.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_mv_solar_panel_side.png b/technic/textures/technicx32/technic_mv_solar_panel_side.png deleted file mode 100644 index d39d3d8..0000000 Binary files a/technic/textures/technicx32/technic_mv_solar_panel_side.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_mv_solar_panel_top.png b/technic/textures/technicx32/technic_mv_solar_panel_top.png deleted file mode 100644 index 3d8c7ab..0000000 Binary files a/technic/textures/technicx32/technic_mv_solar_panel_top.png and /dev/null differ