Merge pull request #26 from kpoppel/master

kpoppel

2013-06-12 fc7a23f8b16334fae1a3bfc9cc9470e72e5a454c

Merge pull request #26 from kpoppel/master

Chainsaw fix.

 technic/chainsaw.lua

@@ -138,12 +138,22 @@
        timber_nodenames["growing_cactus:branch_xx"]                    = true
end

-- Support farming_plus if it is there
if( minetest.get_modpath("farming_plus") ~= nil ) then
   if chainsaw_leaves == true then
      timber_nodenames["farming_plus:cocoa_leaves"] = true
   end
end

-- Table for saving what was sawed down
local produced

-- Saw down trees entry point
chainsaw_dig_it = function(pos, player,current_charge)
        local remaining_charge=current_charge

        -- Save the currently installed dropping mechanism so we can restore it.
    local original_handle_node_drops = minetest.handle_node_drops

        -- A bit of trickery here: use a different node drop callback
        -- and restore the original afterwards.
@@ -194,9 +204,6 @@
                end
        end
end

-- Save the currently installed dropping mechanism so we can restore it.
local original_handle_node_drops = minetest.handle_node_drops

-- This function does all the hard work. Recursively we dig the node at hand
-- if it is in the table and then search the surroundings for more stuff to dig.

 technic/grinder.lua

@@ -21,36 +21,36 @@
register_grinder_recipe("default:cobble","default:gravel")
register_grinder_recipe("default:gravel","default:dirt")
register_grinder_recipe("default:desert_stone","default:desert_sand")
register_grinder_recipe("default:iron_lump","technic:iron_dust 2") 
register_grinder_recipe("default:steel_ingot","technic:iron_dust 1") 
register_grinder_recipe("default:coal_lump","technic:coal_dust 2") 
register_grinder_recipe("default:iron_lump","technic:iron_dust 2")
register_grinder_recipe("default:steel_ingot","technic:iron_dust 1")
register_grinder_recipe("default:coal_lump","technic:coal_dust 2")
register_grinder_recipe("default:copper_lump","technic:copper_dust 2")
register_grinder_recipe("default:copper_ingot","technic:copper_dust 1")
register_grinder_recipe("default:gold_lump","technic:gold_dust 2") 
register_grinder_recipe("default:gold_ingot","technic:gold_dust 1") 
register_grinder_recipe("default:gold_lump","technic:gold_dust 2")
register_grinder_recipe("default:gold_ingot","technic:gold_dust 1")
--register_grinder_recipe("default:bronze_ingot","technic:bronze_dust 1")  -- Dust does not exist yet
--register_grinder_recipe("home_decor:brass_ingot","technic:brass_dust 1") -- needs check for the mod
register_grinder_recipe("moreores:tin_lump","technic:tin_dust 2") 
register_grinder_recipe("moreores:tin_ingot","technic:tin_dust 1") 
register_grinder_recipe("moreores:tin_lump","technic:tin_dust 2")
register_grinder_recipe("moreores:tin_ingot","technic:tin_dust 1")
register_grinder_recipe("moreores:silver_lump","technic:silver_dust 2")
register_grinder_recipe("moreores:silver_ingot","technic:silver_dust 1")
register_grinder_recipe("moreores:mithril_lump","technic:mithril_dust 2") 
register_grinder_recipe("moreores:mithril_lump","technic:mithril_dust 2")
register_grinder_recipe("moreores:mithril_ingot","technic:mithril_dust 1")
register_grinder_recipe("technic:chromium_lump","technic:chromium_dust 2")
register_grinder_recipe("technic:chromium_ingot","technic:chromium_dust 1")
register_grinder_recipe("technic:stainless_steel_ingot","stainless_steel_dust 1") 
register_grinder_recipe("technic:brass_ingot","technic:brass_dust 1") 
register_grinder_recipe("technic:zinc_lump","technic:zinc_dust 2") 
register_grinder_recipe("technic:zinc_ingot","technic:zinc_dust 1") 
register_grinder_recipe("technic:coal_dust","dye:black 2") 
register_grinder_recipe("default:cactus","dye:green 2") 
register_grinder_recipe("default:dry_shrub","dye:brown 2") 
register_grinder_recipe("flowers:flower_geranium","dye:blue 2") 
register_grinder_recipe("flowers:flower_dandelion_white","dye:white 2") 
register_grinder_recipe("flowers:flower_dandelion_yellow","dye:yellow 2") 
register_grinder_recipe("flowers:flower_tulip","dye:orange 2") 
register_grinder_recipe("flowers:flower_rose","dye:red 2") 
register_grinder_recipe("flowers:flower_viola","dye:violet 2") 
register_grinder_recipe("technic:stainless_steel_ingot","stainless_steel_dust 1")
register_grinder_recipe("technic:brass_ingot","technic:brass_dust 1")
register_grinder_recipe("technic:zinc_lump","technic:zinc_dust 2")
register_grinder_recipe("technic:zinc_ingot","technic:zinc_dust 1")
register_grinder_recipe("technic:coal_dust","dye:black 2")
register_grinder_recipe("default:cactus","dye:green 2")
register_grinder_recipe("default:dry_shrub","dye:brown 2")
register_grinder_recipe("flowers:flower_geranium","dye:blue 2")
register_grinder_recipe("flowers:flower_dandelion_white","dye:white 2")
register_grinder_recipe("flowers:flower_dandelion_yellow","dye:yellow 2")
register_grinder_recipe("flowers:flower_tulip","dye:orange 2")
register_grinder_recipe("flowers:flower_rose","dye:red 2")
register_grinder_recipe("flowers:flower_viola","dye:violet 2")

minetest.register_craftitem( "technic:coal_dust", {
    description = "Coal Dust",
@@ -68,7 +68,7 @@
    type = "cooking",
    output = "default:steel_ingot",
    recipe = "technic:iron_dust",
}) 
})

minetest.register_craftitem( "technic:copper_dust", {
    description = "Copper Dust",
@@ -79,7 +79,7 @@
    type = "cooking",
    output = "moreores:copper_ingot",
    recipe = "technic:copper_dust",
}) 
})

minetest.register_craftitem( "technic:tin_dust", {
    description = "Tin Dust",
@@ -90,7 +90,7 @@
    type = "cooking",
    output = "moreores:tin_ingot",
    recipe = "technic:tin_dust",
}) 
})

minetest.register_craftitem( "technic:silver_dust", {
    description = "Silver Dust",
@@ -101,7 +101,7 @@
    type = "cooking",
    output = "moreores:silver_ingot",
    recipe = "technic:silver_dust",
}) 
})

minetest.register_craftitem( "technic:gold_dust", {
    description = "Gold Dust",
@@ -112,7 +112,7 @@
    type = "cooking",
    output = "moreores:gold_ingot",
    recipe = "technic:gold_dust",
}) 
})

minetest.register_craftitem( "technic:mithril_dust", {
    description = "Mithril Dust",
@@ -123,7 +123,7 @@
    type = "cooking",
    output = "moreores:mithril_ingot",
    recipe = "technic:mithril_dust",
}) 
})

minetest.register_craftitem( "technic:chromium_dust", {
    description = "Chromium Dust",
@@ -134,7 +134,7 @@
    type = "cooking",
    output = "technic:chromium_ingot",
    recipe = "technic:chromium_dust",
}) 
})

minetest.register_craftitem( "technic:bronze_dust", {
    description = "Bronze Dust",
@@ -145,7 +145,7 @@
    type = "cooking",
    output = "moreores:bronze_ingot",
    recipe = "technic:bronze_dust",
}) 
})

minetest.register_craftitem( "technic:brass_dust", {
    description = "Brass Dust",
@@ -156,7 +156,7 @@
    type = "cooking",
    output = "technic:brass_ingot",
    recipe = "technic:brass_dust",
}) 
})

minetest.register_craftitem( "technic:stainless_steel_dust", {
    description = "Stainless Steel Dust",
@@ -167,7 +167,7 @@
    type = "cooking",
    output = "technic:stainless_steel_ingot",
    recipe = "technic:stainless_steel_dust",
}) 
})

minetest.register_craftitem( "technic:zinc_dust", {
    description = "Zinc Dust",
@@ -178,7 +178,7 @@
    type = "cooking",
    output = "technic:zinc_ingot",
    recipe = "technic:zinc_dust",
}) 
})

minetest.register_alias("grinder", "technic:grinder")
minetest.register_craft({
@@ -193,7 +193,7 @@
minetest.register_craftitem("technic:grinder", {
    description = "Grinder",
    stack_max = 99,
}) 
})

grinder_formspec =
    "invsize[8,9;]"..
@@ -290,7 +290,7 @@

        local inv = meta:get_inventory()
        local srclist = inv:get_list("src")
        if inv:is_empty("src") then meta:set_float("grinder_on",0) end 
        if inv:is_empty("src") then meta:set_float("grinder_on",0) end

        if (meta:get_float("grinder_on") == 1) then
            if charge>=grind_cost then
@@ -299,7 +299,7 @@
            meta:set_float("src_time", meta:get_float("src_time") + 1)
            if meta:get_float("src_time") >= meta:get_float("grind_time") then
                -- check if there's room for output in "dst" list
                grinded = get_grinded_item (inv:get_stack("src", 1))		
                grinded = get_grinded_item (inv:get_stack("src", 1))
                if inv:room_for_item("dst",grinded) then
                    -- Put result in "dst" list
                    inv:add_item("dst", grinded)
@@ -307,7 +307,7 @@
                    srcstack = inv:get_stack("src", 1)
                    srcstack:take_item()
                    inv:set_stack("src", 1, srcstack)
                    if inv:is_empty("src") then meta:set_float("grinder_on",0) end 
                    if inv:is_empty("src") then meta:set_float("grinder_on",0) end
                else
                    print("Grinder inventory full!")
                end
@@ -316,10 +316,10 @@
            end
        end
        if (meta:get_float("grinder_on")==0) then
        local grinded=nil 
        local grinded=nil
        if not inv:is_empty("src") then
            grinded = get_grinded_item (inv:get_stack("src", 1))
            if grinded then 
            if grinded then
                meta:set_float("grinder_on",1)
                hacky_swap_node(pos,"technic:grinder_active")
                meta:set_string("infotext", "Grinder Active")
@@ -328,13 +328,13 @@
                meta:set_float("src_time", 0)
                return
            end
            else 
            else
                hacky_swap_node(pos,"technic:grinder")
                meta:set_string("infotext", "Grinder Inactive")
        end
        end
    end
}) 
})

function get_grinded_item (items)
new_item =nil