diff options
| -rw-r--r-- | technic/machines/MV/thresher.lua | 6 | ||||
| -rw-r--r-- | technic/machines/register/centrifuge_recipes.lua | 25 | ||||
| -rw-r--r-- | technic/machines/register/thresher_recipes.lua | 39 |
3 files changed, 29 insertions, 41 deletions
diff --git a/technic/machines/MV/thresher.lua b/technic/machines/MV/thresher.lua index 9488701..00fbf20 100644 --- a/technic/machines/MV/thresher.lua +++ b/technic/machines/MV/thresher.lua @@ -1,9 +1,9 @@ minetest.register_craft({ output = "technic:mv_thresher", recipe = { - {"technic:motor", "technic:copper_plate", "technic:diamond_drill_head"}, - {"default:copper_ingot", "technic:machine_casing", "default:copper_ingot" }, - {"pipeworks:one_way_tube", "technic:mv_cable", "pipeworks:mese_filter" }, + {'technic:stainless_steel_ingot', 'technic:motor', 'technic:stainless_steel_ingot'}, + {'pipeworks:tube_1', 'technic:machine_casing', 'pipeworks:tube_1'}, + {'technic:stainless_steel_ingot', 'technic:mv_cable', 'technic:stainless_steel_ingot'}, } }) diff --git a/technic/machines/register/centrifuge_recipes.lua b/technic/machines/register/centrifuge_recipes.lua index fb16d0c..925ed0d 100644 --- a/technic/machines/register/centrifuge_recipes.lua +++ b/technic/machines/register/centrifuge_recipes.lua @@ -25,31 +25,6 @@ for p = 1, 34 do table.insert(recipes, { uranium_dust(p).." 2", uranium_dust(p-1), uranium_dust(p+1) }) end -if minetest.get_modpath("bushes_classic") then - for _, berry in ipairs({ "blackberry", "blueberry", "gooseberry", "raspberry", "strawberry" }) do - table.insert(recipes, { "bushes:"..berry.."_bush", "default:stick 20", "bushes:"..berry.." 4" }) - end -end - -if minetest.get_modpath("farming") then - if minetest.get_modpath("cottages") then - -- work as a mechanized threshing floor - table.insert(recipes, { "farming:wheat", "farming:seed_wheat", "cottages:straw_mat" }) - table.insert(recipes, { "farming:barley", "farming:seed_barley", "cottages:straw_mat" }) - else - -- work in a less fancy and less efficient manner - table.insert(recipes, { "farming:wheat 4", "farming:seed_wheat 3", "default:dry_shrub 1" }) - table.insert(recipes, { "farming:barley 4", "farming:seed_barley 3", "default:dry_shrub 1" }) - end -end - --- using centfuge as a sorting machine for grass seeds -table.insert(recipes, { "default:grass_1 99", "default:dry_grass_1 80", "default:dry_shrub 7", "default:junglegrass 12" }) -if minetest.get_modpath("ethereal") then - table.insert(recipes, { "default:junglegrass 99", "ethereal:dry_shrub 10", "ethereal:crystalgrass 5", "ethereal:snowygrass 5" }) - table.insert(recipes, { "default:dry_grass_1 99", "ethereal:fern 5" }) -end - for _, data in pairs(recipes) do technic.register_separating_recipe({ input = { data[1] }, output = { data[2], data[3], data[4] } }) diff --git a/technic/machines/register/thresher_recipes.lua b/technic/machines/register/thresher_recipes.lua index c6ce246..3b43766 100644 --- a/technic/machines/register/thresher_recipes.lua +++ b/technic/machines/register/thresher_recipes.lua @@ -17,33 +17,46 @@ local recipes = { if minetest.get_modpath("bushes_classic") then for _, berry in ipairs({ "blackberry", "blueberry", "gooseberry", "raspberry", "strawberry" }) do - table.insert(recipes, { "bushes:"..berry.."_bush", "default:stick 20", "bushes:"..berry.." 4" }) + table.insert(recipes, { input = "bushes:"..berry.."_bush", + output = {"default:stick 20", "bushes:"..berry.." 4" }}) end end if minetest.get_modpath("farming") then - table.insert(recipes, {"farming:hemp_leaf", "farming:hemp_fibre"}) + table.insert(recipes, { input = "farming:hemp_leaf", + output = {"farming:hemp_fibre"}}) if minetest.get_modpath("cottages") then - -- work as a mechanized threshing floor - table.insert(recipes, { "farming:wheat", "farming:seed_wheat", "cottages:straw_mat" }) - table.insert(recipes, { "farming:barley", "farming:seed_barley", "cottages:straw_mat" }) + -- work as a mechanized threshing floor from cottages + table.insert(recipes, { input = "farming:wheat", + output = {"farming:seed_wheat", "cottages:straw_mat"} }) + table.insert(recipes, { input = "farming:barley", + output = {"farming:seed_barley", "cottages:straw_mat"} }) else -- work in a less fancy and less efficient manner - table.insert(recipes, { "farming:wheat 4", "farming:seed_wheat 3", "default:dry_shrub 1" }) - table.insert(recipes, { "farming:barley 4", "farming:seed_barley 3", "default:dry_shrub 1" }) + table.insert(recipes, { input = "farming:wheat 4", + output = {"farming:seed_wheat 3", "default:dry_shrub 1"} }) + table.insert(recipes, { input = "farming:barley 4", + output = { "farming:seed_barley 3", "default:dry_shrub 1"} }) end end --- using centfuge as a sorting machine for grass seeds -table.insert(recipes, { "default:grass_1 99", "default:dry_grass_1 80", "default:dry_shrub 7", "default:junglegrass 12" }) +-- using thresher as a sorting machine for grass seeds +table.insert(recipes, { input = "default:grass_1 99", + output = {"default:dry_grass_1 80", "default:dry_shrub 7", "default:junglegrass 12"}, + time = 16 }) + if minetest.get_modpath("ethereal") then - table.insert(recipes, { "default:junglegrass 99", "ethereal:dry_shrub 10", "ethereal:crystalgrass 5", "ethereal:snowygrass 5" }) - table.insert(recipes, { "default:dry_grass_1 99", "ethereal:fern 5" }) + table.insert(recipes, { input = "default:junglegrass 99", + output = {"ethereal:dry_shrub 10", "ethereal:crystalgrass 5", "ethereal:snowygrass 5" }, + time = 16 }) + table.insert(recipes, { input = "default:dry_grass_1 99", + output = {"ethereal:fern 5"}, + time = 16 }) end -for _, data in pairs(recipes) do - technic.register_threshing_recipe({ input = { data[1] }, output = { data[2], data[3], data[4] } }) +for _,data in ipairs(recipes) do + technic.register_threshing_recipe({input = {data.input}, output = data.output, time = data.time}) end |