diff options
author | Zefram <zefram@fysh.org> | 2014-06-07 21:16:15 +0100 |
---|---|---|
committer | RealBadAngel <maciej.kasatkin@o2.pl> | 2014-06-21 01:19:26 +0200 |
commit | 23603e7f4119245227f4ec0d15a8ecb6a444c5cd (patch) | |
tree | e0cc44d1d52f5fe631a5e5cef33ed1e783cdaa2a | |
parent | c2bc4e9d56ec1b88bcdd939c0d67fcc1fd1dde89 (diff) |
Full glooptest support
To support the glooptest mod (successor of gloopores), define the
gloopores lump->dust grinding recipes if either of the mods is available.
(Formerly only "gloopores" was supported.) Define kalite dust item,
which was previously missing. Make gloop ingots grindable to dust as the
non-gloop ingots already are; incidentally refactor this to automatically
make ingots grindable whenever the ingot can be made by cooking dust.
Add textures for all the gloop dusts. Do the "Steel"->"Iron" renaming
for glooptest-defined tools and items.
-rw-r--r-- | technic/machines/register/grinder_recipes.lua | 19 | ||||
-rw-r--r-- | technic/textures/technic_akalin_dust.png | bin | 0 -> 240 bytes | |||
-rw-r--r-- | technic/textures/technic_alatro_dust.png | bin | 0 -> 241 bytes | |||
-rw-r--r-- | technic/textures/technic_arol_dust.png | bin | 0 -> 227 bytes | |||
-rw-r--r-- | technic/textures/technic_kalite_dust.png | bin | 0 -> 191 bytes | |||
-rw-r--r-- | technic/textures/technic_talinite_dust.png | bin | 0 -> 226 bytes | |||
-rw-r--r-- | technic/textures/technicx32/technic_akalin_dust.png | bin | 0 -> 1156 bytes | |||
-rw-r--r-- | technic/textures/technicx32/technic_alatro_dust.png | bin | 0 -> 1134 bytes | |||
-rw-r--r-- | technic/textures/technicx32/technic_arol_dust.png | bin | 0 -> 1101 bytes | |||
-rw-r--r-- | technic/textures/technicx32/technic_kalite_dust.png | bin | 0 -> 809 bytes | |||
-rw-r--r-- | technic/textures/technicx32/technic_talinite_dust.png | bin | 0 -> 1088 bytes | |||
-rw-r--r-- | technic_worldgen/crafts.lua | 17 |
12 files changed, 19 insertions, 17 deletions
diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index 4ae24f8..cde68b6 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -41,35 +41,22 @@ end -- Sorted alphebeticaly local recipes = { - {"default:bronze_ingot", "technic:bronze_dust 1"}, {"default:coal_lump", "technic:coal_dust 2"}, {"default:cobble", "default:gravel"}, - {"default:copper_ingot", "technic:copper_dust 1"}, {"default:copper_lump", "technic:copper_dust 2"}, {"default:desert_stone", "default:desert_sand"}, - {"default:gold_ingot", "technic:gold_dust 1"}, {"default:gold_lump", "technic:gold_dust 2"}, {"default:gravel", "default:dirt"}, {"default:iron_lump", "technic:wrought_iron_dust 2"}, {"default:stone", "default:sand"}, - {"moreores:mithril_ingot", "technic:mithril_dust 1"}, {"moreores:mithril_lump", "technic:mithril_dust 2"}, - {"moreores:silver_ingot", "technic:silver_dust 1"}, {"moreores:silver_lump", "technic:silver_dust 2"}, - {"moreores:tin_ingot", "technic:tin_dust 1"}, {"moreores:tin_lump", "technic:tin_dust 2"}, - {"technic:cast_iron_ingot", "technic:cast_iron_dust 1"}, - {"technic:chromium_ingot", "technic:chromium_dust 1"}, {"technic:chromium_lump", "technic:chromium_dust 2"}, - {"technic:wrought_iron_ingot", "technic:wrought_iron_dust 1"}, - {"technic:carbon_steel_ingot", "technic:carbon_steel_dust 1"}, - {"technic:stainless_steel_ingot", "technic:stainless_steel_dust 1"}, - {"technic:zinc_ingot", "technic:zinc_dust 1"}, {"technic:zinc_lump", "technic:zinc_dust 2"}, - {"technic:brass_ingot", "technic:brass_dust 1"}, } -if minetest.get_modpath("gloopores") then +if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then table.insert(recipes, {"gloopores:alatro_lump", "technic:alatro_dust 2"}) table.insert(recipes, {"gloopores:kalite_lump", "technic:kalite_dust 2"}) table.insert(recipes, {"gloopores:arol_lump", "technic:arol_dust 2"}) @@ -99,6 +86,7 @@ local function register_dust(name, ingot) recipe = "technic:"..lname.."_dust", output = ingot, }) + technic.register_grinder_recipe({ input = ingot, output = "technic:"..lname.."_dust 1" }) end end @@ -117,10 +105,11 @@ register_dust("Stainless Steel", "technic:stainless_steel_ingot") register_dust("Tin", "moreores:tin_ingot") register_dust("Wrought Iron", "technic:wrought_iron_ingot") register_dust("Zinc", "technic:zinc_ingot") -if minetest.get_modpath("gloopores") then +if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then register_dust("Akalin", "glooptest:akalin_ingot") register_dust("Alatro", "glooptest:alatro_ingot") register_dust("Arol", "glooptest:arol_ingot") + register_dust("Kalite", nil) register_dust("Talinite", "glooptest:talinite_ingot") end diff --git a/technic/textures/technic_akalin_dust.png b/technic/textures/technic_akalin_dust.png Binary files differnew file mode 100644 index 0000000..052b0ac --- /dev/null +++ b/technic/textures/technic_akalin_dust.png diff --git a/technic/textures/technic_alatro_dust.png b/technic/textures/technic_alatro_dust.png Binary files differnew file mode 100644 index 0000000..172af25 --- /dev/null +++ b/technic/textures/technic_alatro_dust.png diff --git a/technic/textures/technic_arol_dust.png b/technic/textures/technic_arol_dust.png Binary files differnew file mode 100644 index 0000000..1a575ed --- /dev/null +++ b/technic/textures/technic_arol_dust.png diff --git a/technic/textures/technic_kalite_dust.png b/technic/textures/technic_kalite_dust.png Binary files differnew file mode 100644 index 0000000..3a9e10f --- /dev/null +++ b/technic/textures/technic_kalite_dust.png diff --git a/technic/textures/technic_talinite_dust.png b/technic/textures/technic_talinite_dust.png Binary files differnew file mode 100644 index 0000000..f228206 --- /dev/null +++ b/technic/textures/technic_talinite_dust.png diff --git a/technic/textures/technicx32/technic_akalin_dust.png b/technic/textures/technicx32/technic_akalin_dust.png Binary files differnew file mode 100644 index 0000000..90f3bac --- /dev/null +++ b/technic/textures/technicx32/technic_akalin_dust.png diff --git a/technic/textures/technicx32/technic_alatro_dust.png b/technic/textures/technicx32/technic_alatro_dust.png Binary files differnew file mode 100644 index 0000000..1199614 --- /dev/null +++ b/technic/textures/technicx32/technic_alatro_dust.png diff --git a/technic/textures/technicx32/technic_arol_dust.png b/technic/textures/technicx32/technic_arol_dust.png Binary files differnew file mode 100644 index 0000000..f5a392f --- /dev/null +++ b/technic/textures/technicx32/technic_arol_dust.png diff --git a/technic/textures/technicx32/technic_kalite_dust.png b/technic/textures/technicx32/technic_kalite_dust.png Binary files differnew file mode 100644 index 0000000..595edb5 --- /dev/null +++ b/technic/textures/technicx32/technic_kalite_dust.png diff --git a/technic/textures/technicx32/technic_talinite_dust.png b/technic/textures/technicx32/technic_talinite_dust.png Binary files differnew file mode 100644 index 0000000..39f9330 --- /dev/null +++ b/technic/textures/technicx32/technic_talinite_dust.png diff --git a/technic_worldgen/crafts.lua b/technic_worldgen/crafts.lua index e2d5236..759d8ed 100644 --- a/technic_worldgen/crafts.lua +++ b/technic_worldgen/crafts.lua @@ -114,7 +114,7 @@ minetest.register_craft({ output = "technic:wrought_iron_ingot", }) -local function for_each_registered_craftitem(action) +local function for_each_registered_item(action) local already_reg = {} for k, _ in pairs(minetest.registered_items) do table.insert(already_reg, k) @@ -124,6 +124,16 @@ local function for_each_registered_craftitem(action) really_register_craftitem(name, def) action(string.gsub(name, "^:", "")) end + local really_register_tool = minetest.register_tool + minetest.register_tool = function(name, def) + really_register_tool(name, def) + action(string.gsub(name, "^:", "")) + end + local really_register_node = minetest.register_node + minetest.register_node = function(name, def) + really_register_node(name, def) + action(string.gsub(name, "^:", "")) + end for _, name in ipairs(already_reg) do action(name) end @@ -137,6 +147,9 @@ for _, i in ipairs({ "default:sword_steel", "doors:door_steel", "farming:hoe_steel", + "glooptest:hammer_steel", + "glooptest:handsaw_steel", + "glooptest:reinforced_crystal_glass", "mesecons_doors:op_door_steel", "mesecons_doors:sig_door_steel", "vessels:steel_bottle", @@ -144,7 +157,7 @@ for _, i in ipairs({ steel_to_iron[i] = true end -for_each_registered_craftitem(function(item_name) +for_each_registered_item(function(item_name) local item_def = minetest.registered_items[item_name] if steel_to_iron[item_name] and string.find(item_def.description, "Steel") then minetest.override_item(item_name, { description = string.gsub(item_def.description, "Steel", S("Iron")) }) |