diff --git a/craftitems.lua b/craftitems.lua index a7a58c1..81a3e71 100644 --- a/craftitems.lua +++ b/craftitems.lua @@ -1,8 +1,8 @@ local S = minetest.get_translator("basic_materials") minetest.register_craftitem("basic_materials:plastic_sheet", { - description = S("Plastic sheet"), - inventory_image = "basic_materials_plastic_sheet.png", + description = S("Plastic sheet"), + inventory_image = "basic_materials_plastic_sheet.png", }) minetest.register_craftitem("basic_materials:plastic_strip", { @@ -22,8 +22,8 @@ minetest.register_craftitem("basic_materials:oil_extract", { }) minetest.register_craftitem("basic_materials:paraffin", { - description = S("Unprocessed paraffin"), - inventory_image = "basic_materials_paraffin.png", + description = S("Unprocessed paraffin"), + inventory_image = "basic_materials_paraffin.png", }) minetest.register_craftitem("basic_materials:terracotta_base", { @@ -37,8 +37,8 @@ minetest.register_craftitem("basic_materials:wet_cement", { }) minetest.register_craftitem("basic_materials:silicon", { - description = S("Silicon lump"), - inventory_image = "basic_materials_silicon.png", + description = S("Silicon lump"), + inventory_image = "basic_materials_silicon.png", }) minetest.register_craftitem("basic_materials:ic", { @@ -130,8 +130,8 @@ minetest.register_craftitem("basic_materials:padlock", { }) if minetest.get_modpath("hades_materials") then - minetest.register_alias_force("basic_materials:plastic_sheet", "hades_materials:plastic_sheeting") - minetest.register_alias_force("basic_materials:paraffin", "hades_materials:plastic_base") - minetest.register_alias_force("hades_extramaterials:silicon", "hades_materials:silicon") + minetest.register_alias_force("basic_materials:plastic_sheet", "hades_materials:plastic_sheeting") + minetest.register_alias_force("basic_materials:paraffin", "hades_materials:plastic_base") + minetest.register_alias_force("hades_extramaterials:silicon", "hades_materials:silicon") end diff --git a/crafts.lua b/crafts.lua index 21d7bec..3b2cc3a 100644 --- a/crafts.lua +++ b/crafts.lua @@ -1,92 +1,92 @@ local materials = { - dirt = "default:dirt", - sand = "default:sand", - gravel = "default:gravel", - copper_ingot = "default:copper_ingot", - steel_ingot = "default:steel_ingot", - gold_ingot = "default:gold_ingot", - tin_ingot = "default:tin_ingot", - mese_crystal_fragment = "default:mese_crystal_fragment", - torch = "default:torch", - diamond = "default:diamond", - clay_lump = "default:clay_lump", - water_bucket = "bucket:bucket_water", - empty_bucket = "bucket:bucket_empty", - dye_dark_grey = "dye:dark_grey", - silicon = "mesecons_materials:silicon", + dirt = "default:dirt", + sand = "default:sand", + gravel = "default:gravel", + copper_ingot = "default:copper_ingot", + steel_ingot = "default:steel_ingot", + gold_ingot = "default:gold_ingot", + tin_ingot = "default:tin_ingot", + mese_crystal_fragment = "default:mese_crystal_fragment", + torch = "default:torch", + diamond = "default:diamond", + clay_lump = "default:clay_lump", + water_bucket = "bucket:bucket_water", + empty_bucket = "bucket:bucket_empty", + dye_dark_grey = "dye:dark_grey", + silicon = "mesecons_materials:silicon", } if minetest.get_modpath("mcl_core") then - materials = { - dirt = "mcl_core:dirt", - sand = "mcl_core:sand", - gravel = "mcl_core:gravel", - steel_ingot = "mcl_core:iron_ingot", - gold_ingot = "mcl_core:gold_ingot", - mese_crystal_fragment = "mesecons:redstone", - torch = "mcl_torches:torch", - diamond = "mcl_core:diamond", - clay_lump = "mcl_core:clay_lump", - water_bucket = "mcl_buckets:bucket_water", - empty_bucket = "mcl_buckets:bucket_empty", - dye_dark_grey = "mcl_dye:dark_grey", - --use iron where no equivalent - copper_ingot = "mcl_core:iron_ingot", - tin_ingot = "mcl_core:iron_ingot", - silver_ingot = "mcl_core:iron_ingot", - silicon = "mesecons_materials:silicon", - } + materials = { + dirt = "mcl_core:dirt", + sand = "mcl_core:sand", + gravel = "mcl_core:gravel", + steel_ingot = "mcl_core:iron_ingot", + gold_ingot = "mcl_core:gold_ingot", + mese_crystal_fragment = "mesecons:redstone", + torch = "mcl_torches:torch", + diamond = "mcl_core:diamond", + clay_lump = "mcl_core:clay_lump", + water_bucket = "mcl_buckets:bucket_water", + empty_bucket = "mcl_buckets:bucket_empty", + dye_dark_grey = "mcl_dye:dark_grey", + --use iron where no equivalent + copper_ingot = "mcl_core:iron_ingot", + tin_ingot = "mcl_core:iron_ingot", + silver_ingot = "mcl_core:iron_ingot", + silicon = "mesecons_materials:silicon", + } elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then - materials = { - dirt = "fl_topsoil:dirt", - sand = "fl_stone:sand", - gravel = "fl_topsoil:gravel", - steel_ingot = "fl_ores:iron_ingot", - gold_ingot = "fl_ores:gold_ingot", - mese_crystal_fragment = "fl_ores:iron_ingot", - torch = "fl_light_sources:torch", - diamond = "fl_ores:diamond", - clay_lump = "fl_bricks:clay_lump", - water_bucket = "fl_bucket:bucket_water", - empty_bucket = "fl_bucket:bucket", - dye_dark_grey = "fl_dyes:dark_grey_dye", - copper_ingot = "fl_ores:copper_ingot", - tin_ingot = "fl_ores:tin_ingot", - silver_ingot = "fl_ores:iron_ingot", - silicon = "mesecons_materials:silicon", - } + materials = { + dirt = "fl_topsoil:dirt", + sand = "fl_stone:sand", + gravel = "fl_topsoil:gravel", + steel_ingot = "fl_ores:iron_ingot", + gold_ingot = "fl_ores:gold_ingot", + mese_crystal_fragment = "fl_ores:iron_ingot", + torch = "fl_light_sources:torch", + diamond = "fl_ores:diamond", + clay_lump = "fl_bricks:clay_lump", + water_bucket = "fl_bucket:bucket_water", + empty_bucket = "fl_bucket:bucket", + dye_dark_grey = "fl_dyes:dark_grey_dye", + copper_ingot = "fl_ores:copper_ingot", + tin_ingot = "fl_ores:tin_ingot", + silver_ingot = "fl_ores:iron_ingot", + silicon = "mesecons_materials:silicon", + } elseif minetest.get_modpath("hades_core") then - materials = { - dirt = "hades_core:dirt", - sand = "hades_core:fertile_sand", - gravel = "hades_core:gravel", - steel_ingot = "hades_core:steel_ingot", - gold_ingot = "hades_core:gold_ingot", - mese_crystal_fragment = "hades_core:mese_crystal_fragment", - torch = "hades_torches:torch", - diamond = "hades_core:diamond", - clay_lump = "hades_core:clay_lump", - dye_dark_grey = "dye:dark_grey", - copper_ingot = "hades_core:copper_ingot", - tin_ingot = "hades_core:tin_ingot", - --[[ - since hades doesnt have buckets or water for the user, - using dirt from near water to pull the water out - ]] - water_bucket = "hades_core:dirt", - empty_bucket = "hades_core:fertile_sand", - --set this to steel unless hadesextraores is present - silver_ingot = "hades_core:steel_ingot", - silicon = "hades_materials:silicon", - } + materials = { + dirt = "hades_core:dirt", + sand = "hades_core:fertile_sand", + gravel = "hades_core:gravel", + steel_ingot = "hades_core:steel_ingot", + gold_ingot = "hades_core:gold_ingot", + mese_crystal_fragment = "hades_core:mese_crystal_fragment", + torch = "hades_torches:torch", + diamond = "hades_core:diamond", + clay_lump = "hades_core:clay_lump", + dye_dark_grey = "dye:dark_grey", + copper_ingot = "hades_core:copper_ingot", + tin_ingot = "hades_core:tin_ingot", + --[[ + since hades doesnt have buckets or water for the user, + using dirt from near water to pull the water out + ]] + water_bucket = "hades_core:dirt", + empty_bucket = "hades_core:fertile_sand", + --set this to steel unless hadesextraores is present + silver_ingot = "hades_core:steel_ingot", + silicon = "hades_materials:silicon", + } - if minetest.get_modpath("hades_bucket") then - materials["water_bucket"] = "hades_bucket:bucket_water" - materials["empty_bucket"] = "hades_bucket:bucket_empty" - end - if minetest.get_modpath("hades_extraores") then - materials["silver_ingot"] = "hades_extraores:silver_ingot" - end + if minetest.get_modpath("hades_bucket") then + materials["water_bucket"] = "hades_bucket:bucket_water" + materials["empty_bucket"] = "hades_bucket:bucket_empty" + end + if minetest.get_modpath("hades_extraores") then + materials["silver_ingot"] = "hades_extraores:silver_ingot" + end end local have_hades_materials = minetest.get_modpath("hades_materials") @@ -135,10 +135,10 @@ minetest.register_craft( { }) minetest.register_craft( { - output = "basic_materials:plastic_strip 9", - recipe = { + output = "basic_materials:plastic_strip 9", + recipe = { { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } - }, + }, }) minetest.register_craft( { @@ -151,10 +151,10 @@ minetest.register_craft( { }) if have_hades_materials then - minetest.clear_craft({ - type = "shapeless", - recipe = {"group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves"} - }) + minetest.clear_craft({ + type = "shapeless", + recipe = {"group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves"} + }) end minetest.register_craft({ @@ -165,11 +165,11 @@ minetest.register_craft({ --cooking recipes if not have_hades_materials then - minetest.register_craft({ - type = "cooking", - output = "basic_materials:plastic_sheet", - recipe = "basic_materials:paraffin", - }) + minetest.register_craft({ + type = "cooking", + output = "basic_materials:plastic_sheet", + recipe = "basic_materials:paraffin", + }) end minetest.register_craft({ @@ -205,193 +205,193 @@ minetest.register_craft({ }) minetest.register_craft({ - output = 'basic_materials:concrete_block 6', - recipe = { - {'group:sand', 'basic_materials:wet_cement', materials.gravel}, - {'basic_materials:steel_bar', 'basic_materials:wet_cement', 'basic_materials:steel_bar'}, - {materials.gravel, 'basic_materials:wet_cement', 'group:sand'}, - } + output = 'basic_materials:concrete_block 6', + recipe = { + {'group:sand', 'basic_materials:wet_cement', materials.gravel}, + {'basic_materials:steel_bar', 'basic_materials:wet_cement', 'basic_materials:steel_bar'}, + {materials.gravel, 'basic_materials:wet_cement', 'group:sand'}, + } }) minetest.register_craft( { - output = "basic_materials:motor 2", - recipe = { - { materials.mese_crystal_fragment, "basic_materials:copper_wire", "basic_materials:plastic_sheet" }, - { materials.copper_ingot, materials.steel_ingot, materials.steel_ingot }, - { materials.mese_crystal_fragment, "basic_materials:copper_wire", "basic_materials:plastic_sheet" } - }, - replacements = { - { "basic_materials:copper_wire", "basic_materials:empty_spool" }, - { "basic_materials:copper_wire", "basic_materials:empty_spool" }, - } + output = "basic_materials:motor 2", + recipe = { + { materials.mese_crystal_fragment, "basic_materials:copper_wire", "basic_materials:plastic_sheet" }, + { materials.copper_ingot, materials.steel_ingot, materials.steel_ingot }, + { materials.mese_crystal_fragment, "basic_materials:copper_wire", "basic_materials:plastic_sheet" } + }, + replacements = { + { "basic_materials:copper_wire", "basic_materials:empty_spool" }, + { "basic_materials:copper_wire", "basic_materials:empty_spool" }, + } }) minetest.register_craft( { - output = "basic_materials:heating_element 2", - recipe = { - { materials.copper_ingot, materials.mese_crystal_fragment, materials.copper_ingot } - }, + output = "basic_materials:heating_element 2", + recipe = { + { materials.copper_ingot, materials.mese_crystal_fragment, materials.copper_ingot } + }, }) minetest.register_craft({ - --type = "shapeless", - output = "basic_materials:energy_crystal_simple 2", - recipe = { - { materials.mese_crystal_fragment, materials.torch, materials.mese_crystal_fragment }, - { materials.diamond, materials.gold_ingot, materials.diamond } - }, + --type = "shapeless", + output = "basic_materials:energy_crystal_simple 2", + recipe = { + { materials.mese_crystal_fragment, materials.torch, materials.mese_crystal_fragment }, + { materials.diamond, materials.gold_ingot, materials.diamond } + }, }) minetest.register_craft( { - output = "basic_materials:copper_wire 2", - type = "shapeless", - recipe = { - materials.copper_ingot, - "basic_materials:empty_spool", - "basic_materials:empty_spool", - }, + output = "basic_materials:copper_wire 2", + type = "shapeless", + recipe = { + materials.copper_ingot, + "basic_materials:empty_spool", + "basic_materials:empty_spool", + }, }) minetest.register_craft( { - output = "basic_materials:gold_wire 2", - type = "shapeless", - recipe = { - materials.gold_ingot, - "basic_materials:empty_spool", - "basic_materials:empty_spool", - }, + output = "basic_materials:gold_wire 2", + type = "shapeless", + recipe = { + materials.gold_ingot, + "basic_materials:empty_spool", + "basic_materials:empty_spool", + }, }) minetest.register_craft( { - output = "basic_materials:steel_wire 2", - type = "shapeless", - recipe = { - materials.steel_ingot, - "basic_materials:empty_spool", - "basic_materials:empty_spool", - }, + output = "basic_materials:steel_wire 2", + type = "shapeless", + recipe = { + materials.steel_ingot, + "basic_materials:empty_spool", + "basic_materials:empty_spool", + }, }) minetest.register_craft( { - output = "basic_materials:steel_strip 12", - recipe = { - { "", materials.steel_ingot, "" }, - { materials.steel_ingot, "", "" }, - }, + output = "basic_materials:steel_strip 12", + recipe = { + { "", materials.steel_ingot, "" }, + { materials.steel_ingot, "", "" }, + }, }) minetest.register_craft( { - output = "basic_materials:copper_strip 12", - recipe = { - { "", materials.copper_ingot, "" }, - { materials.copper_ingot, "", "" }, - }, + output = "basic_materials:copper_strip 12", + recipe = { + { "", materials.copper_ingot, "" }, + { materials.copper_ingot, "", "" }, + }, }) minetest.register_craft( { - output = "basic_materials:steel_bar 6", - recipe = { - { "", "", materials.steel_ingot }, - { "", materials.steel_ingot, "" }, - { materials.steel_ingot, "", "" }, - }, + output = "basic_materials:steel_bar 6", + recipe = { + { "", "", materials.steel_ingot }, + { "", materials.steel_ingot, "" }, + { materials.steel_ingot, "", "" }, + }, }) minetest.register_craft( { - output = "basic_materials:padlock 2", - recipe = { - { "basic_materials:steel_bar" }, - { materials.steel_ingot }, - { materials.steel_ingot }, - }, + output = "basic_materials:padlock 2", + recipe = { + { "basic_materials:steel_bar" }, + { materials.steel_ingot }, + { materials.steel_ingot }, + }, }) minetest.register_craft({ - output = "basic_materials:chainlink_steel 12", - recipe = { - {"", materials.steel_ingot, materials.steel_ingot}, - { materials.steel_ingot, "", materials.steel_ingot }, - { materials.steel_ingot, materials.steel_ingot, "" }, - }, + output = "basic_materials:chainlink_steel 12", + recipe = { + {"", materials.steel_ingot, materials.steel_ingot}, + { materials.steel_ingot, "", materials.steel_ingot }, + { materials.steel_ingot, materials.steel_ingot, "" }, + }, }) minetest.register_craft( { - output = "basic_materials:gear_steel 6", - recipe = { - { "", materials.steel_ingot, "" }, - { materials.steel_ingot,"basic_materials:chainlink_steel", materials.steel_ingot }, - { "", materials.steel_ingot, "" } - }, + output = "basic_materials:gear_steel 6", + recipe = { + { "", materials.steel_ingot, "" }, + { materials.steel_ingot,"basic_materials:chainlink_steel", materials.steel_ingot }, + { "", materials.steel_ingot, "" } + }, }) minetest.register_craft( { - type = "shapeless", - output = "basic_materials:terracotta_base 8", - recipe = { - materials.water_bucket, - materials.clay_lump, - materials.gravel, - }, - replacements = {{materials.water_bucket, materials.empty_bucket}}, + type = "shapeless", + output = "basic_materials:terracotta_base 8", + recipe = { + materials.water_bucket, + materials.clay_lump, + materials.gravel, + }, + replacements = {{materials.water_bucket, materials.empty_bucket}}, }) minetest.register_craft({ - type = "shapeless", - output = "basic_materials:wet_cement 3", - recipe = { - materials.dirt, - materials.dye_dark_grey, - materials.dye_dark_grey, - materials.dye_dark_grey, - materials.water_bucket - }, - replacements = {{materials.water_bucket, materials.empty_bucket}}, + type = "shapeless", + output = "basic_materials:wet_cement 3", + recipe = { + materials.dirt, + materials.dye_dark_grey, + materials.dye_dark_grey, + materials.dye_dark_grey, + materials.water_bucket + }, + replacements = {{materials.water_bucket, materials.empty_bucket}}, }) if not have_hades_materials then - minetest.register_craft( { - output = materials.silicon.." 4", - recipe = { - { materials.sand, materials.sand }, - { materials.sand, materials.steel_ingot }, - }, - }) + minetest.register_craft( { + output = materials.silicon.." 4", + recipe = { + { materials.sand, materials.sand }, + { materials.sand, materials.steel_ingot }, + }, + }) end minetest.register_craft( { - output = "basic_materials:ic 4", - recipe = { - { materials.silicon, materials.silicon }, - { materials.silicon, materials.copper_ingot }, - }, + output = "basic_materials:ic 4", + recipe = { + { materials.silicon, materials.silicon }, + { materials.silicon, materials.copper_ingot }, + }, }) -- Without moreores, there still should be a way to create brass. minetest.register_craft( { - output = "basic_materials:brass_ingot 9", - recipe = { - {materials.copper_ingot, materials.tin_ingot, materials.copper_ingot}, - {materials.gold_ingot, materials.copper_ingot, materials.tin_ingot}, - {materials.copper_ingot, materials.tin_ingot, materials.copper_ingot}, - }, + output = "basic_materials:brass_ingot 9", + recipe = { + {materials.copper_ingot, materials.tin_ingot, materials.copper_ingot}, + {materials.gold_ingot, materials.copper_ingot, materials.tin_ingot}, + {materials.copper_ingot, materials.tin_ingot, materials.copper_ingot}, + }, }) minetest.register_craft( { - output = "basic_materials:silver_wire 2", - type = "shapeless", - recipe = { - materials.silver_ingot, - "basic_materials:empty_spool", - "basic_materials:empty_spool", - }, + output = "basic_materials:silver_wire 2", + type = "shapeless", + recipe = { + materials.silver_ingot, + "basic_materials:empty_spool", + "basic_materials:empty_spool", + }, }) minetest.register_craft( { - type = "shapeless", - output = "basic_materials:brass_ingot 3", - recipe = { - materials.copper_ingot, - materials.copper_ingot, - materials.silver_ingot, - }, + type = "shapeless", + output = "basic_materials:brass_ingot 3", + recipe = { + materials.copper_ingot, + materials.copper_ingot, + materials.silver_ingot, + }, })