From 10307f23a78b33af50dc4a5f3d1baafb4ee4b0d9 Mon Sep 17 00:00:00 2001
From: Maciej 'agaran' Pijanka <agaran@pld-linux.org>
Date: Thu, 16 Mar 2017 00:00:22 +0100
Subject: [PATCH] Do not run converters twice.
---
technic/crafts.lua | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/technic/crafts.lua b/technic/crafts.lua
index 1776de5..4859768 100644
--- a/technic/crafts.lua
+++ b/technic/crafts.lua
@@ -1,3 +1,6 @@
+-- check if we have the necessary dependencies to allow actually using these materials in the crafts
+local mesecons_materials = minetest.get_modpath("mesecons_materials")
+
-- tubes crafting recipes
minetest.register_craft({
@@ -37,18 +40,18 @@
minetest.register_craft({
output = 'technic:blue_energy_crystal',
recipe = {
- {'default:gold_ingot', 'technic:battery', 'dye:blue'},
+ {'moreores:mithril_ingot', 'technic:battery', 'dye:blue'},
{'technic:battery', 'technic:green_energy_crystal', 'technic:battery'},
- {'dye:blue', 'technic:battery', 'default:gold_ingot'},
+ {'dye:blue', 'technic:battery', 'moreores:mithril_ingot'},
}
})
minetest.register_craft({
output = 'technic:red_energy_crystal',
recipe = {
- {'default:gold_ingot', 'technic:battery', 'dye:red'},
+ {'moreores:silver_ingot', 'technic:battery', 'dye:red'},
{'technic:battery', 'default:diamondblock', 'technic:battery'},
- {'dye:red', 'technic:battery', 'default:gold_ingot'},
+ {'dye:red', 'technic:battery', 'moreores:silver_ingot'},
}
})
@@ -97,10 +100,12 @@
}
})
+local isolation = mesecons_materials and "mesecons_materials:fiber" or "technic:rubber"
+
minetest.register_craft({
output = 'technic:lv_transformer',
recipe = {
- {'technic:wrought_iron_ingot', 'technic:wrought_iron_ingot', 'technic:wrought_iron_ingot'},
+ {isolation, 'technic:wrought_iron_ingot', isolation},
{'technic:copper_coil', 'technic:wrought_iron_ingot', 'technic:copper_coil'},
{'technic:wrought_iron_ingot', 'technic:wrought_iron_ingot', 'technic:wrought_iron_ingot'},
}
@@ -109,7 +114,7 @@
minetest.register_craft({
output = 'technic:mv_transformer',
recipe = {
- {'technic:carbon_steel_ingot', 'technic:carbon_steel_ingot', 'technic:carbon_steel_ingot'},
+ {isolation, 'technic:carbon_steel_ingot', isolation},
{'technic:copper_coil', 'technic:carbon_steel_ingot', 'technic:copper_coil'},
{'technic:carbon_steel_ingot', 'technic:carbon_steel_ingot', 'technic:carbon_steel_ingot'},
}
@@ -118,7 +123,7 @@
minetest.register_craft({
output = 'technic:hv_transformer',
recipe = {
- {'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot'},
+ {isolation, 'technic:stainless_steel_ingot', isolation},
{'technic:copper_coil', 'technic:stainless_steel_ingot', 'technic:copper_coil'},
{'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot'},
}
@@ -127,9 +132,9 @@
minetest.register_craft({
output = 'technic:control_logic_unit',
recipe = {
- {'', 'default:gold_ingot', ''},
+ {'', 'technic:fine_gold_wire', ''},
{'default:copper_ingot', 'technic:silicon_wafer', 'default:copper_ingot'},
- {'', 'default:copper_ingot', ''},
+ {'', 'technic:chromium_ingot', ''},
}
})
@@ -159,29 +164,16 @@
})
-- Remove some recipes
-minetest.register_craftitem("technic:nothing", {
- description = "",
- inventory_image = "blank.png",
-})
-
-if minetest.register_craft_predict then
- minetest.register_craft_predict(function(itemstack, player, old_craft_grid, craft_inv)
- if itemstack:get_name() == "technic:nothing" then
- return ItemStack("")
- end
- end)
-end
-
-- Bronze
minetest.register_craft({
type = "shapeless",
- output = "technic:nothing",
+ output = "default:bronze_ingot 0",
recipe = {"default:copper_ingot", "default:steel_ingot"}
})
-- Accelerator tube
minetest.register_craft({
- output = "technic:nothing",
+ output = "pipeworks:accelerator_tube_1 0",
recipe = {
{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
{ "default:mese_crystal_fragment", "default:steel_ingot", "default:mese_crystal_fragment" },
@@ -191,11 +183,22 @@
-- Teleport tube
minetest.register_craft({
- output = "technic:nothing",
+ output = "pipeworks:teleport_tube_1 0",
recipe = {
{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
- { "default:desert_stone", "default:mese_block", "default:desert_stone" },
+ { "default:desert_stone", "default:mese", "default:desert_stone" },
{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
},
})
+minetest.register_craft({
+ output = "default:dirt 2",
+ type = "shapeless",
+ replacements = {{"bucket:bucket_water","bucket:bucket_empty"}},
+ recipe = {
+ "technic:stone_dust",
+ "group:leaves",
+ "bucket:bucket_water",
+ "group:sand",
+ },
+})
--
Gitblit v1.8.0