diff options
| -rw-r--r-- | technic/machines/LV/cnc.lua | 2 | ||||
| -rw-r--r-- | technic/machines/LV/cnc_api.lua | 3 | ||||
| -rw-r--r-- | technic/machines/LV/cnc_nodes.lua | 192 | ||||
| -rw-r--r-- | technic/machines/register/grinder_recipes.lua | 24 | ||||
| -rw-r--r-- | technic/textures/technic_cornbread.png | bin | 0 -> 441 bytes | |||
| -rw-r--r-- | technic/textures/technic_cornmeal.png | bin | 0 -> 226 bytes | |||
| -rw-r--r-- | technic/textures/technicx32/technic_cornbread.png | bin | 0 -> 13813 bytes |
7 files changed, 210 insertions, 11 deletions
diff --git a/technic/machines/LV/cnc.lua b/technic/machines/LV/cnc.lua index 58ec6ba..6ca9b3c 100644 --- a/technic/machines/LV/cnc.lua +++ b/technic/machines/LV/cnc.lua @@ -171,7 +171,7 @@ local run = function(pos, node) meta:set_int("src_time", meta:get_int("src_time") + 1) if meta:get_int("src_time") >= 3 then -- 3 ticks per output meta:set_int("src_time", 0) - srcstack = inv:get_stack("src", 1) + local srcstack = inv:get_stack("src", 1) srcstack:take_item() inv:set_stack("src", 1, srcstack) inv:add_item("dst", result.." "..meta:get_int("cnc_multiplier")) diff --git a/technic/machines/LV/cnc_api.lua b/technic/machines/LV/cnc_api.lua index f5aae5c..6637fb7 100644 --- a/technic/machines/LV/cnc_api.lua +++ b/technic/machines/LV/cnc_api.lua @@ -303,7 +303,8 @@ function technic.cnc.register_program(recipeitem, suffix, model, groups, images, walkable = true, groups = groups, selection_box = sbox, - collision_box = cbox + collision_box = cbox, + light_source = groups.light_source, }) end diff --git a/technic/machines/LV/cnc_nodes.lua b/technic/machines/LV/cnc_nodes.lua index 05be9af..fbc7713 100644 --- a/technic/machines/LV/cnc_nodes.lua +++ b/technic/machines/LV/cnc_nodes.lua @@ -15,18 +15,77 @@ technic.cnc.register_all("default:wood", {snappy=2, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1}, {"default_wood.png"}, S("Wooden")) + +technic.cnc.register_all("default:junglewood", + {snappy=2, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1}, + {"default_junglewood.png"}, + S("Junglewood")) + +technic.cnc.register_all("default:pine_wood", + {snappy=2, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1}, + {"default_pine_wood.png"}, + S("Pine")) + +technic.cnc.register_all("default:acacia_wood", + {snappy=2, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1}, + {"default_acacia_wood.png"}, + S("Acacia")) + +technic.cnc.register_all("default:aspen_wood", + {snappy=2, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1}, + {"default_aspen_wood.png"}, + S("Aspen")) + -- STONE -------- technic.cnc.register_all("default:stone", - {cracky=3, not_in_creative_inventory=1}, + {cracky=3, stone=1, not_in_creative_inventory=1}, {"default_stone.png"}, S("Stone")) + +technic.cnc.register_all("default:stonebrick", + {crumbly=2, cracky=3, stone=1, not_in_creative_inventory=1}, + {"default_stone_brick.png"}, + S("Stone Brick")) + +technic.cnc.register_all("default:stone_block", + {crumbly=2, cracky=3, stone=1, not_in_creative_inventory=1}, + {"default_stone_block.png"}, + S("Stone Block")) + + +technic.cnc.register_all("default:desert_stone", + {cracky=3, stone=1, not_in_creative_inventory=1}, + {"default_desert_stone.png"}, + S("Desert Stone")) + +technic.cnc.register_all("default:desert_stonebrick", + {crumbly=2, cracky=3, stone=1, not_in_creative_inventory=1}, + {"default_desert_stone_brick.png"}, + S("Desert Stone Brick")) + +technic.cnc.register_all("default:desert_stone_block", + {crumbly=2, cracky=3, stone=1, not_in_creative_inventory=1}, + {"default_desert_stone_block.png"}, + S("Desert Stone Block")) + -- COBBLE --------- technic.cnc.register_all("default:cobble", - {cracky=3, not_in_creative_inventory=1}, + {cracky=3, stone=1, not_in_creative_inventory=1}, {"default_cobble.png"}, S("Cobble")) + +technic.cnc.register_all("default:mossycobble", + {cracky=3, stone=1, not_in_creative_inventory=1}, + {"default_mossycobble.png"}, + S("Mossy Cobblestone")) + +technic.cnc.register_all("default:desert_cobble", + {cracky=3, stone=1, not_in_creative_inventory=1}, + {"default_desert_cobble.png"}, + S("Desert Cobble")) + -- BRICK -------- technic.cnc.register_all("default:brick", @@ -34,6 +93,7 @@ technic.cnc.register_all("default:brick", {"default_brick.png"}, S("Brick")) + -- SANDSTONE ------------ technic.cnc.register_all("default:sandstone", @@ -41,12 +101,50 @@ technic.cnc.register_all("default:sandstone", {"default_sandstone.png"}, S("Sandstone")) --- LEAVES ---------- -technic.cnc.register_all("default:leaves", - {snappy=2, choppy=2, oddly_breakable_by_hand=3, not_in_creative_inventory=1}, - {"default_leaves.png"}, - S("Leaves")) +technic.cnc.register_all("default:sandstonebrick", + {crumbly=2, cracky=3, not_in_creative_inventory=1}, + {"default_sandstone_brick.png"}, + S("Sandstone Brick")) + +technic.cnc.register_all("default:sandstone_block", + {crumbly=2, cracky=3, not_in_creative_inventory=1}, + {"default_sandstone_block.png"}, + S("Sandstone Block")) + + +technic.cnc.register_all("default:desert_sandstone", + {crumbly=2, cracky=3, not_in_creative_inventory=1}, + {"default_desert_sandstone.png"}, + S("Desert Sandstone")) + +technic.cnc.register_all("default:desert_sandstone_brick", + {crumbly=2, cracky=3, not_in_creative_inventory=1}, + {"default_desert_sandstone_brick.png"}, + S("Desert Sandstone Brick")) + +technic.cnc.register_all("default:desert_sandstone_block", + {crumbly=2, cracky=3, not_in_creative_inventory=1}, + {"default_desert_sandstone_block.png"}, + S("Desert Sandstone Block")) + + +technic.cnc.register_all("default:silver_sandstone", + {crumbly=2, cracky=3, not_in_creative_inventory=1}, + {"default_silver_sandstone.png"}, + S("Silver Sandstone")) + +technic.cnc.register_all("default:silver_sandstone_brick", + {crumbly=2, cracky=3, not_in_creative_inventory=1}, + {"default_silver_sandstone_brick.png"}, + S("Silver Sandstone Brick")) + +technic.cnc.register_all("default:silver_sandstone_block", + {crumbly=2, cracky=3, not_in_creative_inventory=1}, + {"default_silver_sandstone_block.png"}, + S("Silver Sandstone Block")) + + + -- TREE ------- technic.cnc.register_all("default:tree", @@ -54,6 +152,22 @@ technic.cnc.register_all("default:tree", {"default_tree.png"}, S("Tree")) +-- ICE +------- +technic.cnc.register_all("default:ice", + {cracky = 3, puts_out_fire = 1, cools_lava = 1, not_in_creative_inventory=1}, + {"default_ice.png"}, + S("Ice")) + + +-- OBSIDIAN +----------- +technic.cnc.register_all("default:obsidian_block", + {cracky = 1, level = 2, not_in_creative_inventory=1}, + {"default_obsidian_block.png"}, + S("Obsidian")) + + -- WROUGHT IRON --------------- technic.cnc.register_all("default:steelblock", @@ -68,13 +182,63 @@ technic.cnc.register_all("default:bronzeblock", {"default_bronze_block.png"}, S("Bronze")) --- Stainless Steel +-- Zinc -------- +technic.cnc.register_all("technic:zinc_block", + {cracky=1, level=2, not_in_creative_inventory=1}, + {"technic_zinc_block.png"}, + S("Zinc")) + +-- Cast Iron +------------ +technic.cnc.register_all("technic:cast_iron_block", + {cracky=1, level=2, not_in_creative_inventory=1}, + {"technic_cast_iron_block.png"}, + S("Cast Iron")) + +-- Stainless Steel +------------------ technic.cnc.register_all("technic:stainless_steel_block", {cracky=1, level=2, not_in_creative_inventory=1}, {"technic_stainless_steel_block.png"}, S("Stainless Steel")) +-- Carbon steel +--------------- +technic.cnc.register_all("technic:carbon_steel_block", + {cracky=1, level=2, not_in_creative_inventory=1}, + {"technic_carbon_steel_block.png"}, + S("Carbon Steel")) + +-- Brass +-------- +technic.cnc.register_all("technic:brass_block", + {cracky=1, level=2, not_in_creative_inventory=1}, + {"technic_brass_block.png"}, + S("Brass")) + +-- Copper +--------- +technic.cnc.register_all("default:copperblock", + {cracky=1, level=2, not_in_creative_inventory=1}, + {"default_copper_block.png"}, + S("Copper")) + +-- Tin +------ +technic.cnc.register_all("default:tinblock", + {cracky=1, level=2, not_in_creative_inventory=1}, + {"default_tin_block.png"}, + S("Tin")) + +-- Gold +------- +technic.cnc.register_all("default:goldblock", + {cracky=1, level=2, not_in_creative_inventory=1}, + {"default_gold_block.png"}, + S("Gold")) + + -- Marble ------------ technic.cnc.register_all("technic:marble", @@ -89,3 +253,13 @@ technic.cnc.register_all("technic:granite", {"technic_granite.png"}, S("Granite")) + +if minetest.get_modpath("ethereal") then + -- Glostone + ------------ + technic.cnc.register_all("ethereal:glostone", + {cracky=1, not_in_creative_inventory=1, light_source=13}, + {"glostone.png"}, + S("Glo Stone")) + +end diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index fa55e7a..6a82514 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -38,6 +38,30 @@ minetest.clear_craft({ if minetest.get_modpath("farming") then table.insert(recipes, {"farming:seed_wheat", "farming:flour 1"}) + table.insert(recipes, {"farming:seed_barley", "farming:flour 1"}) + + -- added by dhausmig + if minetest.registered_items["farming:corn"] ~= nil then + minetest.register_craftitem("technic:cornmeal", { + description = S("Corn Meal"), + inventory_image = "technic_cornmeal.png", + }) + minetest.register_craftitem("technic:cornbread", { + description = S("Cornbread"), + inventory_image = "technic_cornbread.png", + on_use = minetest.item_eat(8), + }) + + minetest.register_craft({ + type = "cooking", + cooktime = 10, + output = "technic:cornbread", + recipe = "technic:cornmeal" + }) + + table.insert(recipes, {"farming:corn", "technic:cornmeal 2"}) + -- end of dhausmig's addition + end end if minetest.get_modpath("moreores") then diff --git a/technic/textures/technic_cornbread.png b/technic/textures/technic_cornbread.png Binary files differnew file mode 100644 index 0000000..32674f2 --- /dev/null +++ b/technic/textures/technic_cornbread.png diff --git a/technic/textures/technic_cornmeal.png b/technic/textures/technic_cornmeal.png Binary files differnew file mode 100644 index 0000000..e17bb69 --- /dev/null +++ b/technic/textures/technic_cornmeal.png diff --git a/technic/textures/technicx32/technic_cornbread.png b/technic/textures/technicx32/technic_cornbread.png Binary files differnew file mode 100644 index 0000000..05e0416 --- /dev/null +++ b/technic/textures/technicx32/technic_cornbread.png |
