From 0f34b949b7988d3897c19f5fcb969db986ae9b2f Mon Sep 17 00:00:00 2001 From: JoseDouglas26 Date: Fri, 3 May 2024 13:36:39 -0300 Subject: [PATCH 01/13] New mcl_copper --- mods/CORE/mcl_oxidation/init.lua | 11 +- mods/ITEMS/mcl_copper/crafting.lua | 163 +++++- mods/ITEMS/mcl_copper/functions.lua | 209 +++---- mods/ITEMS/mcl_copper/init.lua | 1 + .../mcl_copper/locale/mcl_copper.pt_BR.tr | 59 ++ mods/ITEMS/mcl_copper/locale/template.txt | 59 ++ mods/ITEMS/mcl_copper/nodes.lua | 554 ++++++++---------- mods/ITEMS/mcl_honey/init.lua | 27 +- mods/ITEMS/mcl_tools/init.lua | 10 + 9 files changed, 636 insertions(+), 457 deletions(-) diff --git a/mods/CORE/mcl_oxidation/init.lua b/mods/CORE/mcl_oxidation/init.lua index 201d0260a..69439f6f2 100644 --- a/mods/CORE/mcl_oxidation/init.lua +++ b/mods/CORE/mcl_oxidation/init.lua @@ -6,7 +6,16 @@ minetest.register_abm({ action = function(pos, node) local def = minetest.registered_nodes[node.name] if def and def._mcl_oxidized_variant then - minetest.set_node(pos, { name = def._mcl_oxidized_variant, param2 = node.param2 }) + if def.groups.door == 1 then + if node.name:find("_b_") then + local top_pos = { x = pos.x, y = pos.y + 1, z = pos.z } + minetest.swap_node(top_pos, { name = def._mcl_oxidized_variant:gsub("_b_", "_t_"), param2 = node.param2 }) + elseif node.name:find("_t_") then + local bot_pos = { x = pos.x, y = pos.y - 1, z = pos.z } + minetest.swap_node(bot_pos, { name = def._mcl_oxidized_variant:gsub("_t_", "_b_"), param2 = node.param2 }) + end + end + minetest.swap_node(pos, { name = def._mcl_oxidized_variant, param2 = node.param2 }) end end, }) diff --git a/mods/ITEMS/mcl_copper/crafting.lua b/mods/ITEMS/mcl_copper/crafting.lua index 9b0976d3a..ec13fa429 100644 --- a/mods/ITEMS/mcl_copper/crafting.lua +++ b/mods/ITEMS/mcl_copper/crafting.lua @@ -16,39 +16,130 @@ minetest.register_craft({ }, }) -minetest.register_craft({ - output = "mcl_copper:block_cut 4", - recipe = { - { "mcl_copper:block", "mcl_copper:block" }, - { "mcl_copper:block", "mcl_copper:block" }, - }, -}) +local function get_shape(name, material) + if name == "cut" then + return { + {material, material}, + {material, material} + } + elseif name == "grate" then + return { + {"", material, ""}, + {material, "", material}, + {"", material, ""} + } + elseif name == "chiseled" then + return { + {material}, + {material}, + } + elseif name == "door" then + return { + {material, material}, + {material, material}, + {material, material} + } + elseif name == "trapdoor" then + return { + {material, material, material}, + {material, material, material} + } + elseif name == "bulb_off" then + return { + {"", material, ""}, + {material, "mcl_mobitems:blaze_rod", material}, + {"", "mesecons:redstone", ""} + } + else + return {} + end +end -minetest.register_craft({ - output = "mcl_copper:block_exposed_cut 4", - recipe = { - { "mcl_copper:block_exposed", "mcl_copper:block_exposed" }, - { "mcl_copper:block_exposed", "mcl_copper:block_exposed" }, - }, -}) +function mcl_copper.register_variants_recipes(name, material, amount) + local names + local materials = {} + if name ~= "cut" then + names = { + name, "waxed_"..name, + name.."_exposed", "waxed_"..name.."_exposed", + name.."_weathered", "waxed_"..name.."_weathered", + name.."_oxidized", "waxed_"..name.."_oxidized" + } + else + names = { + "block_"..name, "waxed_block_"..name, + "block_exposed_"..name, "waxed_block_exposed_"..name, + "block_weathered_"..name, "waxed_block_weathered_"..name, + "block_oxidized_"..name, "waxed_block_oxidized_"..name + } + end -minetest.register_craft({ - output = "mcl_copper:block_oxidized_cut 4", - recipe = { - { "mcl_copper:block_oxidized", "mcl_copper:block_oxidized" }, - { "mcl_copper:block_oxidized", "mcl_copper:block_oxidized" }, - }, -}) + if type(material) == "string" then + materials = { + "mcl_copper:"..material, "mcl_copper:waxed_"..material, + "mcl_copper:"..material.."_exposed", "mcl_copper:waxed_"..material.."_exposed", + "mcl_copper:"..material.."_weathered", "mcl_copper:waxed_"..material.."_weathered", + "mcl_copper:"..material.."_oxidized", "mcl_copper:waxed_"..material.."_oxidized" + } + elseif type(material) == "table" then + if #material == 8 then + materials = material + else + return + end + else + return + end -minetest.register_craft({ - output = "mcl_copper:block_weathered_cut 4", - recipe = { - { "mcl_copper:block_weathered", "mcl_copper:block_weathered" }, - { "mcl_copper:block_weathered", "mcl_copper:block_weathered" }, - }, -}) + for i = 1, 8 do + minetest.register_craft({ + output = "mcl_copper:"..names[i].." "..tostring(amount), + recipe = get_shape(name, materials[i]) + }) + end +end -local waxable_blocks = { "block", "block_cut", "block_exposed", "block_exposed_cut", "block_weathered", "block_weathered_cut", "block_oxidized", "block_oxidized_cut" } +mcl_copper.register_variants_recipes("cut", "block", 4) +mcl_copper.register_variants_recipes("grate", "block", 4) +mcl_copper.register_variants_recipes("door", "block", 3) +mcl_copper.register_variants_recipes("trapdoor", "block", 2) +mcl_copper.register_variants_recipes("bulb_off", "block", 4) + +local chiseled_materials = { + "mcl_stairs:slab_copper_cut", + "mcl_stairs:slab_waxed_copper_cut", + "mcl_stairs:slab_copper_exposed_cut", + "mcl_stairs:slab_waxed_copper_exposed_cut", + "mcl_stairs:slab_copper_weathered_cut", + "mcl_stairs:slab_waxed_copper_weathered_cut", + "mcl_stairs:slab_copper_oxidized_cut", + "mcl_stairs:slab_waxed_copper_oxidized_cut" +} + +mcl_copper.register_variants_recipes("chiseled", chiseled_materials, 1) + +local waxable_blocks = { + "block", + "block_cut", + "grate", + "chiseled", + "bulb_off", + "block_exposed", + "block_exposed_cut", + "grate_exposed", + "chiseled_exposed", + "bulb_off_exposed", + "block_weathered", + "block_weathered_cut", + "grate_weathered", + "chiseled_weathered", + "bulb_off_weathered", + "block_oxidized", + "block_oxidized_cut", + "grate_oxidized", + "chiseled_oxidized", + "bulb_off_oxidized" +} for _, w in ipairs(waxable_blocks) do minetest.register_craft({ @@ -59,10 +150,22 @@ for _, w in ipairs(waxable_blocks) do }) end -local cuttable_blocks = { "block", "waxed_block", "block_exposed", "waxed_block_exposed", "block_weathered", "waxed_block_weathered", "block_oxidized", "waxed_block_oxidized" } +local cuttable_blocks = { + "block", + "waxed_block", + "block_exposed", + "waxed_block_exposed", + "block_weathered", + "waxed_block_weathered", + "block_oxidized", + "waxed_block_oxidized" +} for _, c in ipairs(cuttable_blocks) do mcl_stonecutter.register_recipe("mcl_copper:"..c, "mcl_copper:"..c.."_cut", 4) + mcl_stonecutter.register_recipe("mcl_copper:"..c, "mcl_copper:"..c:gsub("block", "grate"), 4) + mcl_stonecutter.register_recipe("mcl_copper:"..c, "mcl_copper:"..c:gsub("block", "chiseled"), 4) + mcl_stonecutter.register_recipe("mcl_copper:"..c.."_cut", "mcl_copper:"..c:gsub("block", "chiseled")) end minetest.register_craft({ diff --git a/mods/ITEMS/mcl_copper/functions.lua b/mods/ITEMS/mcl_copper/functions.lua index bd289f60f..5e2b04f77 100644 --- a/mods/ITEMS/mcl_copper/functions.lua +++ b/mods/ITEMS/mcl_copper/functions.lua @@ -1,132 +1,115 @@ -local stair_oxidization = { - { "cut", "exposed_cut" }, - { "cut_inner", "exposed_cut_inner" }, - { "cut_outer", "exposed_cut_outer" }, - { "exposed_cut", "weathered_cut" }, - { "exposed_cut_inner", "weathered_cut_inner" }, - { "exposed_cut_outer", "weathered_cut_outer" }, - { "weathered_cut", "oxidized_cut" }, - { "weathered_cut_inner", "oxidized_cut_inner" }, - { "weathered_cut_outer", "oxidized_cut_outer" } -} +function mcl_copper.register_oxidation_and_scraping(mod_name, subname, decay_chain) + local item, oxidized_item -local slab_oxidization = { - { "cut", "exposed_cut" }, - { "cut_top", "exposed_cut_top" }, - { "cut_double", "exposed_cut_double" }, - { "exposed_cut", "weathered_cut" }, - { "exposed_cut_top", "weathered_cut_top" }, - { "exposed_cut_double", "weathered_cut_double" }, - { "weathered_cut", "oxidized_cut" }, - { "weathered_cut_top", "oxidized_cut_top" }, - { "weathered_cut_double", "oxidized_cut_double" }, -} + for i = 1, #decay_chain - 1 do + item = mod_name..":"..subname..decay_chain[i] + oxidized_item = mod_name..":"..subname..decay_chain[i + 1] -local def -local def_variant_oxidized -local def_variant_waxed -local def_variant_scraped + minetest.override_item(item, {_mcl_oxidized_variant = oxidized_item}) + minetest.override_item(oxidized_item, {_mcl_stripped_variant = item}) --- set up oxidized and waxed variants. -for i = 1, #stair_oxidization do - -- stairs - def = "mcl_stairs:stair_copper_" .. stair_oxidization[i][1] - def_variant_oxidized = "mcl_stairs:stair_copper_" .. stair_oxidization[i][2] - minetest.override_item(def, { _mcl_oxidized_variant = def_variant_oxidized }) + if subname:find("stair") then + minetest.override_item(item.."_inner", {_mcl_oxidized_variant = oxidized_item.."_inner"}) + minetest.override_item(item.."_outer", {_mcl_oxidized_variant = oxidized_item.."_outer"}) + minetest.override_item(oxidized_item.."_inner", {_mcl_stripped_variant = item.."_inner"}) + minetest.override_item(oxidized_item.."_outer", {_mcl_stripped_variant = item.."_outer"}) + elseif subname:find("slab") then + minetest.override_item(item.."_double", {_mcl_oxidized_variant = oxidized_item.."_double"}) + minetest.override_item(item.."_top", {_mcl_oxidized_variant = oxidized_item.."_top"}) + minetest.override_item(oxidized_item.."_double", {_mcl_stripped_variant = item.."_double"}) + minetest.override_item(oxidized_item.."_top", {_mcl_stripped_variant = item.."_top"}) + elseif subname:find("trapdoor") then + minetest.override_item(item.."_open", {_mcl_oxidized_variant = oxidized_item.."_open"}) + minetest.override_item(oxidized_item.."_open", {_mcl_stripped_variant = item.."_open"}) + elseif subname == "door" then + minetest.override_item(item.."_b_1", {_mcl_oxidized_variant = oxidized_item.."_b_1"}) + minetest.override_item(oxidized_item.."_b_1", {_mcl_stripped_variant = item.."_b_1"}) + minetest.override_item(item.."_t_1", {_mcl_oxidized_variant = oxidized_item.."_t_1"}) + minetest.override_item(oxidized_item.."_t_1", {_mcl_stripped_variant = item.."_t_1"}) - def_variant_waxed = "mcl_stairs:stair_waxed_copper_" .. stair_oxidization[i][1] - minetest.override_item(def, { _mcl_waxed_variant = def_variant_waxed }) + minetest.override_item(item.."_b_2", {_mcl_oxidized_variant = oxidized_item.."_b_2"}) + minetest.override_item(oxidized_item.."_b_2", {_mcl_stripped_variant = item.."_b_2"}) + minetest.override_item(item.."_t_2", {_mcl_oxidized_variant = oxidized_item.."_t_2"}) + minetest.override_item(oxidized_item.."_t_2", {_mcl_stripped_variant = item.."_t_2"}) - -- slabs - def = "mcl_stairs:slab_copper_" .. slab_oxidization[i][1] - def_variant_oxidized = "mcl_stairs:slab_copper_" .. slab_oxidization[i][2] - minetest.override_item(def, { _mcl_oxidized_variant = def_variant_oxidized }) + minetest.override_item(item.."_b_3", {_mcl_oxidized_variant = oxidized_item.."_b_3"}) + minetest.override_item(oxidized_item.."_b_3", {_mcl_stripped_variant = item.."_b_3"}) + minetest.override_item(item.."_t_3", {_mcl_oxidized_variant = oxidized_item.."_t_3"}) + minetest.override_item(oxidized_item.."_t_3", {_mcl_stripped_variant = item.."_t_3"}) - def_variant_waxed = "mcl_stairs:slab_waxed_copper_" .. slab_oxidization[i][1] - minetest.override_item(def, { _mcl_waxed_variant = def_variant_waxed }) -end - --- Set up scraped variants. -for i = 1, #stair_oxidization do - -- does both stairs and slabs. - if i > 3 then - def = "mcl_stairs:stair_copper_" .. stair_oxidization[i][1] - def_variant_scraped = "mcl_stairs:stair_copper_" .. stair_oxidization[i - 3][1] - minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped }) - - def = "mcl_stairs:slab_copper_" .. slab_oxidization[i][1] - def_variant_scraped = "mcl_stairs:slab_copper_" .. slab_oxidization[i - 3][1] - minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped }) - end - if i > 6 then - def = "mcl_stairs:stair_copper_" .. stair_oxidization[i][2] - def_variant_scraped = "mcl_stairs:stair_copper_" .. stair_oxidization[i][1] - minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped }) - - def = "mcl_stairs:slab_copper_" .. slab_oxidization[i][2] - def_variant_scraped = "mcl_stairs:slab_copper_" .. slab_oxidization[i][1] - minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped }) + minetest.override_item(item.."_b_4", {_mcl_oxidized_variant = oxidized_item.."_b_4"}) + minetest.override_item(oxidized_item.."_b_4", {_mcl_stripped_variant = item.."_b_4"}) + minetest.override_item(item.."_t_4", {_mcl_oxidized_variant = oxidized_item.."_t_4"}) + minetest.override_item(oxidized_item.."_t_4", {_mcl_stripped_variant = item.."_t_4"}) + end end end --- Set up scraped variants for waxed stairs. -local waxed_variants = { - { "waxed_copper_cut", "copper_cut" }, - { "waxed_copper_exposed_cut", "copper_exposed_cut" }, - { "waxed_copper_weathered_cut", "copper_weathered_cut" }, - { "waxed_copper_oxidized_cut", "copper_oxidized_cut" }, -} +function mcl_copper.register_waxing_and_scraping(mod_name, subname, decay_chain) + local waxed_item, unwaxed_item -for i = 1, #waxed_variants do - -- stairs - def = "mcl_stairs:stair_" .. waxed_variants[i][1] - def_variant_scraped = "mcl_stairs:stair_" .. waxed_variants[i][2] - minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped }) + for i = 1, #decay_chain do + waxed_item = mod_name..":"..subname..decay_chain[i] + unwaxed_item = mod_name..":"..subname:gsub("waxed_", "")..decay_chain[i] - def = "mcl_stairs:stair_" .. waxed_variants[i][1] .. "_inner" - def_variant_scraped = "mcl_stairs:stair_" .. waxed_variants[i][2] .. "_inner" - minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped }) + minetest.override_item(waxed_item, {_mcl_stripped_variant = unwaxed_item}) + minetest.override_item(unwaxed_item, {_mcl_waxed_variant = waxed_item}) - def = "mcl_stairs:stair_" .. waxed_variants[i][1] .. "_outer" - def_variant_scraped = "mcl_stairs:stair_" .. waxed_variants[i][2] .. "_outer" - minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped }) + if subname:find("stair") then + minetest.override_item(waxed_item.."_inner", {_mcl_stripped_variant = unwaxed_item.."_inner"}) + minetest.override_item(waxed_item.."_outer", {_mcl_stripped_variant = unwaxed_item.."_outer"}) + minetest.override_item(unwaxed_item.."_inner", {_mcl_waxed_variant = waxed_item.."_inner"}) + minetest.override_item(unwaxed_item.."_outer", {_mcl_waxed_variant = waxed_item.."_outer"}) + elseif subname:find("slab") then + minetest.override_item(waxed_item.."_double", {_mcl_stripped_variant = unwaxed_item.."_double"}) + minetest.override_item(waxed_item.."_top", {_mcl_stripped_variant = unwaxed_item.."_top"}) + minetest.override_item(unwaxed_item.."_double", {_mcl_waxed_variant = waxed_item.."_double"}) + minetest.override_item(unwaxed_item.."_top", {_mcl_waxed_variant = waxed_item.."_top"}) + elseif subname:find("trapdoor") then + minetest.override_item(waxed_item.."_open", {_mcl_stripped_variant = unwaxed_item.."_open"}) + minetest.override_item(unwaxed_item.."_open", {_mcl_waxed_variant = waxed_item.."_open"}) + elseif subname == "waxed_door" then + minetest.override_item(waxed_item.."_b_1", {_mcl_stripped_variant = unwaxed_item.."_b_1"}) + minetest.override_item(unwaxed_item.."_b_1", {_mcl_waxed_variant = waxed_item.."_b_1"}) + minetest.override_item(waxed_item.."_t_1", {_mcl_stripped_variant = unwaxed_item.."_t_1"}) + minetest.override_item(unwaxed_item.."_t_1", {_mcl_waxed_variant = waxed_item.."_t_1"}) - -- slab - def = "mcl_stairs:slab_" .. waxed_variants[i][1] - def_variant_scraped = "mcl_stairs:slab_" .. waxed_variants[i][2] - minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped }) + minetest.override_item(waxed_item.."_b_2", {_mcl_stripped_variant = unwaxed_item.."_b_2"}) + minetest.override_item(unwaxed_item.."_b_2", {_mcl_waxed_variant = waxed_item.."_b_2"}) + minetest.override_item(waxed_item.."_t_2", {_mcl_stripped_variant = unwaxed_item.."_t_2"}) + minetest.override_item(unwaxed_item.."_t_2", {_mcl_waxed_variant = waxed_item.."_t_2"}) - def = "mcl_stairs:slab_" .. waxed_variants[i][1] .. "_top" - def_variant_scraped = "mcl_stairs:slab_" .. waxed_variants[i][2] .. "_top" - minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped }) - - def = "mcl_stairs:slab_" .. waxed_variants[i][1] .. "_double" - def_variant_scraped = "mcl_stairs:slab_" .. waxed_variants[i][2] .. "_double" - minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped }) + minetest.override_item(waxed_item.."_b_3", {_mcl_stripped_variant = unwaxed_item.."_b_3"}) + minetest.override_item(unwaxed_item.."_b_3", {_mcl_waxed_variant = waxed_item.."_b_3"}) + minetest.override_item(waxed_item.."_t_3", {_mcl_stripped_variant = unwaxed_item.."_t_3"}) + minetest.override_item(unwaxed_item.."_t_3", {_mcl_waxed_variant = waxed_item.."_t_3"}) + minetest.override_item(waxed_item.."_b_4", {_mcl_stripped_variant = unwaxed_item.."_b_4"}) + minetest.override_item(unwaxed_item.."_b_4", {_mcl_waxed_variant = waxed_item.."_b_4"}) + minetest.override_item(waxed_item.."_t_4", {_mcl_stripped_variant = unwaxed_item.."_t_4"}) + minetest.override_item(unwaxed_item.."_t_4", {_mcl_waxed_variant = waxed_item.."_t_4"}) + end + end end --- Waxed Oxidized Slabs and Stairs -local oxidized_slabs = { - "oxidized_cut", - "oxidized_cut_double", - "oxidized_cut_top" +local cut_decay_chain = { + "_cut", + "_exposed_cut", + "_weathered_cut", + "_oxidized_cut" +} +local doors_decay_chain = { + "", + "_exposed", + "_weathered", + "_oxidized" } -for i = 1, #oxidized_slabs do - def = "mcl_stairs:slab_copper_" .. oxidized_slabs[i] - def_variant_waxed = "mcl_stairs:slab_waxed_copper_" .. oxidized_slabs[i] - minetest.override_item(def, { _mcl_waxed_variant = def_variant_waxed }) -end - -local oxidized_stairs = { - "oxidized_cut", - "oxidized_cut_inner", - "oxidized_cut_outer" -} - -for i = 1, #oxidized_stairs do - def = "mcl_stairs:stair_copper_" .. oxidized_stairs[i] - def_variant_waxed = "mcl_stairs:stair_waxed_copper_" .. oxidized_stairs[i] - minetest.override_item(def, { _mcl_waxed_variant = def_variant_waxed }) -end +mcl_copper.register_oxidation_and_scraping("mcl_stairs", "stair_copper", cut_decay_chain) +mcl_copper.register_oxidation_and_scraping("mcl_stairs", "slab_copper", cut_decay_chain) +mcl_copper.register_oxidation_and_scraping("mcl_copper", "trapdoor", doors_decay_chain) +mcl_copper.register_oxidation_and_scraping("mcl_copper", "door", doors_decay_chain) +mcl_copper.register_waxing_and_scraping("mcl_stairs", "stair_waxed_copper", cut_decay_chain) +mcl_copper.register_waxing_and_scraping("mcl_stairs", "slab_waxed_copper", cut_decay_chain) +mcl_copper.register_waxing_and_scraping("mcl_copper", "waxed_trapdoor", doors_decay_chain) +mcl_copper.register_waxing_and_scraping("mcl_copper", "waxed_door", doors_decay_chain) diff --git a/mods/ITEMS/mcl_copper/init.lua b/mods/ITEMS/mcl_copper/init.lua index 01ece6d54..e300f9143 100644 --- a/mods/ITEMS/mcl_copper/init.lua +++ b/mods/ITEMS/mcl_copper/init.lua @@ -2,6 +2,7 @@ local path = minetest.get_modpath("mcl_copper") mcl_copper = {} -- initialize global variable. +dofile(path .. "/descriptions.lua") dofile(path .. "/nodes.lua") dofile(path .. "/items.lua") dofile(path .. "/crafting.lua") diff --git a/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr b/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr index 18aeb1304..a5007c209 100644 --- a/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr +++ b/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr @@ -55,3 +55,62 @@ Waxed Weathered Copper=Cobre Desgastado Encerado Weathered cut copper is a decorative block.=Cobre lapidado desgastado é um bloco decorativo. Weathered Cut Copper=Cobre Lapidado Desgastado Waxed Weathered Cut Copper=Cobre Lapidado Desgastado Encerado +Copper Grate=Grade de Cobre +Waxed Copper Grate=Grade de Cobre Encerada +Copper grate is a decorative block.=Grade de cobre é um bloco decorativo. +Exposed Copper Grate=Grade de Cobre Exposto +Waxed Exposed Copper Grate=Grade de Cobre Exposto Encerada +Exposed copper grate is a decorative block.=Grade de cobre exposto é um bloco decorativo. +Weathered Copper Grate=Grade de Cobre Desgastado +Waxed Weathered Copper Grate=Grade de Cobre Desgastado Encerada +Weathered opper grate is a decorative block.=Grade de cobre de desgastado é um bloco decorativo. +Oxidized Copper Grate=Grade de Cobre Oxidado +Waxed Oxidized Copper Grate=Grade de Cobre Oxidado Encerada +Oxidized copper grate is a decorative block.=Grade de cobre oxidado é um bloco decorativo. +Chiseled Copper=Cobre Talhado +Waxed Chiseled Copper=Cobre Talhado Encerado +Chiseled copper is a decorative block.=Cobre talhado é um bloco decorativo. +Exposed Chiseled Copper=Cobre Talhado Exposto +Waxed Exposed Chiseled Copper=Cobre Talhado Exposto Encerado +Exposed chiseled copper is a decorative block.=Cobre talhado exposto é um bloco decorativo. +Weathered Chiseled Copper=Cobre Talhado Desgastado +Waxed Weathered Chiseled Copper=Cobre Talhado Desgastado Encerado +Weathered chiseled copper is a decorative block.=Cobre talhado desgastado é um bloco decorativo. +Oxidized Chiseled Copper=Cobre Talhado Oxidado +Waxed Oxidized Chiseled Copper=Cobre Talhado Oxidado Encerado +Oxidized chiseled copper is a decorative block.=Cobre talhado oxidado é um bloco decorativo. +Copper Bulb=Bulbo de Cobre +Waxed Copper Bulb=Bulbo de Cobre Encerado +Copper bulb is a decorative block and a light source.=Bulbo de cobre é um bloco decorativo e uma fonte de luz. +Copper bulb is a decorative block and a light source when lited.=Bulbo de cobre é um bloco decorativo e uma fonte de luz quando aceso. +Exposed Copper Bulb=Bulbo de Cobre Exposto +Waxed Exposed Copper Bulb=Bulbo de Cobre Exposto Encerado +Exposed copper bulb is a decorative block and a light source.=Bulbo de cobre exposto é um bloco decorativo e uma fonte de luz. +Exposed copper bulb is a decorative block and a light source when lited.=Bulbo de cobre exposto é um bloco decorativo e uma fonte de luz quando aceso. +Weathered Copper Bulb=Bulbo de Cobre Desgastado +Waxed Weathered Copper Bulb=Bulbo de Cobre Desgastado Encerado +Weathered copper bulb is a decorative block and a light source.=Bulbo de cobre desgastado é um bloco decorativo e uma fonte de luz. +Weathered copper bulb is a decorative block and a light source when lited.=Bulbo de cobre desgastado é um bloco decorativo e uma fonte de luz quando aceso. +Oxidized Copper Bulb=Bulbo de Cobre Oxidado +Waxed Oxidized Copper Bulb=Bulbo de Cobre Oxidado Encerado +Oxidized copper bulb is a decorative block and a light source.=Bulbo de cobre oxidado é um bloco decorativo e uma fonte de luz. +Oxidized copper bulb is a decorative block and a light source when lited.=Bulbo de cobre oxidado é um bloco decorativo e uma fonte de luz quando aceso. +Copper Door=Porta de Cobre +Waxed Copper Door=Porta de Cobre Encerada +Exposed Copper Door=Porta de Cobre Exposto +Waxed Exposed Copper Door=Porta de Cobre Exposto Encerada +Weathered Copper Door=Porta de Cobre Desgastado +Waxed Weathered Copper Door=Porta de Cobre Desgastado Encerada +Oxidized Copper Door=Porta de Cobre Oxidado +Waxed Oxidized Copper Door=Porta de Cobre Oxidado Encerada +Copper Trapdoor=Alçapão de Cobre +Waxed Copper Trapdoor=Alçapão de Cobre Encerado +Exposed Copper Trapdoor=Alçapão de Cobre Exposto +Waxed Exposed Copper Trapdoor=Alçapão de Cobre Exposto Encerado +Weathered Copper Trapdoor=Alçapão de Cobre Desgastado +Waxed Weathered Copper Trapdoor=Alçapão de Cobre Desgastado Encerado +Oxidized Copper Trapdoor=Alçapão de Cobre Oxidado +Waxed Oxidized Copper Trapdoor=Alçapão de Cobre Oxidado Encerado +@1 (Lit)=@1 (Aceso) +@1 (Powered)=@1 (Energizado) +@1 (Lit and Powered)=@1 (Aceso e Energizado) diff --git a/mods/ITEMS/mcl_copper/locale/template.txt b/mods/ITEMS/mcl_copper/locale/template.txt index 7022780ff..cca2eb983 100644 --- a/mods/ITEMS/mcl_copper/locale/template.txt +++ b/mods/ITEMS/mcl_copper/locale/template.txt @@ -55,3 +55,62 @@ Waxed Weathered Copper= Weathered cut copper is a decorative block.= Weathered Cut Copper= Waxed Weathered Cut Copper= +Copper Grate= +Waxed Copper Grate= +Copper grate is a decorative block.= +Exposed Copper Grate= +Waxed Exposed Copper Grate= +Exposed copper grate is a decorative block.= +Weathered Copper Grate= +Waxed Weathered Copper Grate= +Weathered copper grate is a decorative block.= +Oxidized Copper Grate= +Waxed Oxidized Copper Grate= +Oxidized copper grate is a decorative block.= +Chiseled Copper= +Waxed Chiseled Copper= +Chiseled copper is a decorative block.= +Exposed Chiseled Copper= +Waxed Exposed Chiseled Copper= +Exposed chiseled copper is a decorative block.= +Weathered Chiseled Copper= +Waxed Weathered Chiseled Copper= +Weathered chiseled copper is a decorative block.= +Oxidized Chiseled Copper= +Waxed Oxidized Chiseled Copper= +Oxidized chiseled copper is a decorative block.= +Copper Bulb= +Waxed Copper Bulb= +Copper bulb is a decorative block and a light source.= +Copper bulb is a decorative block and a light source when lited.= +Exposed Copper Bulb= +Waxed Exposed Copper Bulb= +Exposed copper bulb is a decorative block and a light source.= +Exposed copper bulb is a decorative block and a light source when lited.= +Weathered Copper Bulb= +Waxed Weathered Copper Bulb= +Weathered copper bulb is a decorative block and a light source.= +Weathered copper bulb is a decorative block and a light source when lited.= +Oxidized Copper Bulb= +Waxed Oxidized Copper Bulb= +Oxidized copper bulb is a decorative block and a light source.= +Oxidized copper bulb is a decorative block and a light source when lited.= +Copper Door= +Waxed Copper Door= +Exposed Copper Door= +Waxed Exposed Copper Door= +Weathered Copper Door= +Waxed Weathered Copper Door= +Oxidized Copper Door= +Waxed Oxidized Copper Door= +Copper Trapdoor= +Waxed Copper Trapdoor= +Exposed Copper Trapdoor= +Waxed Exposed Copper Trapdoor= +Weathered Copper Trapdoor= +Waxed Weathered Copper Trapdoor= +Oxidized Copper Trapdoor= +Waxed Oxidized Copper Trapdoor= +@1 (Lit)= +@1 (Powered)= +@1 (Lit and Powered)= diff --git a/mods/ITEMS/mcl_copper/nodes.lua b/mods/ITEMS/mcl_copper/nodes.lua index af5a49a1c..b8a5c218c 100644 --- a/mods/ITEMS/mcl_copper/nodes.lua +++ b/mods/ITEMS/mcl_copper/nodes.lua @@ -1,5 +1,191 @@ local S = minetest.get_translator("mcl_copper") +local function set_description(descs, s_index, n_index) + local description + + if type(descs[s_index][n_index]) == "string" then + description = S(descs[s_index][n_index]) + elseif type(descs[s_index][n_index]) == "table" then + description = S("@1 "..descs[s_index][n_index][2], S(descs[s_index][n_index][1])) + else + return nil + end + + return description +end + +local function set_drop(drop, old_name, index_name) + if drop and old_name and index_name then + drop = "mcl_copper:"..old_name:gsub(index_name, drop) + end + + return drop +end + +local function set_groups(name, groups) + local groups = table.copy(groups) + + if name and groups then + if name:find("waxed") then + groups.waxed = 1 + elseif not name:find("oxidized") then + groups.oxidizable = 1 + end + + if name:find("door") then + groups.building_block = 0 + groups.mesecon_effector_on = 1 + end + else + return nil + end + + return groups +end + +local function set_light_level(light_source, index) + local ceil, floor_5, floor_7 = math.ceil(index / 2), math.floor(index / 5), math.floor(index / 7) + if light_source then + light_source = light_source - 3 * (ceil - 1) - floor_5 - floor_7 + end + + return light_source +end + +local function set_tiles(tiles, index) + if not tiles or not index then + return + end + + return tiles[math.ceil(index / 2)] +end + +function mcl_copper.register_copper_variants(name, definitions) + local names, oxidized_variant, stripped_variant, waxed_variant + + if name ~= "cut" then + names = { + name, "waxed_"..name, + name.."_exposed", "waxed_"..name.."_exposed", + name.."_weathered", "waxed_"..name.."_weathered", + name.."_oxidized", "waxed_"..name.."_oxidized" + } + else + names = { + "block_"..name, "waxed_block_"..name, + "block_exposed_"..name, "waxed_block_exposed_"..name, + "block_weathered_"..name, "waxed_block_weathered_"..name, + "block_oxidized_"..name, "waxed_block_oxidized_"..name + } + end + + local tiles = { + "mcl_copper_"..name..".png", + "mcl_copper_"..name.."_exposed.png", + "mcl_copper_"..name.."_weathered.png", + "mcl_copper_"..name.."_oxidized.png" + } + + for i = 1, #names do + if names[i]:find("waxed") then + stripped_variant = "mcl_copper:"..names[i-1] + else + if not names[i]:find("oxidized") then + oxidized_variant = "mcl_copper:"..names[i+2] + end + if i ~= 1 then + stripped_variant = "mcl_copper:"..names[i-2] + end + waxed_variant = "mcl_copper:"..names[i+1] + end + + minetest.register_node("mcl_copper:"..names[i], { + description = set_description(mcl_copper.copper_descs, name, i), + drawtype = definitions.drawtype or "normal", + drop = set_drop(definitions.drop, names[i], name), + groups = set_groups(names[i], definitions.groups), + is_ground_content = false, + light_source = set_light_level(definitions.light_source, i), + mesecons = definitions.mesecons, + paramtype = definitions.paramtype or "none", + paramtype2 = definitions.paramtype2 or "none", + sounds = mcl_sounds.node_sound_metal_defaults(), + sunlight_propagates = definitions.sunlight_propagates or false, + tiles = {set_tiles(tiles, i)}, + _doc_items_longdesc = S(mcl_copper.copper_longdescs[name][math.ceil(i/2)]), + _mcl_blast_resistance = 6, + _mcl_hardness = 3, + _mcl_oxidized_variant = oxidized_variant, + _mcl_stripped_variant = stripped_variant, + _mcl_waxed_variant = waxed_variant, + }) + + if definitions._mcl_stairs then + local subname = mcl_copper.stairs_subnames[name][i] + + mcl_stairs.register_slab(subname, "mcl_copper:"..names[i], set_groups(subname, definitions.groups), + {set_tiles(tiles, i), set_tiles(tiles, i), set_tiles(tiles, i)}, + set_description(mcl_copper.stairs_descs, subname, 1), nil, nil, nil, + set_description(mcl_copper.stairs_descs, subname, 2) + ) + + mcl_stairs.register_stair(subname, "mcl_copper:"..names[i], set_groups(subname, definitions.groups), + {set_tiles(tiles, i), set_tiles(tiles, i), set_tiles(tiles, i), + set_tiles(tiles, i), set_tiles(tiles, i), set_tiles(tiles, i)}, + set_description(mcl_copper.stairs_descs, subname, 3), nil, nil, nil, "woodlike" + ) + end + + if definitions._mcl_doors then + local itemimg, lowertext, uppertext, frontimg, sideimg + local door_groups = set_groups(names[i]:gsub(name, "door"), definitions.groups) + local trapdoor_groups = set_groups(names[i]:gsub(name, "trapdoor"), definitions.groups) + + if i % 2 == 1 then + itemimg = "mcl_copper_item_"..names[i]:gsub(name, "door")..".png" + lowertext = "mcl_copper_"..names[i]:gsub(name, "door").."_lower.png" + uppertext = "mcl_copper_"..names[i]:gsub(name, "door").."_upper.png" + frontimg = "mcl_copper_"..names[i]:gsub(name, "trapdoor")..".png" + sideimg = "mcl_copper_"..names[i]:gsub(name, "trapdoor").."_side.png" + else + itemimg = "mcl_copper_item_"..names[i-1]:gsub(name, "door")..".png" + lowertext = "mcl_copper_"..names[i-1]:gsub(name, "door").."_lower.png" + uppertext = "mcl_copper_"..names[i-1]:gsub(name, "door").."_upper.png" + frontimg = "mcl_copper_"..names[i-1]:gsub(name, "trapdoor")..".png" + sideimg = "mcl_copper_"..names[i-1]:gsub(name, "trapdoor").."_side.png" + end + + mcl_doors:register_door("mcl_copper:"..names[i]:gsub(name, "door"), { + description = S(mcl_copper.doors_descs[i][1]), + groups = door_groups, + inventory_image = itemimg, + only_redstone_can_open = false, + sounds = mcl_sounds.node_sound_metal_defaults(), + sound_close = "doors_steel_door_close", + sound_open = "doors_steel_door_open", + tiles_bottom = lowertext, + tiles_top = uppertext, + _mcl_blast_resistance = 3, + _mcl_hardness = 3 + }) + + mcl_doors:register_trapdoor("mcl_copper:"..names[i]:gsub(name, "trapdoor"), { + description = S(mcl_copper.doors_descs[i][2]), + groups = trapdoor_groups, + only_redstone_can_open = false, + sounds = mcl_sounds.node_sound_metal_defaults(), + sound_close = "doors_steel_door_close", + sound_open = "doors_steel_door_open", + tile_front = frontimg, + tile_side = sideimg, + wield_image = frontimg, + _mcl_blast_resistance = 3, + _mcl_hardness = 3 + }) + end + end +end + minetest.register_node("mcl_copper:stone_with_copper", { description = S("Copper Ore"), _doc_items_longdesc = S("Some copper contained in stone, it is pretty common and can be found below sea level."), @@ -17,326 +203,82 @@ minetest.register_node("mcl_copper:stone_with_copper", { minetest.register_node("mcl_copper:block_raw", { description = S("Block of Raw Copper"), _doc_items_longdesc = S("A block used for compact raw copper storage."), - tiles = {"mcl_copper_block_raw.png"}, + tiles = {"mcl_copper_raw_block.png"}, is_ground_content = false, - groups = {pickaxey = 2, building_block = 1, blast_furnace_smeltable = 1 }, + groups = {pickaxey = 2, building_block = 1, blast_furnace_smeltable = 1}, sounds = mcl_sounds.node_sound_metal_defaults(), _mcl_blast_resistance = 6, _mcl_hardness = 5, }) -minetest.register_node("mcl_copper:block", { - description = S("Block of Copper"), - _doc_items_longdesc = S("A block of copper is mostly a decorative block."), - tiles = {"mcl_copper_block.png"}, - is_ground_content = false, - groups = {pickaxey = 2, building_block = 1, oxidizable = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 3, - _mcl_oxidized_variant = "mcl_copper:block_exposed", - _mcl_waxed_variant = "mcl_copper:waxed_block", -}) - -minetest.register_node("mcl_copper:waxed_block", { - description = S("Waxed Block of Copper"), - _doc_items_longdesc = S("A block of copper is mostly a decorative block."), - tiles = {"mcl_copper_block.png"}, - is_ground_content = false, - groups = {pickaxey = 2, building_block = 1, waxed = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 3, - _mcl_stripped_variant = "mcl_copper:block", -}) - -minetest.register_node("mcl_copper:block_exposed", { - description = S("Exposed Copper"), - _doc_items_longdesc = S("Exposed copper is a decorative block."), - tiles = {"mcl_copper_exposed.png"}, - is_ground_content = false, - groups = {pickaxey = 2, building_block = 1, oxidizable = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 5, - _mcl_oxidized_variant = "mcl_copper:block_weathered", - _mcl_waxed_variant = "mcl_copper:waxed_block_exposed", - _mcl_stripped_variant = "mcl_copper:block", -}) - -minetest.register_node("mcl_copper:waxed_block_exposed", { - description = S("Waxed Exposed Copper"), - _doc_items_longdesc = S("Exposed copper is a decorative block."), - tiles = {"mcl_copper_exposed.png"}, - is_ground_content = false, - groups = {pickaxey = 2, building_block = 1, waxed = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 5, - _mcl_stripped_variant = "mcl_copper:block_exposed", -}) - -minetest.register_node("mcl_copper:block_weathered", { - description = S("Weathered Copper"), - _doc_items_longdesc = S("Weathered copper is a decorative block."), - tiles = {"mcl_copper_weathered.png"}, - is_ground_content = false, - groups = {pickaxey = 2, building_block = 1, oxidizable = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 5, - _mcl_oxidized_variant = "mcl_copper:block_oxidized", - _mcl_waxed_variant = "mcl_copper:waxed_block_weathered", - _mcl_stripped_variant = "mcl_copper:block_exposed", -}) - -minetest.register_node("mcl_copper:waxed_block_weathered", { - description = S("Waxed Weathered Copper"), - _doc_items_longdesc = S("Weathered copper is a decorative block."), - tiles = {"mcl_copper_weathered.png"}, - is_ground_content = false, - groups = {pickaxey = 2, building_block = 1, waxed = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 5, - _mcl_stripped_variant = "mcl_copper:block_weathered", -}) - -minetest.register_node("mcl_copper:block_oxidized", { - description = S("Oxidized Copper"), - _doc_items_longdesc = S("Oxidized copper is a decorative block."), - tiles = {"mcl_copper_oxidized.png"}, - is_ground_content = false, +mcl_copper.register_copper_variants("block", { groups = {pickaxey = 2, building_block = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 5, - _mcl_waxed_variant = "mcl_copper:waxed_block_oxidized", - _mcl_stripped_variant = "mcl_copper:block_weathered", + _mcl_doors = true, }) -minetest.register_node("mcl_copper:waxed_block_oxidized", { - description = S("Waxed Oxidized Copper"), - _doc_items_longdesc = S("Oxidized copper is a decorative block."), - tiles = {"mcl_copper_oxidized.png"}, - is_ground_content = false, - groups = {pickaxey = 2, building_block = 1, waxed = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 5, - _mcl_stripped_variant = "mcl_copper:block_oxidized", -}) - -minetest.register_node("mcl_copper:block_cut", { - description = S("Cut Copper"), - _doc_items_longdesc = S("Cut copper is a decorative block."), - tiles = {"mcl_copper_block_cut.png"}, - is_ground_content = false, - groups = {pickaxey = 2, building_block = 1, oxidizable = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 5, - _mcl_oxidized_variant = "mcl_copper:block_exposed_cut", - _mcl_waxed_variant = "mcl_copper:waxed_block_cut", -}) - -minetest.register_node("mcl_copper:waxed_block_cut", { - description = S("Waxed Cut Copper"), - _doc_items_longdesc = S("Cut copper is a decorative block."), - tiles = {"mcl_copper_block_cut.png"}, - is_ground_content = false, - groups = {pickaxey = 2, building_block = 1, waxed = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 5, - _mcl_stripped_variant = "mcl_copper:block_cut", -}) - -minetest.register_node("mcl_copper:block_exposed_cut", { - description = S("Exposed Cut Copper"), - _doc_items_longdesc = S("Exposed cut copper is a decorative block."), - tiles = {"mcl_copper_exposed_cut.png"}, - is_ground_content = false, - groups = {pickaxey = 2, building_block = 1, oxidizable = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 5, - _mcl_waxed_variant = "mcl_copper:waxed_block_exposed_cut", - _mcl_oxidized_variant = "mcl_copper:block_weathered_cut", - _mcl_stripped_variant = "mcl_copper:block_cut", -}) - -minetest.register_node("mcl_copper:waxed_block_exposed_cut", { - description = S("Waxed Exposed Cut Copper"), - _doc_items_longdesc = S("Exposed cut copper is a decorative block."), - tiles = {"mcl_copper_exposed_cut.png"}, - is_ground_content = false, - groups = {pickaxey = 2, building_block = 1, waxed = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 5, - _mcl_stripped_variant = "mcl_copper:block_exposed_cut", -}) - -minetest.register_node("mcl_copper:block_weathered_cut", { - description = S("Weathered Cut Copper"), - _doc_items_longdesc = S("Weathered cut copper is a decorative block."), - tiles = {"mcl_copper_weathered_cut.png"}, - is_ground_content = false, - groups = {pickaxey = 2, building_block = 1, oxidizable = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 5, - _mcl_stripped_variant = "mcl_copper:block_exposed_cut", - _mcl_oxidized_variant = "mcl_copper:block_oxidized_cut", - _mcl_waxed_variant = "mcl_copper:waxed_block_weathered_cut", -}) - -minetest.register_node("mcl_copper:waxed_block_weathered_cut", { - description = S("Waxed Weathered Cut Copper"), - _doc_items_longdesc = S("Weathered cut copper is a decorative block."), - tiles = {"mcl_copper_weathered_cut.png"}, - is_ground_content = false, - groups = {pickaxey = 2, building_block = 1, waxed = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 5, - _mcl_stripped_variant = "mcl_copper:block_weathered_cut", -}) - -minetest.register_node("mcl_copper:block_oxidized_cut", { - description = S("Oxidized Cut Copper"), - _doc_items_longdesc = S("Oxidized cut copper is a decorative block."), - tiles = {"mcl_copper_oxidized_cut.png"}, - is_ground_content = false, +mcl_copper.register_copper_variants("cut", { groups = {pickaxey = 2, building_block = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 5, - _mcl_stripped_variant = "mcl_copper:block_weathered_cut", - _mcl_waxed_variant = "mcl_copper:waxed_block_oxidized_cut", + _mcl_stairs = true, +}) +--[[ +mcl_copper.register_copper_variants("grate", { + drawtype = "allfaces", + groups = {pickaxey = 2, building_block = 1, disable_suffocation = 1}, + sunlight_propagates = true, }) -minetest.register_node("mcl_copper:waxed_block_oxidized_cut", { - description = S("Waxed Oxidized Cut Copper"), - _doc_items_longdesc = S("Oxidized cut copper is a decorative block."), - tiles = {"mcl_copper_oxidized_cut.png"}, - is_ground_content = false, - groups = {pickaxey = 2, building_block = 1, waxed = 1}, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 5, - _mcl_stripped_variant = "mcl_copper:block_oxidized_cut", +mcl_copper.register_copper_variants("chiseled", { + groups = {pickaxey = 2, building_block = 1} }) -mcl_stairs.register_slab("copper_cut", "mcl_copper:block_cut", - {pickaxey = 2, oxidizable = 1}, - {"mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png"}, - S("Slab of Cut Copper"), - nil, nil, nil, - S("Double Slab of Cut Copper")) +mcl_copper.register_copper_variants("bulb_off", { + groups = {pickaxey = 2, building_block = 1}, + mesecons = { + effector = { + action_on = function (pos, node) + minetest.swap_node(pos, {name = node.name:gsub("bulb_off", "bulb_powered_on")}) + end + }, + }, +}) -mcl_stairs.register_slab("waxed_copper_cut", "mcl_copper:waxed_block_cut", - {pickaxey = 2, waxed = 1}, - {"mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png"}, - S("Waxed Slab of Cut Copper"), - nil, nil, nil, - S("Waxed Double Slab of Cut Copper")) +mcl_copper.register_copper_variants("bulb_on", { + drop = "bulb_off", + groups = {pickaxey = 2, building_block = 1, not_in_creative_inventory = 1}, + light_source = 14, + mesecons = { + effector = { + action_on = function (pos, node) + minetest.swap_node(pos, {name = node.name:gsub("bulb_on", "bulb_powered_off")}) + end + }, + }, + paramtype = "light" +}) -mcl_stairs.register_slab("copper_exposed_cut", "mcl_copper:block_exposed_cut", - {pickaxey = 2, oxidizable = 1}, - {"mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png"}, - S("Slab of Exposed Cut Copper"), - nil, nil, nil, - S("Double Slab of Exposed Cut Copper")) +mcl_copper.register_copper_variants("bulb_powered_off", { + drop = "bulb_off", + groups = {pickaxey = 2, building_block = 1, not_in_creative_inventory = 1}, + mesecons = { + effector = { + action_off = function (pos, node) + minetest.swap_node(pos, {name = node.name:gsub("bulb_powered_off", "bulb_off")}) + end + } + } +}) -mcl_stairs.register_slab("waxed_copper_exposed_cut", "mcl_copper:waxed_block_exposed_cut", - {pickaxey = 2, waxed = 1}, - {"mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png"}, - S("Waxed Slab of Exposed Cut Copper"), - nil, nil, nil, - S("Waxed Double Slab of Exposed Cut Copper")) - -mcl_stairs.register_slab("copper_weathered_cut", "mcl_copper:block_weathered_cut", - {pickaxey = 2, oxidizable = 1}, - {"mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png"}, - S("Slab of Weathered Cut Copper"), - nil, nil, nil, - S("Double Slab of Weathered Cut Copper")) - -mcl_stairs.register_slab("waxed_copper_weathered_cut", "mcl_copper:waxed_block_weathered_cut", - {pickaxey = 2, waxed = 1}, - {"mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png"}, - S("Waxed Slab of Weathered Cut Copper"), - nil, nil, nil, - S("Waxed Double Slab of Weathered Cut Copper")) - -mcl_stairs.register_slab("copper_oxidized_cut", "mcl_copper:block_oxidized_cut", - {pickaxey = 2}, - {"mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png"}, - S("Slab of Oxidized Cut Copper"), - nil, nil, nil, - S("Double Slab of Oxidized Cut Copper")) - -mcl_stairs.register_slab("waxed_copper_oxidized_cut", "mcl_copper:waxed_block_oxidized_cut", - {pickaxey = 2, waxed = 1}, - {"mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png"}, - S("Waxed Slab of Oxidized Cut Copper"), - nil, nil, nil, - S("Waxed Double Slab of Oxidized Cut Copper")) - -mcl_stairs.register_stair("copper_cut", "mcl_copper:block_cut", - {pickaxey = 2, oxidizable = 1}, - {"mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png"}, - S("Stairs of Cut Copper"), - nil, 6, nil, - "woodlike") - -mcl_stairs.register_stair("waxed_copper_cut", "mcl_copper:waxed_block_cut", - {pickaxey = 2, waxed = 1}, - {"mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png"}, - S("Waxed Stairs of Cut Copper"), - nil, 6, nil, - "woodlike") - -mcl_stairs.register_stair("copper_exposed_cut", "mcl_copper:block_exposed_cut", - {pickaxey = 2, oxidizable = 1}, - {"mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png"}, - S("Stairs of Exposed Cut Copper"), - nil, 6, nil, - "woodlike") - -mcl_stairs.register_stair("waxed_copper_exposed_cut", "mcl_copper:waxed_block_exposed_cut", - {pickaxey = 2, waxed = 1}, - {"mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png"}, - S("Waxed Stairs of Exposed Cut Copper"), - nil, 6, nil, - "woodlike") - -mcl_stairs.register_stair("copper_weathered_cut", "mcl_copper:block_weathered_cut", - {pickaxey = 2, oxidizable = 1}, - {"mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png"}, - S("Stairs of Weathered Cut Copper"), - nil, 6, nil, - "woodlike") - -mcl_stairs.register_stair("waxed_copper_weathered_cut", "mcl_copper:waxed_block_weathered_cut", - {pickaxey = 2, waxed = 1}, - {"mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png"}, - S("Waxed Stairs of Weathered Cut Copper"), - nil, 6, nil, - "woodlike") - -mcl_stairs.register_stair("copper_oxidized_cut", "mcl_copper:block_oxidized_cut", - {pickaxey = 2}, - {"mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png"}, - S("Stairs of Oxidized Cut Copper"), - nil, 6, nil, - "woodlike") - -mcl_stairs.register_stair("waxed_copper_oxidized_cut", "mcl_copper:waxed_block_oxidized_cut", - {pickaxey = 2, waxed = 1}, - {"mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png"}, - S("Waxed Stairs of Oxidized Cut Copper"), - nil, 6, nil, - "woodlike") +mcl_copper.register_copper_variants("bulb_powered_on", { + drop = "bulb_off", + groups = {pickaxey = 2, building_block = 1, not_in_creative_inventory = 1}, + light_source = 14, + mesecons = { + effector = { + action_off = function (pos, node) + minetest.swap_node(pos, {name = node.name:gsub("bulb_powered_on", "bulb_on")}) + end + } + }, + paramtype = "light" +}) +]] diff --git a/mods/ITEMS/mcl_honey/init.lua b/mods/ITEMS/mcl_honey/init.lua index a870e7c08..38ef3254f 100644 --- a/mods/ITEMS/mcl_honey/init.lua +++ b/mods/ITEMS/mcl_honey/init.lua @@ -8,22 +8,35 @@ local S = minetest.get_translator(minetest.get_current_modname()) local alldirs = { { x = 0, y = 0, z = 1 }, { x = 1, y = 0, z = 0 }, { x = 0, y = 0, z = -1 }, { x = -1, y = 0, z = 0 }, { x = 0, y = -1, z = 0 }, { x = 0, y = 1, z = 0 } } -- Waxing Function -function mcl_honey.wax_block(pos, node, player, itemstack) +function mcl_honey.wax_block(pos, node, player, itemstack, pointed_thing) -- prevent modification of protected nodes. if mcl_util.check_position_protection(pos, player) then return end local def = minetest.registered_nodes[node.name] - - if def and def._mcl_waxed_variant then - node.name = def._mcl_waxed_variant + if player:get_player_control().sneak then + if def and def._mcl_waxed_variant then + if def.groups.door == 1 then + if node.name:find("_b_") then + local top_pos = { x = pos.x, y = pos.y + 1, z = pos.z } + minetest.swap_node(top_pos, { name = def._mcl_waxed_variant:gsub("_b_", "_t_"), param2 = node.param2 }) + elseif node.name:find("_t_") then + local bot_pos = { x = pos.x, y = pos.y - 1, z = pos.z } + minetest.swap_node(bot_pos, { name = def._mcl_waxed_variant:gsub("_t_", "_b_"), param2 = node.param2 }) + end + end + else + return + end else - return + if def and def.on_rightclick then + return def.on_rightclick(pos, node, player, itemstack, pointed_thing) + end end node.name = def._mcl_waxed_variant - minetest.set_node(pos, node) + minetest.swap_node(pos, node) awards.unlock(player:get_player_name(), "mcl:wax_on") if not minetest.is_creative_enabled(player:get_player_name()) then itemstack:take_item() @@ -46,7 +59,7 @@ minetest.register_craftitem("mcl_honey:honeycomb", { local pos = pointed_thing.under -- wax the block. This is the only viable usage of honeycomb's on_place. If it "fails" to wax, then nothing is changed. - return mcl_honey.wax_block(pos, node, placer, itemstack) + return mcl_honey.wax_block(pos, node, placer, itemstack, pointed_thing) end, }) diff --git a/mods/ITEMS/mcl_tools/init.lua b/mods/ITEMS/mcl_tools/init.lua index 6282da5c3..a4f5c45ca 100644 --- a/mods/ITEMS/mcl_tools/init.lua +++ b/mods/ITEMS/mcl_tools/init.lua @@ -410,6 +410,16 @@ local function make_stripped_trunk(itemstack, placer, pointed_thing) if noddef._mcl_stripped_variant == nil then return itemstack else + if noddef.groups.door == 1 then + local pt_under = pointed_thing.under + if node_name:find("_b_") then + local top_pos = {x = pt_under.x, y = pt_under.y + 1, z = pt_under.z} + minetest.swap_node(top_pos, {name=noddef._mcl_stripped_variant:gsub("_b_", "_t_"), param2=node.param2}) + elseif node_name:find("_t_") then + local bot_pos = {x = pt_under.x, y = pt_under.y - 1, z = pt_under.z} + minetest.swap_node(bot_pos, {name=noddef._mcl_stripped_variant:gsub("_t_", "_b_"), param2=node.param2}) + end + end minetest.swap_node(pointed_thing.under, {name=noddef._mcl_stripped_variant, param2=node.param2}) if minetest.get_item_group(node_name, "waxed") ~= 0 then awards.unlock(placer:get_player_name(), "mcl:wax_off") From c893a6ef90caa22e8b22a4245116aae2f996787a Mon Sep 17 00:00:00 2001 From: JoseDouglas26 Date: Fri, 3 May 2024 13:40:35 -0300 Subject: [PATCH 02/13] Add descriptions.lua --- mods/ITEMS/mcl_copper/descriptions.lua | 152 +++++++++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 mods/ITEMS/mcl_copper/descriptions.lua diff --git a/mods/ITEMS/mcl_copper/descriptions.lua b/mods/ITEMS/mcl_copper/descriptions.lua new file mode 100644 index 000000000..f1d9f568f --- /dev/null +++ b/mods/ITEMS/mcl_copper/descriptions.lua @@ -0,0 +1,152 @@ +local lit_desc = "(Lit)" +local pow_desc = "(Powered)" +local mix_desc = "(Lit and Powered)" + +mcl_copper.copper_descs = { + ["block"] = { + "Block of Copper", "Waxed Block of Copper", + "Exposed Copper", "Waxed Exposed Copper", + "Weathered Copper", "Waxed Weathered Copper", + "Oxidized Copper", "Waxed Oxidized Copper" + }, + ["cut"] = { + "Cut Copper", "Waxed Cut Copper", + "Exposed Cut Copper", "Waxed Exposed Cut Copper", + "Weathered Cut Copper", "Waxed Weathered Cut Copper", + "Oxidized Cut Copper", "Waxed Oxidized Cut Copper" + }, + ["grate"] = { + "Copper Grate", "Waxed Copper Grate", + "Exposed Copper Grate", "Waxed Exposed Copper Grate", + "Weathered Copper Grate", "Waxed Weathered Copper Grate", + "Oxidized Copper Grate", "Waxed Oxidized Copper Grate" + }, + ["chiseled"] = { + "Chiseled Copper", "Waxed Chiseled Copper", + "Exposed Chiseled Copper", "Waxed Exposed Chiseled Copper", + "Weathered Chiseled Copper", "Waxed Weathered Chiseled Copper", + "Oxidized Chiseled Copper", "Waxed Oxidized Chiseled Copper" + }, + ["bulb_off"] = { + "Copper Bulb", "Waxed Copper Bulb", + "Exposed Copper Bulb", "Waxed Exposed Copper Bulb", + "Weathered Copper Bulb", "Waxed Weathered Copper Bulb", + "Oxidized Copper Bulb", "Waxed Oxidized Copper Bulb" + }, + ["bulb_on"] = { + {"Copper Bulb", lit_desc}, {"Waxed Copper Bulb", lit_desc}, + {"Exposed Copper Bulb", lit_desc}, {"Waxed Exposed Copper Bulb", lit_desc}, + {"Weathered Copper Bulb", lit_desc}, {"Waxed Weathered Copper Bulb", lit_desc}, + {"Oxidized Copper Bulb", lit_desc}, {"Waxed Oxidized Copper Bulb", lit_desc} + }, + ["bulb_powered_off"] = { + {"Copper Bulb", pow_desc}, {"Waxed Copper Bulb", pow_desc}, + {"Exposed Copper Bulb", pow_desc}, {"Waxed Exposed Copper Bulb", pow_desc}, + {"Weathered Copper Bulb", pow_desc}, {"Waxed Weathered Copper Bulb", pow_desc}, + {"Oxidized Copper Bulb", pow_desc}, {"Waxed Oxidized Copper Bulb", pow_desc} + }, + ["bulb_powered_on"] = { + {"Copper Bulb", mix_desc}, {"Waxed Copper Bulb", mix_desc}, + {"Exposed Copper Bulb", mix_desc}, {"Waxed Exposed Copper Bulb", mix_desc}, + {"Weathered Copper Bulb", mix_desc}, {"Waxed Weathered Copper Bulb", mix_desc}, + {"Oxidized Copper Bulb", mix_desc}, {"Waxed Oxidized Copper Bulb", mix_desc} + } +} + +mcl_copper.copper_longdescs = { + ["block"] = { + "A block of copper is mostly a decorative block.", + "Exposed copper is a decorative block.", + "Weathered copper is a decorative block.", + "Oxidized copper is a decorative block." + }, + ["cut"] = { + "Cut copper is a decorative block.", + "Exposed cut copper is a decorative block.", + "Weathered cut copper is a decorative block.", + "Oxidized cut copper is a decorative block." + }, + ["grate"] = { + "Copper grate is a decorative block.", + "Exposed copper grate is a decorative block.", + "Weathered copper grate is a decorative block.", + "Oxidized copper grate is a decorative block." + }, + ["chiseled"] = { + "Chiseled copper is a decorative block.", + "Exposed chiseled copper is a decorative block.", + "Weathered chiseled copper is a decorative block.", + "Oxidized chiseled copper is a decorative block." + }, + ["bulb_off"] = { + "Copper bulb is a decorative block and a light source when lited.", + "Exposed copper bulb is a decorative block and a light source when lited.", + "Weathered copper bulb is a decorative block and a light source when lited.", + "Oxidized copper bulb is a decorative block and a light source when lited." + }, + ["bulb_on"] = { + "Copper bulb is a decorative block and a light source.", + "Exposed copper bulb is a decorative block and a light source.", + "Weathered copper bulb is a decorative block and a light source.", + "Oxidized copper bulb is a decorative block and a light source." + }, + ["bulb_powered_off"] = { + "Copper bulb is a decorative block and a light source when lited.", + "Exposed copper bulb is a decorative block and a light source when lited.", + "Weathered copper bulb is a decorative block and a light source when lited.", + "Oxidized copper bulb is a decorative block and a light source when lited." + }, + ["bulb_powered_on"] = { + "Copper bulb is a decorative block and a light source.", + "Exposed copper bulb is a decorative block and a light source.", + "Weathered copper bulb is a decorative block and a light source.", + "Oxidized copper bulb is a decorative block and a light source." + } +} + +mcl_copper.stairs_subnames = { + ["cut"] = { + "copper_cut", "waxed_copper_cut", + "copper_exposed_cut", "waxed_copper_exposed_cut", + "copper_weathered_cut", "waxed_copper_weathered_cut", + "copper_oxidized_cut", "waxed_copper_oxidized_cut" + } +} + +mcl_copper.stairs_descs = { + ["copper_cut"] = { + "Slab of Cut Copper", "Double Slab of Cut Copper", "Stairs of Cut Copper", + }, + ["waxed_copper_cut"] = { + "Waxed Slab of Cut Copper", "Waxed Double Slab of Cut Copper", "Waxed Stairs of Cut Copper", + }, + ["copper_exposed_cut"] = { + "Slab of Exposed Cut Copper", "Double Slab of Exposed Cut Copper", "Stairs of Exposed Cut Copper" + }, + ["waxed_copper_exposed_cut"] = { + "Waxed Slab of Exposed Cut Copper", "Waxed Double Slab of Exposed Cut Copper", "Waxed Stairs of Exposed Cut Copper" + }, + ["copper_weathered_cut"] = { + "Slab of Weathered Cut Copper", "Double Slab of Weathered Cut Copper", "Stairs of Weathered Cut Copper" + }, + ["waxed_copper_weathered_cut"] = { + "Waxed Slab of Weathered Cut Copper", "Waxed Double Slab of Weathered Cut Copper", "Waxed Stairs of Weathered Cut Copper" + }, + ["copper_oxidized_cut"] = { + "Slab of Oxidized Cut Copper", "Double Slab of Oxidized Cut Copper", "Stairs of Oxidized Cut Copper" + }, + ["waxed_copper_oxidized_cut"] = { + "Waxed Slab of Oxidized Cut Copper", "Waxed Double Slab of Oxidized Cut Copper", "Waxed Stairs of Oxidized Cut Copper" + } +} + +mcl_copper.doors_descs = { + {"Copper Door", "Copper Trapdoor"}, + {"Waxed Copper Door", "Waxed Copper Trapdoor"}, + {"Exposed Copper Door", "Exposed Copper Trapdoor"}, + {"Waxed Exposed Copper Door", "Waxed Exposed Copper Trapdoor"}, + {"Weathered Copper Door", "Weathered Copper Trapdoor"}, + {"Waxed Weathered Copper Door", "Waxed Weathered Copper Trapdoor"}, + {"Oxidized Copper Door", "Oxidized Copper Trapdoor"}, + {"Waxed Oxidized Copper Door", "Waxed Oxidized Copper Trapdoor"} +} From a104e4096a9c4efceb65c6a74d13dec3a5eb302a Mon Sep 17 00:00:00 2001 From: JoseDouglas26 Date: Sat, 4 May 2024 09:50:38 -0300 Subject: [PATCH 03/13] New recipes for copper door and copper trapdoor --- mods/ITEMS/mcl_copper/crafting.lua | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/mods/ITEMS/mcl_copper/crafting.lua b/mods/ITEMS/mcl_copper/crafting.lua index ec13fa429..66ea1d572 100644 --- a/mods/ITEMS/mcl_copper/crafting.lua +++ b/mods/ITEMS/mcl_copper/crafting.lua @@ -33,17 +33,6 @@ local function get_shape(name, material) {material}, {material}, } - elseif name == "door" then - return { - {material, material}, - {material, material}, - {material, material} - } - elseif name == "trapdoor" then - return { - {material, material, material}, - {material, material, material} - } elseif name == "bulb_off" then return { {"", material, ""}, @@ -202,3 +191,20 @@ minetest.register_craft({ recipe = "mcl_copper:block_raw", cooktime = 90, }) + +minetest.register_craft({ + output = "mcl_copper:door 3", + recipe = { + {"mcl_copper:copper_ingot", "mcl_copper:copper_ingot"}, + {"mcl_copper:copper_ingot", "mcl_copper:copper_ingot"}, + {"mcl_copper:copper_ingot", "mcl_copper:copper_ingot"} + } +}) + +minetest.register_craft({ + output = "mcl_copper:trapdoor 2", + recipe = { + {"mcl_copper:copper_ingot", "mcl_copper:copper_ingot", "mcl_copper:copper_ingot"}, + {"mcl_copper:copper_ingot", "mcl_copper:copper_ingot", "mcl_copper:copper_ingot"} + } +}) From 17a97878423c18ca706da29f9dd104e8399a53ae Mon Sep 17 00:00:00 2001 From: JoseDouglas26 Date: Sat, 4 May 2024 14:46:40 -0300 Subject: [PATCH 04/13] Bug fixes with recipes and some nodes --- mods/ITEMS/mcl_copper/crafting.lua | 8 +++----- mods/ITEMS/mcl_copper/nodes.lua | 23 ++++++++++++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/mods/ITEMS/mcl_copper/crafting.lua b/mods/ITEMS/mcl_copper/crafting.lua index 66ea1d572..dadab82d3 100644 --- a/mods/ITEMS/mcl_copper/crafting.lua +++ b/mods/ITEMS/mcl_copper/crafting.lua @@ -90,8 +90,6 @@ end mcl_copper.register_variants_recipes("cut", "block", 4) mcl_copper.register_variants_recipes("grate", "block", 4) -mcl_copper.register_variants_recipes("door", "block", 3) -mcl_copper.register_variants_recipes("trapdoor", "block", 2) mcl_copper.register_variants_recipes("bulb_off", "block", 4) local chiseled_materials = { @@ -152,9 +150,9 @@ local cuttable_blocks = { for _, c in ipairs(cuttable_blocks) do mcl_stonecutter.register_recipe("mcl_copper:"..c, "mcl_copper:"..c.."_cut", 4) - mcl_stonecutter.register_recipe("mcl_copper:"..c, "mcl_copper:"..c:gsub("block", "grate"), 4) - mcl_stonecutter.register_recipe("mcl_copper:"..c, "mcl_copper:"..c:gsub("block", "chiseled"), 4) - mcl_stonecutter.register_recipe("mcl_copper:"..c.."_cut", "mcl_copper:"..c:gsub("block", "chiseled")) + --mcl_stonecutter.register_recipe("mcl_copper:"..c, "mcl_copper:"..c:gsub("block", "grate"), 4) + --mcl_stonecutter.register_recipe("mcl_copper:"..c, "mcl_copper:"..c:gsub("block", "chiseled"), 4) + --mcl_stonecutter.register_recipe("mcl_copper:"..c.."_cut", "mcl_copper:"..c:gsub("block", "chiseled")) end minetest.register_craft({ diff --git a/mods/ITEMS/mcl_copper/nodes.lua b/mods/ITEMS/mcl_copper/nodes.lua index b8a5c218c..f89ae57c7 100644 --- a/mods/ITEMS/mcl_copper/nodes.lua +++ b/mods/ITEMS/mcl_copper/nodes.lua @@ -61,7 +61,7 @@ local function set_tiles(tiles, index) end function mcl_copper.register_copper_variants(name, definitions) - local names, oxidized_variant, stripped_variant, waxed_variant + local names, oxidized_variant, stripped_variant, waxed_variant, tiles if name ~= "cut" then names = { @@ -79,12 +79,21 @@ function mcl_copper.register_copper_variants(name, definitions) } end - local tiles = { - "mcl_copper_"..name..".png", - "mcl_copper_"..name.."_exposed.png", - "mcl_copper_"..name.."_weathered.png", - "mcl_copper_"..name.."_oxidized.png" - } + if name == "block" then + tiles = { + "mcl_copper_block.png", + "mcl_copper_exposed.png", + "mcl_copper_weathered.png", + "mcl_copper_oxidized.png" + } + else + tiles = { + "mcl_copper_block_"..name..".png", + "mcl_copper_exposed_"..name..".png", + "mcl_copper_weathered_"..name..".png", + "mcl_copper_oxidized_"..name..".png" + } + end for i = 1, #names do if names[i]:find("waxed") then From 16ce33e8d8dcb36886b1a1b118ea3c8436424887 Mon Sep 17 00:00:00 2001 From: JoseDouglas26 Date: Sun, 5 May 2024 06:25:36 -0300 Subject: [PATCH 05/13] Removal of global functions and bug fixes --- mods/ITEMS/mcl_copper/crafting.lua | 19 ++- mods/ITEMS/mcl_copper/descriptions.lua | 161 +++++++++++++------------ mods/ITEMS/mcl_copper/nodes.lua | 48 +++----- 3 files changed, 105 insertions(+), 123 deletions(-) diff --git a/mods/ITEMS/mcl_copper/crafting.lua b/mods/ITEMS/mcl_copper/crafting.lua index dadab82d3..628173e3f 100644 --- a/mods/ITEMS/mcl_copper/crafting.lua +++ b/mods/ITEMS/mcl_copper/crafting.lua @@ -44,9 +44,10 @@ local function get_shape(name, material) end end -function mcl_copper.register_variants_recipes(name, material, amount) +local function register_variants_recipes(name, material, amount) local names local materials = {} + if name ~= "cut" then names = { name, "waxed_"..name, @@ -70,14 +71,8 @@ function mcl_copper.register_variants_recipes(name, material, amount) "mcl_copper:"..material.."_weathered", "mcl_copper:waxed_"..material.."_weathered", "mcl_copper:"..material.."_oxidized", "mcl_copper:waxed_"..material.."_oxidized" } - elseif type(material) == "table" then - if #material == 8 then - materials = material - else - return - end else - return + materials = material end for i = 1, 8 do @@ -88,9 +83,9 @@ function mcl_copper.register_variants_recipes(name, material, amount) end end -mcl_copper.register_variants_recipes("cut", "block", 4) -mcl_copper.register_variants_recipes("grate", "block", 4) -mcl_copper.register_variants_recipes("bulb_off", "block", 4) +register_variants_recipes("cut", "block", 4) +register_variants_recipes("grate", "block", 4) +register_variants_recipes("bulb_off", "block", 4) local chiseled_materials = { "mcl_stairs:slab_copper_cut", @@ -103,7 +98,7 @@ local chiseled_materials = { "mcl_stairs:slab_waxed_copper_oxidized_cut" } -mcl_copper.register_variants_recipes("chiseled", chiseled_materials, 1) +register_variants_recipes("chiseled", chiseled_materials, 1) local waxable_blocks = { "block", diff --git a/mods/ITEMS/mcl_copper/descriptions.lua b/mods/ITEMS/mcl_copper/descriptions.lua index f1d9f568f..cca2aff9d 100644 --- a/mods/ITEMS/mcl_copper/descriptions.lua +++ b/mods/ITEMS/mcl_copper/descriptions.lua @@ -1,106 +1,107 @@ +local S = minetest.get_translator("mcl_copper") local lit_desc = "(Lit)" local pow_desc = "(Powered)" local mix_desc = "(Lit and Powered)" mcl_copper.copper_descs = { ["block"] = { - "Block of Copper", "Waxed Block of Copper", - "Exposed Copper", "Waxed Exposed Copper", - "Weathered Copper", "Waxed Weathered Copper", - "Oxidized Copper", "Waxed Oxidized Copper" + S("Block of Copper"), S("Waxed Block of Copper"), + S("Exposed Copper"), S("Waxed Exposed Copper"), + S("Weathered Copper"), S("Waxed Weathered Copper"), + S("Oxidized Copper"), S("Waxed Oxidized Copper") }, ["cut"] = { - "Cut Copper", "Waxed Cut Copper", - "Exposed Cut Copper", "Waxed Exposed Cut Copper", - "Weathered Cut Copper", "Waxed Weathered Cut Copper", - "Oxidized Cut Copper", "Waxed Oxidized Cut Copper" + S("Cut Copper"), S("Waxed Cut Copper"), + S("Exposed Cut Copper"), S("Waxed Exposed Cut Copper"), + S("Weathered Cut Copper"), S("Waxed Weathered Cut Copper"), + S("Oxidized Cut Copper"), S("Waxed Oxidized Cut Copper") }, ["grate"] = { - "Copper Grate", "Waxed Copper Grate", - "Exposed Copper Grate", "Waxed Exposed Copper Grate", - "Weathered Copper Grate", "Waxed Weathered Copper Grate", - "Oxidized Copper Grate", "Waxed Oxidized Copper Grate" + S("Copper Grate"), S("Waxed Copper Grate"), + S("Exposed Copper Grate"), S("Waxed Exposed Copper Grate"), + S("Weathered Copper Grate"), S("Waxed Weathered Copper Grate"), + S("Oxidized Copper Grate"), S("Waxed Oxidized Copper Grate") }, ["chiseled"] = { - "Chiseled Copper", "Waxed Chiseled Copper", - "Exposed Chiseled Copper", "Waxed Exposed Chiseled Copper", - "Weathered Chiseled Copper", "Waxed Weathered Chiseled Copper", - "Oxidized Chiseled Copper", "Waxed Oxidized Chiseled Copper" + S("Chiseled Copper"), S("Waxed Chiseled Copper"), + S("Exposed Chiseled Copper"), S("Waxed Exposed Chiseled Copper"), + S("Weathered Chiseled Copper"), S("Waxed Weathered Chiseled Copper"), + S("Oxidized Chiseled Copper"), S("Waxed Oxidized Chiseled Copper") }, ["bulb_off"] = { - "Copper Bulb", "Waxed Copper Bulb", - "Exposed Copper Bulb", "Waxed Exposed Copper Bulb", - "Weathered Copper Bulb", "Waxed Weathered Copper Bulb", - "Oxidized Copper Bulb", "Waxed Oxidized Copper Bulb" + S("Copper Bulb"), S("Waxed Copper Bulb"), + S("Exposed Copper Bulb"), S("Waxed Exposed Copper Bulb"), + S("Weathered Copper Bulb"), S("Waxed Weathered Copper Bulb"), + S("Oxidized Copper Bulb"), S("Waxed Oxidized Copper Bulb") }, ["bulb_on"] = { - {"Copper Bulb", lit_desc}, {"Waxed Copper Bulb", lit_desc}, - {"Exposed Copper Bulb", lit_desc}, {"Waxed Exposed Copper Bulb", lit_desc}, - {"Weathered Copper Bulb", lit_desc}, {"Waxed Weathered Copper Bulb", lit_desc}, - {"Oxidized Copper Bulb", lit_desc}, {"Waxed Oxidized Copper Bulb", lit_desc} + S("Copper Bulb "..lit_desc), S("Waxed Copper Bulb "..lit_desc), + S("Exposed Copper Bulb "..lit_desc), S("Waxed Exposed Copper Bulb "..lit_desc), + S("Weathered Copper Bulb "..lit_desc), S("Waxed Weathered Copper Bulb "..lit_desc), + S("Oxidized Copper Bulb "..lit_desc), S("Waxed Oxidized Copper Bulb "..lit_desc) }, ["bulb_powered_off"] = { - {"Copper Bulb", pow_desc}, {"Waxed Copper Bulb", pow_desc}, - {"Exposed Copper Bulb", pow_desc}, {"Waxed Exposed Copper Bulb", pow_desc}, - {"Weathered Copper Bulb", pow_desc}, {"Waxed Weathered Copper Bulb", pow_desc}, - {"Oxidized Copper Bulb", pow_desc}, {"Waxed Oxidized Copper Bulb", pow_desc} + S("Copper Bulb "..pow_desc), S("Waxed Copper Bulb "..pow_desc), + S("Exposed Copper Bulb "..pow_desc), S("Waxed Exposed Copper Bulb "..pow_desc), + S("Weathered Copper Bulb "..pow_desc), S("Waxed Weathered Copper Bulb "..pow_desc), + S("Oxidized Copper Bulb "..pow_desc), S("Waxed Oxidized Copper Bulb "..pow_desc) }, ["bulb_powered_on"] = { - {"Copper Bulb", mix_desc}, {"Waxed Copper Bulb", mix_desc}, - {"Exposed Copper Bulb", mix_desc}, {"Waxed Exposed Copper Bulb", mix_desc}, - {"Weathered Copper Bulb", mix_desc}, {"Waxed Weathered Copper Bulb", mix_desc}, - {"Oxidized Copper Bulb", mix_desc}, {"Waxed Oxidized Copper Bulb", mix_desc} + S("Copper Bulb "..mix_desc), S("Waxed Copper Bulb "..mix_desc), + S("Exposed Copper Bulb "..mix_desc), S("Waxed Exposed Copper Bulb "..mix_desc), + S("Weathered Copper Bulb "..mix_desc), S("Waxed Weathered Copper Bulb "..mix_desc), + S("Oxidized Copper Bulb "..mix_desc), S("Waxed Oxidized Copper Bulb "..mix_desc) } } mcl_copper.copper_longdescs = { ["block"] = { - "A block of copper is mostly a decorative block.", - "Exposed copper is a decorative block.", - "Weathered copper is a decorative block.", - "Oxidized copper is a decorative block." + S("A block of copper is mostly a decorative block."), + S("Exposed copper is a decorative block."), + S("Weathered copper is a decorative block."), + S("Oxidized copper is a decorative block.") }, ["cut"] = { - "Cut copper is a decorative block.", - "Exposed cut copper is a decorative block.", - "Weathered cut copper is a decorative block.", - "Oxidized cut copper is a decorative block." + S("Cut copper is a decorative block."), + S("Exposed cut copper is a decorative block."), + S("Weathered cut copper is a decorative block."), + S("Oxidized cut copper is a decorative block.") }, ["grate"] = { - "Copper grate is a decorative block.", - "Exposed copper grate is a decorative block.", - "Weathered copper grate is a decorative block.", - "Oxidized copper grate is a decorative block." + S("Copper grate is a decorative block."), + S("Exposed copper grate is a decorative block."), + S("Weathered copper grate is a decorative block."), + S("Oxidized copper grate is a decorative block.") }, ["chiseled"] = { - "Chiseled copper is a decorative block.", - "Exposed chiseled copper is a decorative block.", - "Weathered chiseled copper is a decorative block.", - "Oxidized chiseled copper is a decorative block." + S("Chiseled copper is a decorative block."), + S("Exposed chiseled copper is a decorative block."), + S("Weathered chiseled copper is a decorative block."), + S("Oxidized chiseled copper is a decorative block.") }, ["bulb_off"] = { - "Copper bulb is a decorative block and a light source when lited.", - "Exposed copper bulb is a decorative block and a light source when lited.", - "Weathered copper bulb is a decorative block and a light source when lited.", - "Oxidized copper bulb is a decorative block and a light source when lited." + S("Copper bulb is a decorative block and a light source when lited."), + S("Exposed copper bulb is a decorative block and a light source when lited."), + S("Weathered copper bulb is a decorative block and a light source when lited."), + S("Oxidized copper bulb is a decorative block and a light source when lited.") }, ["bulb_on"] = { - "Copper bulb is a decorative block and a light source.", - "Exposed copper bulb is a decorative block and a light source.", - "Weathered copper bulb is a decorative block and a light source.", - "Oxidized copper bulb is a decorative block and a light source." + S("Copper bulb is a decorative block and a light source."), + S("Exposed copper bulb is a decorative block and a light source."), + S("Weathered copper bulb is a decorative block and a light source."), + S("Oxidized copper bulb is a decorative block and a light source.") }, ["bulb_powered_off"] = { - "Copper bulb is a decorative block and a light source when lited.", - "Exposed copper bulb is a decorative block and a light source when lited.", - "Weathered copper bulb is a decorative block and a light source when lited.", - "Oxidized copper bulb is a decorative block and a light source when lited." + S("Copper bulb is a decorative block and a light source when lited."), + S("Exposed copper bulb is a decorative block and a light source when lited."), + S("Weathered copper bulb is a decorative block and a light source when lited."), + S("Oxidized copper bulb is a decorative block and a light source when lited.") }, ["bulb_powered_on"] = { - "Copper bulb is a decorative block and a light source.", - "Exposed copper bulb is a decorative block and a light source.", - "Weathered copper bulb is a decorative block and a light source.", - "Oxidized copper bulb is a decorative block and a light source." + S("Copper bulb is a decorative block and a light source."), + S("Exposed copper bulb is a decorative block and a light source."), + S("Weathered copper bulb is a decorative block and a light source."), + S("Oxidized copper bulb is a decorative block and a light source.") } } @@ -115,38 +116,38 @@ mcl_copper.stairs_subnames = { mcl_copper.stairs_descs = { ["copper_cut"] = { - "Slab of Cut Copper", "Double Slab of Cut Copper", "Stairs of Cut Copper", + S("Slab of Cut Copper"), S("Double Slab of Cut Copper"), S("Stairs of Cut Copper"), }, ["waxed_copper_cut"] = { - "Waxed Slab of Cut Copper", "Waxed Double Slab of Cut Copper", "Waxed Stairs of Cut Copper", + S("Waxed Slab of Cut Copper"), S("Waxed Double Slab of Cut Copper"), S("Waxed Stairs of Cut Copper"), }, ["copper_exposed_cut"] = { - "Slab of Exposed Cut Copper", "Double Slab of Exposed Cut Copper", "Stairs of Exposed Cut Copper" + S("Slab of Exposed Cut Copper"), S("Double Slab of Exposed Cut Copper"), S("Stairs of Exposed Cut Copper") }, ["waxed_copper_exposed_cut"] = { - "Waxed Slab of Exposed Cut Copper", "Waxed Double Slab of Exposed Cut Copper", "Waxed Stairs of Exposed Cut Copper" + S("Waxed Slab of Exposed Cut Copper"), S("Waxed Double Slab of Exposed Cut Copper"), S("Waxed Stairs of Exposed Cut Copper") }, ["copper_weathered_cut"] = { - "Slab of Weathered Cut Copper", "Double Slab of Weathered Cut Copper", "Stairs of Weathered Cut Copper" + S("Slab of Weathered Cut Copper"), S("Double Slab of Weathered Cut Copper"), S("Stairs of Weathered Cut Copper") }, ["waxed_copper_weathered_cut"] = { - "Waxed Slab of Weathered Cut Copper", "Waxed Double Slab of Weathered Cut Copper", "Waxed Stairs of Weathered Cut Copper" + S("Waxed Slab of Weathered Cut Copper"), S("Waxed Double Slab of Weathered Cut Copper"), S("Waxed Stairs of Weathered Cut Copper") }, ["copper_oxidized_cut"] = { - "Slab of Oxidized Cut Copper", "Double Slab of Oxidized Cut Copper", "Stairs of Oxidized Cut Copper" + S("Slab of Oxidized Cut Copper"), S("Double Slab of Oxidized Cut Copper"), S("Stairs of Oxidized Cut Copper") }, ["waxed_copper_oxidized_cut"] = { - "Waxed Slab of Oxidized Cut Copper", "Waxed Double Slab of Oxidized Cut Copper", "Waxed Stairs of Oxidized Cut Copper" + S("Waxed Slab of Oxidized Cut Copper"), S("Waxed Double Slab of Oxidized Cut Copper"), S("Waxed Stairs of Oxidized Cut Copper") } } mcl_copper.doors_descs = { - {"Copper Door", "Copper Trapdoor"}, - {"Waxed Copper Door", "Waxed Copper Trapdoor"}, - {"Exposed Copper Door", "Exposed Copper Trapdoor"}, - {"Waxed Exposed Copper Door", "Waxed Exposed Copper Trapdoor"}, - {"Weathered Copper Door", "Weathered Copper Trapdoor"}, - {"Waxed Weathered Copper Door", "Waxed Weathered Copper Trapdoor"}, - {"Oxidized Copper Door", "Oxidized Copper Trapdoor"}, - {"Waxed Oxidized Copper Door", "Waxed Oxidized Copper Trapdoor"} + {S("Copper Door"), S("Copper Trapdoor")}, + {S("Waxed Copper Door"), S("Waxed Copper Trapdoor")}, + {S("Exposed Copper Door"), S("Exposed Copper Trapdoor")}, + {S("Waxed Exposed Copper Door"), S("Waxed Exposed Copper Trapdoor")}, + {S("Weathered Copper Door"), S("Weathered Copper Trapdoor")}, + {S("Waxed Weathered Copper Door"), S("Waxed Weathered Copper Trapdoor")}, + {S("Oxidized Copper Door"), S("Oxidized Copper Trapdoor")}, + {S("Waxed Oxidized Copper Door"), S("Waxed Oxidized Copper Trapdoor")} } diff --git a/mods/ITEMS/mcl_copper/nodes.lua b/mods/ITEMS/mcl_copper/nodes.lua index f89ae57c7..f1116a8a8 100644 --- a/mods/ITEMS/mcl_copper/nodes.lua +++ b/mods/ITEMS/mcl_copper/nodes.lua @@ -1,19 +1,5 @@ local S = minetest.get_translator("mcl_copper") -local function set_description(descs, s_index, n_index) - local description - - if type(descs[s_index][n_index]) == "string" then - description = S(descs[s_index][n_index]) - elseif type(descs[s_index][n_index]) == "table" then - description = S("@1 "..descs[s_index][n_index][2], S(descs[s_index][n_index][1])) - else - return nil - end - - return description -end - local function set_drop(drop, old_name, index_name) if drop and old_name and index_name then drop = "mcl_copper:"..old_name:gsub(index_name, drop) @@ -60,7 +46,7 @@ local function set_tiles(tiles, index) return tiles[math.ceil(index / 2)] end -function mcl_copper.register_copper_variants(name, definitions) +local function register_copper_variants(name, definitions) local names, oxidized_variant, stripped_variant, waxed_variant, tiles if name ~= "cut" then @@ -109,7 +95,7 @@ function mcl_copper.register_copper_variants(name, definitions) end minetest.register_node("mcl_copper:"..names[i], { - description = set_description(mcl_copper.copper_descs, name, i), + description = mcl_copper.copper_descs[name][i], drawtype = definitions.drawtype or "normal", drop = set_drop(definitions.drop, names[i], name), groups = set_groups(names[i], definitions.groups), @@ -121,7 +107,7 @@ function mcl_copper.register_copper_variants(name, definitions) sounds = mcl_sounds.node_sound_metal_defaults(), sunlight_propagates = definitions.sunlight_propagates or false, tiles = {set_tiles(tiles, i)}, - _doc_items_longdesc = S(mcl_copper.copper_longdescs[name][math.ceil(i/2)]), + _doc_items_longdesc = mcl_copper.copper_longdescs[name][math.ceil(i/2)], _mcl_blast_resistance = 6, _mcl_hardness = 3, _mcl_oxidized_variant = oxidized_variant, @@ -134,14 +120,14 @@ function mcl_copper.register_copper_variants(name, definitions) mcl_stairs.register_slab(subname, "mcl_copper:"..names[i], set_groups(subname, definitions.groups), {set_tiles(tiles, i), set_tiles(tiles, i), set_tiles(tiles, i)}, - set_description(mcl_copper.stairs_descs, subname, 1), nil, nil, nil, - set_description(mcl_copper.stairs_descs, subname, 2) + mcl_copper.stairs_descs[subname][1], nil, nil, nil, + mcl_copper.stairs_descs[subname][2] ) mcl_stairs.register_stair(subname, "mcl_copper:"..names[i], set_groups(subname, definitions.groups), {set_tiles(tiles, i), set_tiles(tiles, i), set_tiles(tiles, i), set_tiles(tiles, i), set_tiles(tiles, i), set_tiles(tiles, i)}, - set_description(mcl_copper.stairs_descs, subname, 3), nil, nil, nil, "woodlike" + mcl_copper.stairs_descs[subname][3], nil, nil, nil, "woodlike" ) end @@ -165,7 +151,7 @@ function mcl_copper.register_copper_variants(name, definitions) end mcl_doors:register_door("mcl_copper:"..names[i]:gsub(name, "door"), { - description = S(mcl_copper.doors_descs[i][1]), + description = mcl_copper.doors_descs[i][1], groups = door_groups, inventory_image = itemimg, only_redstone_can_open = false, @@ -179,7 +165,7 @@ function mcl_copper.register_copper_variants(name, definitions) }) mcl_doors:register_trapdoor("mcl_copper:"..names[i]:gsub(name, "trapdoor"), { - description = S(mcl_copper.doors_descs[i][2]), + description = mcl_copper.doors_descs[i][2], groups = trapdoor_groups, only_redstone_can_open = false, sounds = mcl_sounds.node_sound_metal_defaults(), @@ -212,7 +198,7 @@ minetest.register_node("mcl_copper:stone_with_copper", { minetest.register_node("mcl_copper:block_raw", { description = S("Block of Raw Copper"), _doc_items_longdesc = S("A block used for compact raw copper storage."), - tiles = {"mcl_copper_raw_block.png"}, + tiles = {"mcl_copper_block_raw.png"}, is_ground_content = false, groups = {pickaxey = 2, building_block = 1, blast_furnace_smeltable = 1}, sounds = mcl_sounds.node_sound_metal_defaults(), @@ -220,27 +206,27 @@ minetest.register_node("mcl_copper:block_raw", { _mcl_hardness = 5, }) -mcl_copper.register_copper_variants("block", { +register_copper_variants("block", { groups = {pickaxey = 2, building_block = 1}, _mcl_doors = true, }) -mcl_copper.register_copper_variants("cut", { +register_copper_variants("cut", { groups = {pickaxey = 2, building_block = 1}, _mcl_stairs = true, }) --[[ -mcl_copper.register_copper_variants("grate", { +register_copper_variants("grate", { drawtype = "allfaces", groups = {pickaxey = 2, building_block = 1, disable_suffocation = 1}, sunlight_propagates = true, }) -mcl_copper.register_copper_variants("chiseled", { +register_copper_variants("chiseled", { groups = {pickaxey = 2, building_block = 1} }) -mcl_copper.register_copper_variants("bulb_off", { +register_copper_variants("bulb_off", { groups = {pickaxey = 2, building_block = 1}, mesecons = { effector = { @@ -251,7 +237,7 @@ mcl_copper.register_copper_variants("bulb_off", { }, }) -mcl_copper.register_copper_variants("bulb_on", { +register_copper_variants("bulb_on", { drop = "bulb_off", groups = {pickaxey = 2, building_block = 1, not_in_creative_inventory = 1}, light_source = 14, @@ -265,7 +251,7 @@ mcl_copper.register_copper_variants("bulb_on", { paramtype = "light" }) -mcl_copper.register_copper_variants("bulb_powered_off", { +register_copper_variants("bulb_powered_off", { drop = "bulb_off", groups = {pickaxey = 2, building_block = 1, not_in_creative_inventory = 1}, mesecons = { @@ -277,7 +263,7 @@ mcl_copper.register_copper_variants("bulb_powered_off", { } }) -mcl_copper.register_copper_variants("bulb_powered_on", { +register_copper_variants("bulb_powered_on", { drop = "bulb_off", groups = {pickaxey = 2, building_block = 1, not_in_creative_inventory = 1}, light_source = 14, From 2fbde9cd708a916bd09057706690573b305fb92a Mon Sep 17 00:00:00 2001 From: JoseDouglas26 Date: Sun, 5 May 2024 08:48:08 -0300 Subject: [PATCH 06/13] New copper grate texture (optimized by optipng) --- mods/ITEMS/mcl_copper/nodes.lua | 4 ++-- textures/mcl_copper_block_grate.png | Bin 0 -> 284 bytes textures/mcl_copper_exposed_grate.png | Bin 0 -> 328 bytes textures/mcl_copper_oxidized_grate.png | Bin 0 -> 283 bytes textures/mcl_copper_weathered_grate.png | Bin 0 -> 337 bytes 5 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 textures/mcl_copper_block_grate.png create mode 100644 textures/mcl_copper_exposed_grate.png create mode 100644 textures/mcl_copper_oxidized_grate.png create mode 100644 textures/mcl_copper_weathered_grate.png diff --git a/mods/ITEMS/mcl_copper/nodes.lua b/mods/ITEMS/mcl_copper/nodes.lua index f1116a8a8..754962d3e 100644 --- a/mods/ITEMS/mcl_copper/nodes.lua +++ b/mods/ITEMS/mcl_copper/nodes.lua @@ -215,13 +215,13 @@ register_copper_variants("cut", { groups = {pickaxey = 2, building_block = 1}, _mcl_stairs = true, }) ---[[ + register_copper_variants("grate", { drawtype = "allfaces", groups = {pickaxey = 2, building_block = 1, disable_suffocation = 1}, sunlight_propagates = true, }) - +--[[ register_copper_variants("chiseled", { groups = {pickaxey = 2, building_block = 1} }) diff --git a/textures/mcl_copper_block_grate.png b/textures/mcl_copper_block_grate.png new file mode 100644 index 0000000000000000000000000000000000000000..191ea379017e6f950350261006da665428efbdb9 GIT binary patch literal 284 zcmV+%0ptFOP)!ZN5L+Z5NGRoem>Ne9#!gHyK#_yJ zwCcQ`+q4OvU?3-_?}6z2BEIW|UZ>aRj=3*jO^_RxgM(@(Nt2-0ZP^s;jdq_%Fd9`X zOKL0_P4p#k>bZ#?+)RPGL8siMoyX{1WzJB~!Lm1tZh#!^Ux1pq^#q; imZJyz&Bz?FkK_k3+;!fb1(8Gm0000XJ|}lBj5!%Ys;t=ptb>2(4nnY#jV>zxiZ}@L@DH a=D@yj42Ac_$%{Au0000~2p_TXQN#oo0EBb1-G@LGCeOKNKu2DzoCVKg zweFnr3~&TZmBtLTz&f`Ls~T{wLKT{T)<6T;Mo%?yz#x!!fFFj%xeh-9OKtSaQtTdz zi1z$bM7^ah0D`C~=d85V;Ub-`cdIJ<%+&K@@S!G}0Yr3h)kbZ##X(gcPkuO+kNDFRCnY@`~N2p}1En-2n>N3ac(Bzuuh?sV4s zJ8>B$(>DX3x+B1_SiiTf9v;uSdUKEfGY4HyI2aj{1m~Db@~;Q5`g2VEINBh{W+SZ} jKF+r_r^ZKVDPoXsz7B~xhm(fW00000NkvXXu0mjft(A~= literal 0 HcmV?d00001 From 3747758c42f0391b8edee8e4f23a0a6ec122c98f Mon Sep 17 00:00:00 2001 From: JoseDouglas26 Date: Sun, 5 May 2024 08:57:57 -0300 Subject: [PATCH 07/13] Fix tabulation mistake and some small changes --- mods/ITEMS/mcl_copper/descriptions.lua | 34 +++++++++++++++++++------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/mods/ITEMS/mcl_copper/descriptions.lua b/mods/ITEMS/mcl_copper/descriptions.lua index cca2aff9d..3146096f0 100644 --- a/mods/ITEMS/mcl_copper/descriptions.lua +++ b/mods/ITEMS/mcl_copper/descriptions.lua @@ -57,7 +57,7 @@ mcl_copper.copper_descs = { mcl_copper.copper_longdescs = { ["block"] = { S("A block of copper is mostly a decorative block."), - S("Exposed copper is a decorative block."), + S("Exposed copper is a decorative block."), S("Weathered copper is a decorative block."), S("Oxidized copper is a decorative block.") }, @@ -116,28 +116,44 @@ mcl_copper.stairs_subnames = { mcl_copper.stairs_descs = { ["copper_cut"] = { - S("Slab of Cut Copper"), S("Double Slab of Cut Copper"), S("Stairs of Cut Copper"), + S("Slab of Cut Copper"), + S("Double Slab of Cut Copper"), + S("Stairs of Cut Copper"), }, ["waxed_copper_cut"] = { - S("Waxed Slab of Cut Copper"), S("Waxed Double Slab of Cut Copper"), S("Waxed Stairs of Cut Copper"), + S("Waxed Slab of Cut Copper"), + S("Waxed Double Slab of Cut Copper"), + S("Waxed Stairs of Cut Copper"), }, ["copper_exposed_cut"] = { - S("Slab of Exposed Cut Copper"), S("Double Slab of Exposed Cut Copper"), S("Stairs of Exposed Cut Copper") + S("Slab of Exposed Cut Copper"), + S("Double Slab of Exposed Cut Copper"), + S("Stairs of Exposed Cut Copper") }, ["waxed_copper_exposed_cut"] = { - S("Waxed Slab of Exposed Cut Copper"), S("Waxed Double Slab of Exposed Cut Copper"), S("Waxed Stairs of Exposed Cut Copper") + S("Waxed Slab of Exposed Cut Copper"), + S("Waxed Double Slab of Exposed Cut Copper"), + S("Waxed Stairs of Exposed Cut Copper") }, ["copper_weathered_cut"] = { - S("Slab of Weathered Cut Copper"), S("Double Slab of Weathered Cut Copper"), S("Stairs of Weathered Cut Copper") + S("Slab of Weathered Cut Copper"), + S("Double Slab of Weathered Cut Copper"), + S("Stairs of Weathered Cut Copper") }, ["waxed_copper_weathered_cut"] = { - S("Waxed Slab of Weathered Cut Copper"), S("Waxed Double Slab of Weathered Cut Copper"), S("Waxed Stairs of Weathered Cut Copper") + S("Waxed Slab of Weathered Cut Copper"), + S("Waxed Double Slab of Weathered Cut Copper"), + S("Waxed Stairs of Weathered Cut Copper") }, ["copper_oxidized_cut"] = { - S("Slab of Oxidized Cut Copper"), S("Double Slab of Oxidized Cut Copper"), S("Stairs of Oxidized Cut Copper") + S("Slab of Oxidized Cut Copper"), + S("Double Slab of Oxidized Cut Copper"), + S("Stairs of Oxidized Cut Copper") }, ["waxed_copper_oxidized_cut"] = { - S("Waxed Slab of Oxidized Cut Copper"), S("Waxed Double Slab of Oxidized Cut Copper"), S("Waxed Stairs of Oxidized Cut Copper") + S("Waxed Slab of Oxidized Cut Copper"), + S("Waxed Double Slab of Oxidized Cut Copper"), + S("Waxed Stairs of Oxidized Cut Copper") } } From ff798bb2b672ef9a6ddcc6fb5cc477c92dbf4669 Mon Sep 17 00:00:00 2001 From: JoseDouglas26 Date: Sun, 5 May 2024 12:04:01 +0000 Subject: [PATCH 08/13] More tabulation fixes --- mods/ITEMS/mcl_copper/descriptions.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mods/ITEMS/mcl_copper/descriptions.lua b/mods/ITEMS/mcl_copper/descriptions.lua index 3146096f0..0715bf803 100644 --- a/mods/ITEMS/mcl_copper/descriptions.lua +++ b/mods/ITEMS/mcl_copper/descriptions.lua @@ -58,20 +58,20 @@ mcl_copper.copper_longdescs = { ["block"] = { S("A block of copper is mostly a decorative block."), S("Exposed copper is a decorative block."), - S("Weathered copper is a decorative block."), - S("Oxidized copper is a decorative block.") + S("Weathered copper is a decorative block."), + S("Oxidized copper is a decorative block.") }, ["cut"] = { S("Cut copper is a decorative block."), - S("Exposed cut copper is a decorative block."), - S("Weathered cut copper is a decorative block."), - S("Oxidized cut copper is a decorative block.") + S("Exposed cut copper is a decorative block."), + S("Weathered cut copper is a decorative block."), + S("Oxidized cut copper is a decorative block.") }, ["grate"] = { S("Copper grate is a decorative block."), - S("Exposed copper grate is a decorative block."), - S("Weathered copper grate is a decorative block."), - S("Oxidized copper grate is a decorative block.") + S("Exposed copper grate is a decorative block."), + S("Weathered copper grate is a decorative block."), + S("Oxidized copper grate is a decorative block.") }, ["chiseled"] = { S("Chiseled copper is a decorative block."), From 078d8fe93fb8067566c269e8658cc02861f54229 Mon Sep 17 00:00:00 2001 From: JoseDouglas26 Date: Sun, 5 May 2024 09:23:03 -0300 Subject: [PATCH 09/13] Updated locale files --- mods/ITEMS/mcl_copper/locale/mcl_copper.de.tr | 140 ++++++++++++---- mods/ITEMS/mcl_copper/locale/mcl_copper.fr.tr | 152 ++++++++++++------ mods/ITEMS/mcl_copper/locale/mcl_copper.ja.tr | 152 ++++++++++++------ .../mcl_copper/locale/mcl_copper.pt_BR.tr | 145 +++++++++-------- mods/ITEMS/mcl_copper/locale/mcl_copper.ru.tr | 152 ++++++++++++------ mods/ITEMS/mcl_copper/locale/template.txt | 143 ++++++++-------- 6 files changed, 565 insertions(+), 319 deletions(-) diff --git a/mods/ITEMS/mcl_copper/locale/mcl_copper.de.tr b/mods/ITEMS/mcl_copper/locale/mcl_copper.de.tr index cc2290e1e..94adb315f 100644 --- a/mods/ITEMS/mcl_copper/locale/mcl_copper.de.tr +++ b/mods/ITEMS/mcl_copper/locale/mcl_copper.de.tr @@ -1,37 +1,113 @@ # textdomain: mcl_copper -A block of copper is mostly a decorative block.=Ein Kupferblock wird meistens als dekorativer Block verwendet. -A block used for compact raw copper storage.=Ein Block für die kompakte Lagerung von Rohkupfer. Block of Copper=Kupferblock -Block of Raw Copper=Rohkupferblock -Copper Ingot=Kupfer Barren -Copper Ore=Kupfererz -Cut copper is a decorative block.=Ein Geschnittener Kupferblock ist ein dekorativer Block. -Cut Copper=Geschnittener Kupferblock -Double Slab of Cut Copper=Doppelte Geschnittene Kupferstufe -Double Slab of Exposed Cut Copper=Doppelte Angelaufene Geschnittene Kupferstufe -Double Slab of Oxidized Cut Copper=Doppelte Oxidierte Geschnittene Kupferstufe -Double Slab of Weathered Cut Copper=Doppelte Verwitterte Geschnittene Kupferstufe -Exposed copper is a decorative block.=Ein Angelaufener Kupferblock ist ein dekorativer Block. +Waxed Block of Copper= Exposed Copper=Angelaufener Kupferblock -Exposed cut copper is a decorative block.=Ein Angelaufener geschnittener Kupferblock ist ein dekorativer Block. -Exposed Cut Copper=Angelaufener geschnittener Kupferblock -Molten Raw Copper. It is used to craft blocks.=Geschmolzenes Rohkupfer. Es wird verwendet, um Blöcke herzustellen. -Oxidized copper is a decorative block.=Ein Oxidierter Kupferblockist ist ein dekorativer Block. -Oxidized Copper=Oxidierter Kupferblock -Oxidized cut copper is a decorative block.=Ein Oxidierter geschnittener Kupferblock ist ein dekorativer Block. -Oxidized Cut Copper=Oxidierter geschnittener Kupferblock -Raw Copper. Mine a Copper Ore to get it.=Bauen sie ein Kupfererz ab, um es zu erhalten. -Raw Copper=Rohkupfer -Slab of Cut Copper=Geschnittene Kupferstufe -Slab of Exposed Cut Copper=Angelaufene Geschnittene Kupferstufe -Slab of Oxidized Cut Copper=Oxidierte Geschnittene Kupferstufe -Slab of Weathered Cut Copper=Verwitterte Geschnittene Kupferstufe -Some copper contained in stone, it is pretty common and can be found below sea level.=Stein, in dem etwas Kupfer enthalten ist. Es ist ziemlich häufig und kann unter dem Meeresspiegel gefunden werden. -Stairs of Cut Copper=Geschnittene Kupfertreppe -Stairs of Exposed Cut Copper=Angelaufene Geschnittene Kupfertreppe -Stairs of Oxidized Cut Copper=Oxidierte Geschnittene Kupfertreppe -Stairs of Weathered Cut Copper=Verwitterte Geschnittene Kupfertreppe -Weathered copper is a decorative block.=Ein Verwitterter Kupferblock ist ein dekorativer Block. +Waxed Exposed Copper= Weathered Copper=Verwitterter Kupferblock -Weathered cut copper is a decorative block.=Ein Verwitterter geschnittener Kupferblock ist ein dekorativer Block. +Waxed Weathered Copper= +Oxidized Copper=Oxidierter Kupferblock +Waxed Oxidized Copper= +Cut Copper=Geschnittener Kupferblock +Waxed Cut Copper= +Exposed Cut Copper=Angelaufener geschnittener Kupferblock +Waxed Exposed Cut Copper= Weathered Cut Copper=Verwitterter geschnittener Kupferblock +Waxed Weathered Cut Copper= +Oxidized Cut Copper=Oxidierter geschnittener Kupferblock +Waxed Oxidized Cut Copper= +Copper Grate= +Waxed Copper Grate= +Exposed Copper Grate= +Waxed Exposed Copper Grate= +Weathered Copper Grate= +Waxed Weathered Copper Grate= +Oxidized Copper Grate= +Waxed Oxidized Copper Grate= +Chiseled Copper= +Waxed Chiseled Copper= +Exposed Chiseled Copper= +Waxed Exposed Chiseled Copper= +Weathered Chiseled Copper= +Waxed Weathered Chiseled Copper= +Oxidized Chiseled Copper= +Waxed Oxidized Chiseled Copper= +Copper Bulb= +Waxed Copper Bulb= +Exposed Copper Bulb= +Waxed Exposed Copper Bulb= +Weathered Copper Bulb= +Waxed Weathered Copper Bulb= +Oxidized Copper Bulb= +Waxed Oxidized Copper Bulb= +A block of copper is mostly a decorative block.=Ein Kupferblock wird meistens als dekorativer Block verwendet. +Exposed copper is a decorative block.=Ein Angelaufener Kupferblock ist ein dekorativer Block. +Weathered copper is a decorative block.=Ein Verwitterter Kupferblock ist ein dekorativer Block. +Oxidized copper is a decorative block.=Ein Oxidierter Kupferblockist ist ein dekorativer Block. +Cut copper is a decorative block.=Ein Geschnittener Kupferblock ist ein dekorativer Block. +Exposed cut copper is a decorative block.=Ein Angelaufener geschnittener Kupferblock ist ein dekorativer Block. +Weathered cut copper is a decorative block.=Ein Verwitterter geschnittener Kupferblock ist ein dekorativer Block. +Oxidized cut copper is a decorative block.=Ein Oxidierter geschnittener Kupferblock ist ein dekorativer Block. +Copper grate is a decorative block.= +Exposed copper grate is a decorative block.= +Weathered copper grate is a decorative block.= +Oxidized copper grate is a decorative block.= +Chiseled copper is a decorative block.= +Exposed chiseled copper is a decorative block.= +Weathered chiseled copper is a decorative block.= +Oxidized chiseled copper is a decorative block.= +Copper bulb is a decorative block and a light source when lited.= +Exposed copper bulb is a decorative block and a light source when lited.= +Weathered copper bulb is a decorative block and a light source when lited.= +Oxidized copper bulb is a decorative block and a light source when lited.= +Copper bulb is a decorative block and a light source.= +Exposed copper bulb is a decorative block and a light source.= +Weathered copper bulb is a decorative block and a light source.= +Oxidized copper bulb is a decorative block and a light source.= +Slab of Cut Copper=Geschnittene Kupferstufe +Double Slab of Cut Copper=Doppelte Geschnittene Kupferstufe +Stairs of Cut Copper=Geschnittene Kupfertreppe +Waxed Slab of Cut Copper= +Waxed Double Slab of Cut Copper= +Waxed Stairs of Cut Copper= +Slab of Exposed Cut Copper=Angelaufene Geschnittene Kupferstufe +Double Slab of Exposed Cut Copper=Doppelte Angelaufene Geschnittene Kupferstufe +Stairs of Exposed Cut Copper=Angelaufene Geschnittene Kupfertreppe +Waxed Slab of Exposed Cut Copper= +Waxed Double Slab of Exposed Cut Copper= +Waxed Stairs of Exposed Cut Copper= +Slab of Weathered Cut Copper=Verwitterte Geschnittene Kupferstufe +Double Slab of Weathered Cut Copper=Doppelte Verwitterte Geschnittene Kupferstufe +Stairs of Weathered Cut Copper=Verwitterte Geschnittene Kupfertreppe +Waxed Slab of Weathered Cut Copper= +Waxed Double Slab of Weathered Cut Copper= +Waxed Stairs of Weathered Cut Copper= +Slab of Oxidized Cut Copper=Oxidierte Geschnittene Kupferstufe +Double Slab of Oxidized Cut Copper=Doppelte Oxidierte Geschnittene Kupferstufe +Stairs of Oxidized Cut Copper=Oxidierte Geschnittene Kupfertreppe +Waxed Slab of Oxidized Cut Copper= +Waxed Double Slab of Oxidized Cut Copper= +Waxed Stairs of Oxidized Cut Copper= +Copper Door= +Copper Trapdoor= +Waxed Copper Door= +Waxed Copper Trapdoor= +Exposed Copper Door= +Exposed Copper Trapdoor= +Waxed Exposed Copper Door= +Waxed Exposed Copper Trapdoor= +Weathered Copper Door= +Weathered Copper Trapdoor= +Waxed Weathered Copper Door= +Waxed Weathered Copper Trapdoor= +Oxidized Copper Door= +Oxidized Copper Trapdoor= +Waxed Oxidized Copper Door= +Waxed Oxidized Copper Trapdoor= +Copper Ingot=Kupfer Barren +Molten Raw Copper. It is used to craft blocks.=Geschmolzenes Rohkupfer. Es wird verwendet, um Blöcke herzustellen. +Raw Copper=Rohkupfer +Raw Copper. Mine a Copper Ore to get it.=Bauen sie ein Kupfererz ab, um es zu erhalten. +Copper Ore=Kupfererz +Some copper contained in stone, it is pretty common and can be found below sea level.=Stein, in dem etwas Kupfer enthalten ist. Es ist ziemlich häufig und kann unter dem Meeresspiegel gefunden werden. +Block of Raw Copper=Rohkupferblock +A block used for compact raw copper storage.=Ein Block für die kompakte Lagerung von Rohkupfer. diff --git a/mods/ITEMS/mcl_copper/locale/mcl_copper.fr.tr b/mods/ITEMS/mcl_copper/locale/mcl_copper.fr.tr index a2fb94c36..36f9754fb 100644 --- a/mods/ITEMS/mcl_copper/locale/mcl_copper.fr.tr +++ b/mods/ITEMS/mcl_copper/locale/mcl_copper.fr.tr @@ -1,57 +1,113 @@ # textdomain: mcl_copper -A block of copper is mostly a decorative block.=Le bloc de cuivre est surtout un bloc décoratif. -A block used for compact raw copper storage.=Un bloc utilisé pour le stockage compact de cuivre brut. Block of Copper=Bloc de cuivre Waxed Block of Copper=Bloc de cuivre ciré -Block of Raw Copper=Bloc de cuivre brut -Copper Ingot=Lingot de cuivre -Copper Ore=Minerai de cuivre -Cut copper is a decorative block.=Le cuivre taillé est un bloc décoratif. -Cut Copper=Cuivre taillé -Waxed Cut Copper=Cuivre taillé ciré -Double Slab of Cut Copper=Double dalle de cuivre taillé -Double Slab of Exposed Cut Copper=Double dalle de cuivre taillé exposé -Double Slab of Oxidized Cut Copper=Double dalle de cuivre taillé oxydé -Double Slab of Weathered Cut Copper=Double dalle de cuivre taillé érodé -Waxed Double Slab of Cut Copper=Double dalle de cuivre taillé ciré -Waxed Double Slab of Exposed Cut Copper=Double dalle de cuivre taillé exposé ciré -Waxed Double Slab of Oxidized Cut Copper=Double dalle de cuivre taillé oxydé ciré -Waxed Double Slab of Weathered Cut Copper=Double dalle de cuivre taillé érodé ciré -Exposed copper is a decorative block.=Le cuivre exposé est un bloc décoratif. Exposed Copper=Cuivre exposé Waxed Exposed Copper=Cuivre exposé ciré -Exposed cut copper is a decorative block.=Le cuivre taillé exposé est un bloc décoratif. -Exposed Cut Copper=Cuivre taillé exposé -Waxed Exposed Cut Copper=Cuivre taillé exposé ciré -Molten Raw Copper. It is used to craft blocks.=Cuivre brut fondu. Utilisé pour fabriquer des blocs. -Oxidized copper is a decorative block.=Le cuivre oxydé est un bloc décoratif. -Oxidized Copper=Cuivre oxydé -Waxed Oxidized Copper=Cuivre oxydé ciré -Oxidized cut copper is a decorative block.=Le cuivre taillé oxydé est un bloc décoratif. -Oxidized Cut Copper=Cuivre taillé oxydé -Waxed Oxidized Cut Copper=Cuivre taillé oxydé ciré -Raw Copper. Mine a Copper Ore to get it.=Cuivre brut. Creuser dans du minerai de cuivre pour l'obtenir. -Raw Copper=Cuivre brut -Slab of Cut Copper=Dalle de cuivre taillé -Slab of Exposed Cut Copper=Dalle de cuivre taillé exposé -Slab of Oxidized Cut Copper=Dalle de cuivre taillé oxydé -Slab of Weathered Cut Copper=Dalle de cuivre taillé érodé -Waxed Slab of Cut Copper=Dalle de cuivre taillé ciré -Waxed Slab of Exposed Cut Copper=Dalle de cuivre taillé exposé ciré -Waxed Slab of Oxidized Cut Copper=Dalle de cuivre taillé oxydé ciré -Waxed Slab of Weathered Cut Copper=Dalle de cuivre taillé érodé ciré -Some copper contained in stone, it is pretty common and can be found below sea level.=Un peu de cuivre se trouve dans la pierre, il est plutôt répandu et peut être trouvé sous le niveau de la mer. -Stairs of Cut Copper=Escalier de cuivre taillé -Stairs of Exposed Cut Copper=Escalier de cuivre taillé exposé -Stairs of Oxidized Cut Copper=Escalier de cuivre taillé oxydé -Stairs of Weathered Cut Copper=Escalier de cuivre taillé érodé -Waxed Stairs of Cut Copper=Escalier de cuivre taillé ciré -Waxed Stairs of Exposed Cut Copper=Escalier de cuivre taillé exposé ciré -Waxed Stairs of Oxidized Cut Copper=Escalier de cuivre taillé oxydé ciré -Waxed Stairs of Weathered Cut Copper=Escalier de cuivre taillé érodé ciré -Weathered copper is a decorative block.=Le cuivre érodé est un bloc décoratif. Weathered Copper=Cuivre érodé Waxed Weathered Copper=Cuivre érodé ciré -Weathered cut copper is a decorative block.=Le cuivre taillé érodé est un bloc décoratif. +Oxidized Copper=Cuivre oxydé +Waxed Oxidized Copper=Cuivre oxydé ciré +Cut Copper=Cuivre taillé +Waxed Cut Copper=Cuivre taillé ciré +Exposed Cut Copper=Cuivre taillé exposé +Waxed Exposed Cut Copper=Cuivre taillé exposé ciré Weathered Cut Copper=Cuivre taillé érodé Waxed Weathered Cut Copper=Cuivre taillé érodé ciré +Oxidized Cut Copper=Cuivre taillé oxydé +Waxed Oxidized Cut Copper=Cuivre taillé oxydé ciré +Copper Grate= +Waxed Copper Grate= +Exposed Copper Grate= +Waxed Exposed Copper Grate= +Weathered Copper Grate= +Waxed Weathered Copper Grate= +Oxidized Copper Grate= +Waxed Oxidized Copper Grate= +Chiseled Copper= +Waxed Chiseled Copper= +Exposed Chiseled Copper= +Waxed Exposed Chiseled Copper= +Weathered Chiseled Copper= +Waxed Weathered Chiseled Copper= +Oxidized Chiseled Copper= +Waxed Oxidized Chiseled Copper= +Copper Bulb= +Waxed Copper Bulb= +Exposed Copper Bulb= +Waxed Exposed Copper Bulb= +Weathered Copper Bulb= +Waxed Weathered Copper Bulb= +Oxidized Copper Bulb= +Waxed Oxidized Copper Bulb= +A block of copper is mostly a decorative block.=Le bloc de cuivre est surtout un bloc décoratif. +Exposed copper is a decorative block.=Le cuivre exposé est un bloc décoratif. +Weathered copper is a decorative block.=Le cuivre érodé est un bloc décoratif. +Oxidized copper is a decorative block.=Le cuivre oxydé est un bloc décoratif. +Cut copper is a decorative block.=Le cuivre taillé est un bloc décoratif. +Exposed cut copper is a decorative block.=Le cuivre taillé exposé est un bloc décoratif. +Weathered cut copper is a decorative block.=Le cuivre taillé érodé est un bloc décoratif. +Oxidized cut copper is a decorative block.=Le cuivre taillé oxydé est un bloc décoratif. +Copper grate is a decorative block.= +Exposed copper grate is a decorative block.= +Weathered copper grate is a decorative block.= +Oxidized copper grate is a decorative block.= +Chiseled copper is a decorative block.= +Exposed chiseled copper is a decorative block.= +Weathered chiseled copper is a decorative block.= +Oxidized chiseled copper is a decorative block.= +Copper bulb is a decorative block and a light source when lited.= +Exposed copper bulb is a decorative block and a light source when lited.= +Weathered copper bulb is a decorative block and a light source when lited.= +Oxidized copper bulb is a decorative block and a light source when lited.= +Copper bulb is a decorative block and a light source.= +Exposed copper bulb is a decorative block and a light source.= +Weathered copper bulb is a decorative block and a light source.= +Oxidized copper bulb is a decorative block and a light source.= +Slab of Cut Copper=Dalle de cuivre taillé +Double Slab of Cut Copper=Double dalle de cuivre taillé +Stairs of Cut Copper=Escalier de cuivre taillé +Waxed Slab of Cut Copper=Dalle de cuivre taillé ciré +Waxed Double Slab of Cut Copper=Double dalle de cuivre taillé ciré +Waxed Stairs of Cut Copper=Escalier de cuivre taillé ciré +Slab of Exposed Cut Copper=Dalle de cuivre taillé exposé +Double Slab of Exposed Cut Copper=Double dalle de cuivre taillé exposé +Stairs of Exposed Cut Copper=Escalier de cuivre taillé exposé +Waxed Slab of Exposed Cut Copper=Dalle de cuivre taillé exposé ciré +Waxed Double Slab of Exposed Cut Copper=Double dalle de cuivre taillé exposé ciré +Waxed Stairs of Exposed Cut Copper=Escalier de cuivre taillé exposé ciré +Slab of Weathered Cut Copper=Dalle de cuivre taillé érodé +Double Slab of Weathered Cut Copper=Double dalle de cuivre taillé érodé +Stairs of Weathered Cut Copper=Escalier de cuivre taillé érodé +Waxed Slab of Weathered Cut Copper=Dalle de cuivre taillé érodé ciré +Waxed Double Slab of Weathered Cut Copper=Double dalle de cuivre taillé érodé ciré +Waxed Stairs of Weathered Cut Copper=Escalier de cuivre taillé érodé ciré +Slab of Oxidized Cut Copper=Dalle de cuivre taillé oxydé +Double Slab of Oxidized Cut Copper=Double dalle de cuivre taillé oxydé +Stairs of Oxidized Cut Copper=Escalier de cuivre taillé oxydé +Waxed Slab of Oxidized Cut Copper=Dalle de cuivre taillé oxydé ciré +Waxed Double Slab of Oxidized Cut Copper=Double dalle de cuivre taillé oxydé ciré +Waxed Stairs of Oxidized Cut Copper=Escalier de cuivre taillé oxydé ciré +Copper Door= +Copper Trapdoor= +Waxed Copper Door= +Waxed Copper Trapdoor= +Exposed Copper Door= +Exposed Copper Trapdoor= +Waxed Exposed Copper Door= +Waxed Exposed Copper Trapdoor= +Weathered Copper Door= +Weathered Copper Trapdoor= +Waxed Weathered Copper Door= +Waxed Weathered Copper Trapdoor= +Oxidized Copper Door= +Oxidized Copper Trapdoor= +Waxed Oxidized Copper Door= +Waxed Oxidized Copper Trapdoor= +Copper Ingot=Lingot de cuivre +Molten Raw Copper. It is used to craft blocks.=Cuivre brut fondu. Utilisé pour fabriquer des blocs. +Raw Copper=Cuivre brut +Raw Copper. Mine a Copper Ore to get it.=Cuivre brut. Creuser dans du minerai de cuivre pour l'obtenir. +Copper Ore=Minerai de cuivre +Some copper contained in stone, it is pretty common and can be found below sea level.=Un peu de cuivre se trouve dans la pierre, il est plutôt répandu et peut être trouvé sous le niveau de la mer. +Block of Raw Copper=Bloc de cuivre brut +A block used for compact raw copper storage.=Un bloc utilisé pour le stockage compact de cuivre brut. diff --git a/mods/ITEMS/mcl_copper/locale/mcl_copper.ja.tr b/mods/ITEMS/mcl_copper/locale/mcl_copper.ja.tr index f6f204e78..8bac1e0a6 100644 --- a/mods/ITEMS/mcl_copper/locale/mcl_copper.ja.tr +++ b/mods/ITEMS/mcl_copper/locale/mcl_copper.ja.tr @@ -1,57 +1,113 @@ # textdomain: mcl_copper -A block of copper is mostly a decorative block.=銅ブロックは、そのほとんどが装飾ブロックです。 -A block used for compact raw copper storage.=銅の粗鉱をコンパクトに保管するのに使えるブロックです。 Block of Copper=銅ブロック Waxed Block of Copper=錆止め済み銅ブロック -Block of Raw Copper=銅の粗鉱ブロック -Copper Ingot=銅インゴット -Copper Ore=銅鉱石 -Cut copper is a decorative block.=溝入り銅は、装飾ブロックです。 -Cut Copper=溝入り銅 -Waxed Cut Copper=錆止め済み溝入り銅 -Double Slab of Cut Copper=溝入り銅の２重スラブ -Double Slab of Exposed Cut Copper=少し酸化した溝入り銅の２重スラブ -Double Slab of Oxidized Cut Copper=殆ど酸化した溝入り銅の２重スラブ -Double Slab of Weathered Cut Copper=半ば酸化した溝入り銅の２重スラブ -Waxed Double Slab of Cut Copper=錆止め済み溝入り銅の２重スラブ -Waxed Double Slab of Exposed Cut Copper=少し酸化した錆止め済み溝入り銅の２重スラブ -Waxed Double Slab of Oxidized Cut Copper=殆ど酸化した錆止め済み溝入り銅の２重スラブ -Waxed Double Slab of Weathered Cut Copper=半ば酸化した錆止め済み溝入り銅の２重スラブ -Exposed copper is a decorative block.=少し酸化した銅は、装飾ブロックです。 Exposed Copper=少し酸化した銅 Waxed Exposed Copper=少し酸化した錆止め済み銅 -Exposed cut copper is a decorative block.=少し酸化した溝入り銅は、装飾ブロックです。 -Exposed Cut Copper=少し酸化した溝入り銅 -Waxed Exposed Cut Copper=少し酸化した錆止め済み溝入り銅 -Molten Raw Copper. It is used to craft blocks.=溶けた未処理の銅。ブロックのクラフトに使われます。 -Oxidized copper is a decorative block.=殆ど酸化した銅は、装飾ブロックです。 -Oxidized Copper=殆ど酸化した銅 -Waxed Oxidized Copper=殆ど酸化した錆止め済み銅 -Oxidized cut copper is a decorative block.=殆ど酸化した溝入り銅は、装飾ブロックです。 -Oxidized Cut Copper=殆ど酸化した溝入り銅 -Waxed Oxidized Cut Copper=殆ど酸化した錆止め済み溝入り銅 -Raw Copper. Mine a Copper Ore to get it.=未処理の銅。銅鉱石を採掘すると手に入ります。 -Raw Copper=銅の粗鉱 -Slab of Cut Copper=溝入り銅のスラブ -Slab of Exposed Cut Copper=少し酸化した溝入り銅のスラブ -Slab of Oxidized Cut Copper=殆ど酸化した溝入り銅のスラブ -Slab of Weathered Cut Copper=半ば酸化した溝入り銅のスラブ -Waxed Slab of Cut Copper=錆止め済み溝入り銅のスラブ -Waxed Slab of Exposed Cut Copper=少し酸化した錆止め済み溝入り銅のスラブ -Waxed Slab of Oxidized Cut Copper=殆ど酸化した錆止め済み溝入り銅のスラブ -Waxed Slab of Weathered Cut Copper=半ば酸化した錆止め済み溝入り銅のスラブ -Some copper contained in stone, it is pretty common and can be found below sea level.=石に含まれる銅は ごく一般的で、海面下の高さで見られます。 -Stairs of Cut Copper=溝入り銅の階段 -Stairs of Exposed Cut Copper=少し酸化した溝入り銅の階段 -Stairs of Oxidized Cut Copper=殆ど酸化した溝入り銅の階段 -Stairs of Weathered Cut Copper=半ば酸化した溝入り銅の階段 -Waxed Stairs of Cut Copper=錆止め済み溝入り銅の階段 -Waxed Stairs of Exposed Cut Copper=少し酸化した錆止め済み溝入り銅の階段 -Waxed Stairs of Oxidized Cut Copper=殆ど酸化した錆止め済み溝入り銅の階段 -Waxed Stairs of Weathered Cut Copper=半ば酸化した錆止め済み溝入り銅の階段 -Weathered copper is a decorative block.=半ば酸化した銅は、装飾ブロックです。 Weathered Copper=半ば酸化した銅 Waxed Weathered Copper=半ば酸化した錆止め済み銅 -Weathered cut copper is a decorative block.=半ば酸化した溝入り銅は、装飾ブロックです。 +Oxidized Copper=殆ど酸化した銅 +Waxed Oxidized Copper=殆ど酸化した錆止め済み銅 +Cut Copper=溝入り銅 +Waxed Cut Copper=錆止め済み溝入り銅 +Exposed Cut Copper=少し酸化した溝入り銅 +Waxed Exposed Cut Copper=少し酸化した錆止め済み溝入り銅 Weathered Cut Copper=半ば酸化した溝入り銅 Waxed Weathered Cut Copper=半ば酸化した錆止め済み溝入り銅 +Oxidized Cut Copper=殆ど酸化した溝入り銅 +Waxed Oxidized Cut Copper=殆ど酸化した錆止め済み溝入り銅 +Copper Grate= +Waxed Copper Grate= +Exposed Copper Grate= +Waxed Exposed Copper Grate= +Weathered Copper Grate= +Waxed Weathered Copper Grate= +Oxidized Copper Grate= +Waxed Oxidized Copper Grate= +Chiseled Copper= +Waxed Chiseled Copper= +Exposed Chiseled Copper= +Waxed Exposed Chiseled Copper= +Weathered Chiseled Copper= +Waxed Weathered Chiseled Copper= +Oxidized Chiseled Copper= +Waxed Oxidized Chiseled Copper= +Copper Bulb= +Waxed Copper Bulb= +Exposed Copper Bulb= +Waxed Exposed Copper Bulb= +Weathered Copper Bulb= +Waxed Weathered Copper Bulb= +Oxidized Copper Bulb= +Waxed Oxidized Copper Bulb= +A block of copper is mostly a decorative block.=銅ブロックは、そのほとんどが装飾ブロックです。 +Exposed copper is a decorative block.=少し酸化した銅は、装飾ブロックです。 +Weathered copper is a decorative block.=半ば酸化した銅は、装飾ブロックです。 +Oxidized copper is a decorative block.=殆ど酸化した銅は、装飾ブロックです。 +Cut copper is a decorative block.=溝入り銅は、装飾ブロックです。 +Exposed cut copper is a decorative block.=少し酸化した溝入り銅は、装飾ブロックです。 +Weathered cut copper is a decorative block.=半ば酸化した溝入り銅は、装飾ブロックです。 +Oxidized cut copper is a decorative block.=殆ど酸化した溝入り銅は、装飾ブロックです。 +Copper grate is a decorative block.= +Exposed copper grate is a decorative block.= +Weathered copper grate is a decorative block.= +Oxidized copper grate is a decorative block.= +Chiseled copper is a decorative block.= +Exposed chiseled copper is a decorative block.= +Weathered chiseled copper is a decorative block.= +Oxidized chiseled copper is a decorative block.= +Copper bulb is a decorative block and a light source when lited.= +Exposed copper bulb is a decorative block and a light source when lited.= +Weathered copper bulb is a decorative block and a light source when lited.= +Oxidized copper bulb is a decorative block and a light source when lited.= +Copper bulb is a decorative block and a light source.= +Exposed copper bulb is a decorative block and a light source.= +Weathered copper bulb is a decorative block and a light source.= +Oxidized copper bulb is a decorative block and a light source.= +Slab of Cut Copper=溝入り銅のスラブ +Double Slab of Cut Copper=溝入り銅の２重スラブ +Stairs of Cut Copper=溝入り銅の階段 +Waxed Slab of Cut Copper=錆止め済み溝入り銅のスラブ +Waxed Double Slab of Cut Copper=錆止め済み溝入り銅の２重スラブ +Waxed Stairs of Cut Copper=錆止め済み溝入り銅の階段 +Slab of Exposed Cut Copper=少し酸化した溝入り銅のスラブ +Double Slab of Exposed Cut Copper=少し酸化した溝入り銅の２重スラブ +Stairs of Exposed Cut Copper=少し酸化した溝入り銅の階段 +Waxed Slab of Exposed Cut Copper=少し酸化した錆止め済み溝入り銅のスラブ +Waxed Double Slab of Exposed Cut Copper=少し酸化した錆止め済み溝入り銅の２重スラブ +Waxed Stairs of Exposed Cut Copper=少し酸化した錆止め済み溝入り銅の階段 +Slab of Weathered Cut Copper=半ば酸化した溝入り銅のスラブ +Double Slab of Weathered Cut Copper=半ば酸化した溝入り銅の２重スラブ +Stairs of Weathered Cut Copper=半ば酸化した溝入り銅の階段 +Waxed Slab of Weathered Cut Copper=半ば酸化した錆止め済み溝入り銅のスラブ +Waxed Double Slab of Weathered Cut Copper=半ば酸化した錆止め済み溝入り銅の２重スラブ +Waxed Stairs of Weathered Cut Copper=半ば酸化した錆止め済み溝入り銅の階段 +Slab of Oxidized Cut Copper=殆ど酸化した溝入り銅のスラブ +Double Slab of Oxidized Cut Copper=殆ど酸化した溝入り銅の２重スラブ +Stairs of Oxidized Cut Copper=殆ど酸化した溝入り銅の階段 +Waxed Slab of Oxidized Cut Copper=殆ど酸化した錆止め済み溝入り銅のスラブ +Waxed Double Slab of Oxidized Cut Copper=殆ど酸化した錆止め済み溝入り銅の２重スラブ +Waxed Stairs of Oxidized Cut Copper=殆ど酸化した錆止め済み溝入り銅の階段 +Copper Door= +Copper Trapdoor= +Waxed Copper Door= +Waxed Copper Trapdoor= +Exposed Copper Door= +Exposed Copper Trapdoor= +Waxed Exposed Copper Door= +Waxed Exposed Copper Trapdoor= +Weathered Copper Door= +Weathered Copper Trapdoor= +Waxed Weathered Copper Door= +Waxed Weathered Copper Trapdoor= +Oxidized Copper Door= +Oxidized Copper Trapdoor= +Waxed Oxidized Copper Door= +Waxed Oxidized Copper Trapdoor= +Copper Ingot=銅インゴット +Molten Raw Copper. It is used to craft blocks.=溶けた未処理の銅。ブロックのクラフトに使われます。 +Raw Copper=銅の粗鉱 +Raw Copper. Mine a Copper Ore to get it.=未処理の銅。銅鉱石を採掘すると手に入ります。 +Copper Ore=銅鉱石 +Some copper contained in stone, it is pretty common and can be found below sea level.=石に含まれる銅は ごく一般的で、海面下の高さで見られます。 +Block of Raw Copper=銅の粗鉱ブロック +A block used for compact raw copper storage.=銅の粗鉱をコンパクトに保管するのに使えるブロックです。 diff --git a/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr b/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr index a5007c209..980979c35 100644 --- a/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr +++ b/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr @@ -1,116 +1,121 @@ # textdomain: mcl_copper -A block of copper is mostly a decorative block.=Um bloco de cobre é principalmente um bloco decorativo. -A block used for compact raw copper storage.=Um bloco usado para armazenar minério de cobre compactado. Block of Copper=Bloco de Cobre Waxed Block of Copper=Bloco de Cobre Encerado -Block of Raw Copper=Bloco de Cobre Crú -Copper Ingot=Lingote de Cobre -Copper Ore=Minério de Cobre -Cut copper is a decorative block.=Cobre lapidado é um bloco decorativo -Cut Copper=Cobre Lapidado -Waxed Cut Copper=Cobre Lapidado Encerado -Double Slab of Cut Copper=Laje Dupla de Cobre Lapidado -Double Slab of Exposed Cut Copper=Laje Dupla de Cobre Lapidado Exposto -Double Slab of Oxidized Cut Copper=Laje Dupla de Cobre Lapidado Oxidado -Double Slab of Weathered Cut Copper=Laje Dupla de Cobre Lapidado Desgastado -Waxed Double Slab of Cut Copper=Laje Dupla de Cobre Lapidado Encerado -Waxed Double Slab of Exposed Cut Copper=Laje Dupla de Cobre Lapidado Exposto Encerado -Waxed Double Slab of Oxidized Cut Copper=Laje Dupla de Cobre Lapidado Oxidado Encerado -Waxed Double Slab of Weathered Cut Copper=Laje Dupla de Cobre Lapidado Desgastado Encerado -Exposed copper is a decorative block.=Cobre exposto é um bloco decorativo. Exposed Copper=Cobre Exposto Waxed Exposed Copper=Cobre Exposto Encerado -Exposed cut copper is a decorative block.=Cobre lapidado encerado é um bloco decorativo. -Exposed Cut Copper=Cobre Lapidado Exposto -Waxed Exposed Cut Copper=Cobre Lapidado Exposto Encerado -Molten Raw Copper. It is used to craft blocks.=Minério de Cobre Fundido. É utilizado para fabricar blocos. -Oxidized copper is a decorative block.=Cobre oxidado é um bloco decorativo. -Oxidized Copper=Cobre Oxidado -Waxed Oxidized Copper=Cobre Oxidado Encerado -Oxidized cut copper is a decorative block.=Cobre lapidado oxidado é um bloco decorativo. -Oxidized Cut Copper=Cobre Lapidado Oxidado -Waxed Oxidized Cut Copper=Cobre Lapidado Oxidado Encerado -Raw Copper. Mine a Copper Ore to get it.=Cobre Crú. Minere um minério de cobre para obtê-lo. -Raw Copper=Cobre Crú -Slab of Cut Copper=Laje de Cobre Lapidado -Slab of Exposed Cut Copper=Laje de Cobre Lapidado Exposto -Slab of Oxidized Cut Copper=Laje de Cobre Lapidado Oxidado -Slab of Weathered Cut Copper=Laje de Cobre Lapidado Desgastado -Waxed Slab of Cut Copper=Laje de Cobre Lapidado Encerado -Waxed Slab of Exposed Cut Copper=Laje de Cobre Lapidado Exposto Encerado -Waxed Slab of Oxidized Cut Copper=Laje de Cobre Lapidado Oxidado Encerado -Waxed Slab of Weathered Cut Copper=Laje de Cobre Lapidado Desgastado Encerado -Some copper contained in stone, it is pretty common and can be found below sea level.=Um pouco de cobre contido em rocha, é bem comum e pode ser encontrado abaixo do nível do mar. -Stairs of Cut Copper=Escadas de Cobre Lapidado -Stairs of Exposed Cut Copper=Escadas de Cobre Lapidado Exposto -Stairs of Oxidized Cut Copper=Escadas de Cobre Lapidado Oxidado -Stairs of Weathered Cut Copper=Escadas de Cobre Lapidado Desgastado -Waxed Stairs of Cut Copper=Escadas de Cobre Lapidado Encerado -Waxed Stairs of Exposed Cut Copper=Escadas de Cobre Lapidado Exposto Encerado -Waxed Stairs of Oxidized Cut Copper=Escadas de Cobre Lapidado Oxidado Encerado -Waxed Stairs of Weathered Cut Copper=Escadas de Cobre Lapidado Desgastado Encerado -Weathered copper is a decorative block.=Cobre desgastado é um bloco decorativo. Weathered Copper=Cobre Desgastado Waxed Weathered Copper=Cobre Desgastado Encerado -Weathered cut copper is a decorative block.=Cobre lapidado desgastado é um bloco decorativo. +Oxidized Copper=Cobre Oxidado +Waxed Oxidized Copper=Cobre Oxidado Encerado +Cut Copper=Cobre Lapidado +Waxed Cut Copper=Cobre Lapidado Encerado +Exposed Cut Copper=Cobre Lapidado Exposto +Waxed Exposed Cut Copper=Cobre Lapidado Exposto Encerado Weathered Cut Copper=Cobre Lapidado Desgastado Waxed Weathered Cut Copper=Cobre Lapidado Desgastado Encerado +Oxidized Cut Copper=Cobre Lapidado Oxidado +Waxed Oxidized Cut Copper=Cobre Lapidado Oxidado Encerado Copper Grate=Grade de Cobre Waxed Copper Grate=Grade de Cobre Encerada -Copper grate is a decorative block.=Grade de cobre é um bloco decorativo. Exposed Copper Grate=Grade de Cobre Exposto Waxed Exposed Copper Grate=Grade de Cobre Exposto Encerada -Exposed copper grate is a decorative block.=Grade de cobre exposto é um bloco decorativo. Weathered Copper Grate=Grade de Cobre Desgastado Waxed Weathered Copper Grate=Grade de Cobre Desgastado Encerada -Weathered opper grate is a decorative block.=Grade de cobre de desgastado é um bloco decorativo. Oxidized Copper Grate=Grade de Cobre Oxidado Waxed Oxidized Copper Grate=Grade de Cobre Oxidado Encerada -Oxidized copper grate is a decorative block.=Grade de cobre oxidado é um bloco decorativo. Chiseled Copper=Cobre Talhado Waxed Chiseled Copper=Cobre Talhado Encerado -Chiseled copper is a decorative block.=Cobre talhado é um bloco decorativo. Exposed Chiseled Copper=Cobre Talhado Exposto Waxed Exposed Chiseled Copper=Cobre Talhado Exposto Encerado -Exposed chiseled copper is a decorative block.=Cobre talhado exposto é um bloco decorativo. Weathered Chiseled Copper=Cobre Talhado Desgastado Waxed Weathered Chiseled Copper=Cobre Talhado Desgastado Encerado -Weathered chiseled copper is a decorative block.=Cobre talhado desgastado é um bloco decorativo. Oxidized Chiseled Copper=Cobre Talhado Oxidado Waxed Oxidized Chiseled Copper=Cobre Talhado Oxidado Encerado -Oxidized chiseled copper is a decorative block.=Cobre talhado oxidado é um bloco decorativo. Copper Bulb=Bulbo de Cobre Waxed Copper Bulb=Bulbo de Cobre Encerado -Copper bulb is a decorative block and a light source.=Bulbo de cobre é um bloco decorativo e uma fonte de luz. -Copper bulb is a decorative block and a light source when lited.=Bulbo de cobre é um bloco decorativo e uma fonte de luz quando aceso. Exposed Copper Bulb=Bulbo de Cobre Exposto Waxed Exposed Copper Bulb=Bulbo de Cobre Exposto Encerado -Exposed copper bulb is a decorative block and a light source.=Bulbo de cobre exposto é um bloco decorativo e uma fonte de luz. -Exposed copper bulb is a decorative block and a light source when lited.=Bulbo de cobre exposto é um bloco decorativo e uma fonte de luz quando aceso. Weathered Copper Bulb=Bulbo de Cobre Desgastado Waxed Weathered Copper Bulb=Bulbo de Cobre Desgastado Encerado -Weathered copper bulb is a decorative block and a light source.=Bulbo de cobre desgastado é um bloco decorativo e uma fonte de luz. -Weathered copper bulb is a decorative block and a light source when lited.=Bulbo de cobre desgastado é um bloco decorativo e uma fonte de luz quando aceso. Oxidized Copper Bulb=Bulbo de Cobre Oxidado Waxed Oxidized Copper Bulb=Bulbo de Cobre Oxidado Encerado -Oxidized copper bulb is a decorative block and a light source.=Bulbo de cobre oxidado é um bloco decorativo e uma fonte de luz. +A block of copper is mostly a decorative block.=Um bloco de cobre é principalmente um bloco decorativo. +Exposed copper is a decorative block.=Cobre exposto é um bloco decorativo. +Weathered copper is a decorative block.=Cobre desgastado é um bloco decorativo. +Oxidized copper is a decorative block.=Cobre oxidado é um bloco decorativo. +Cut copper is a decorative block.=Cobre lapidado é um bloco decorativo +Exposed cut copper is a decorative block.=Cobre lapidado encerado é um bloco decorativo. +Weathered cut copper is a decorative block.=Cobre lapidado desgastado é um bloco decorativo. +Oxidized cut copper is a decorative block.=Cobre lapidado oxidado é um bloco decorativo. +Copper grate is a decorative block.=Grade de cobre é um bloco decorativo. +Exposed copper grate is a decorative block.=Grade de cobre exposto é um bloco decorativo. +Weathered copper grate is a decorative block.= +Oxidized copper grate is a decorative block.=Grade de cobre oxidado é um bloco decorativo. +Chiseled copper is a decorative block.=Cobre talhado é um bloco decorativo. +Exposed chiseled copper is a decorative block.=Cobre talhado exposto é um bloco decorativo. +Weathered chiseled copper is a decorative block.=Cobre talhado desgastado é um bloco decorativo. +Oxidized chiseled copper is a decorative block.=Cobre talhado oxidado é um bloco decorativo. +Copper bulb is a decorative block and a light source when lited.=Bulbo de cobre é um bloco decorativo e uma fonte de luz quando aceso. +Exposed copper bulb is a decorative block and a light source when lited.=Bulbo de cobre exposto é um bloco decorativo e uma fonte de luz quando aceso. +Weathered copper bulb is a decorative block and a light source when lited.=Bulbo de cobre desgastado é um bloco decorativo e uma fonte de luz quando aceso. Oxidized copper bulb is a decorative block and a light source when lited.=Bulbo de cobre oxidado é um bloco decorativo e uma fonte de luz quando aceso. +Copper bulb is a decorative block and a light source.=Bulbo de cobre é um bloco decorativo e uma fonte de luz. +Exposed copper bulb is a decorative block and a light source.=Bulbo de cobre exposto é um bloco decorativo e uma fonte de luz. +Weathered copper bulb is a decorative block and a light source.=Bulbo de cobre desgastado é um bloco decorativo e uma fonte de luz. +Oxidized copper bulb is a decorative block and a light source.=Bulbo de cobre oxidado é um bloco decorativo e uma fonte de luz. +Slab of Cut Copper=Laje de Cobre Lapidado +Double Slab of Cut Copper=Laje Dupla de Cobre Lapidado +Stairs of Cut Copper=Escadas de Cobre Lapidado +Waxed Slab of Cut Copper=Laje de Cobre Lapidado Encerado +Waxed Double Slab of Cut Copper=Laje Dupla de Cobre Lapidado Encerado +Waxed Stairs of Cut Copper=Escadas de Cobre Lapidado Encerado +Slab of Exposed Cut Copper=Laje de Cobre Lapidado Exposto +Double Slab of Exposed Cut Copper=Laje Dupla de Cobre Lapidado Exposto +Stairs of Exposed Cut Copper=Escadas de Cobre Lapidado Exposto +Waxed Slab of Exposed Cut Copper=Laje de Cobre Lapidado Exposto Encerado +Waxed Double Slab of Exposed Cut Copper=Laje Dupla de Cobre Lapidado Exposto Encerado +Waxed Stairs of Exposed Cut Copper=Escadas de Cobre Lapidado Exposto Encerado +Slab of Weathered Cut Copper=Laje de Cobre Lapidado Desgastado +Double Slab of Weathered Cut Copper=Laje Dupla de Cobre Lapidado Desgastado +Stairs of Weathered Cut Copper=Escadas de Cobre Lapidado Desgastado +Waxed Slab of Weathered Cut Copper=Laje de Cobre Lapidado Desgastado Encerado +Waxed Double Slab of Weathered Cut Copper=Laje Dupla de Cobre Lapidado Desgastado Encerado +Waxed Stairs of Weathered Cut Copper=Escadas de Cobre Lapidado Desgastado Encerado +Slab of Oxidized Cut Copper=Laje de Cobre Lapidado Oxidado +Double Slab of Oxidized Cut Copper=Laje Dupla de Cobre Lapidado Oxidado +Stairs of Oxidized Cut Copper=Escadas de Cobre Lapidado Oxidado +Waxed Slab of Oxidized Cut Copper=Laje de Cobre Lapidado Oxidado Encerado +Waxed Double Slab of Oxidized Cut Copper=Laje Dupla de Cobre Lapidado Oxidado Encerado +Waxed Stairs of Oxidized Cut Copper=Escadas de Cobre Lapidado Oxidado Encerado Copper Door=Porta de Cobre -Waxed Copper Door=Porta de Cobre Encerada -Exposed Copper Door=Porta de Cobre Exposto -Waxed Exposed Copper Door=Porta de Cobre Exposto Encerada -Weathered Copper Door=Porta de Cobre Desgastado -Waxed Weathered Copper Door=Porta de Cobre Desgastado Encerada -Oxidized Copper Door=Porta de Cobre Oxidado -Waxed Oxidized Copper Door=Porta de Cobre Oxidado Encerada Copper Trapdoor=Alçapão de Cobre +Waxed Copper Door=Porta de Cobre Encerada Waxed Copper Trapdoor=Alçapão de Cobre Encerado +Exposed Copper Door=Porta de Cobre Exposto Exposed Copper Trapdoor=Alçapão de Cobre Exposto +Waxed Exposed Copper Door=Porta de Cobre Exposto Encerada Waxed Exposed Copper Trapdoor=Alçapão de Cobre Exposto Encerado +Weathered Copper Door=Porta de Cobre Desgastado Weathered Copper Trapdoor=Alçapão de Cobre Desgastado +Waxed Weathered Copper Door=Porta de Cobre Desgastado Encerada Waxed Weathered Copper Trapdoor=Alçapão de Cobre Desgastado Encerado +Oxidized Copper Door=Porta de Cobre Oxidado Oxidized Copper Trapdoor=Alçapão de Cobre Oxidado +Waxed Oxidized Copper Door=Porta de Cobre Oxidado Encerada Waxed Oxidized Copper Trapdoor=Alçapão de Cobre Oxidado Encerado +Copper Ingot=Lingote de Cobre +Molten Raw Copper. It is used to craft blocks.=Minério de Cobre Fundido. É utilizado para fabricar blocos. +Raw Copper=Cobre Crú +Raw Copper. Mine a Copper Ore to get it.=Cobre Crú. Minere um minério de cobre para obtê-lo. +Copper Ore=Minério de Cobre +Some copper contained in stone, it is pretty common and can be found below sea level.=Um pouco de cobre contido em rocha, é bem comum e pode ser encontrado abaixo do nível do mar. +Block of Raw Copper=Bloco de Cobre Crú +A block used for compact raw copper storage.=Um bloco usado para armazenar minério de cobre compactado. + + +##### not used anymore ##### + +Weathered opper grate is a decorative block.=Grade de cobre de desgastado é um bloco decorativo. @1 (Lit)=@1 (Aceso) @1 (Powered)=@1 (Energizado) @1 (Lit and Powered)=@1 (Aceso e Energizado) diff --git a/mods/ITEMS/mcl_copper/locale/mcl_copper.ru.tr b/mods/ITEMS/mcl_copper/locale/mcl_copper.ru.tr index 50600e57b..8191d3f19 100644 --- a/mods/ITEMS/mcl_copper/locale/mcl_copper.ru.tr +++ b/mods/ITEMS/mcl_copper/locale/mcl_copper.ru.tr @@ -1,57 +1,113 @@ # textdomain: mcl_copper -A block of copper is mostly a decorative block.=Медный блок — это декоративный блок. -A block used for compact raw copper storage.=Блок используется для компактного хранения необработанной меди. Block of Copper=Медный блок Waxed Block of Copper=Вощёный медный блок -Block of Raw Copper=Блок необработанной меди -Copper Ingot=Медный слиток -Copper Ore=Медная руда -Cut copper is a decorative block.=Резной медный блок это декоративный блок. -Cut Copper=Резной медный блок -Waxed Cut Copper=Вощёный резной медный блок -Double Slab of Cut Copper=Двойная плита из резного медного блока -Double Slab of Exposed Cut Copper=Двойная плита из потемневшего резного медного блока -Double Slab of Oxidized Cut Copper=Двойная плита из окисленного резного медного блока -Double Slab of Weathered Cut Copper=Двойная плита из состаренного резного медного блока -Waxed Double Slab of Cut Copper=Вощёная двойная плита из резного медного блока -Waxed Double Slab of Exposed Cut Copper=Вощёная двойная плита из потемневшего резного медного блока -Waxed Double Slab of Oxidized Cut Copper=Вощёная двойная плита из окисленного резного медного блока -Waxed Double Slab of Weathered Cut Copper=Вощёная двойная плита из состаренного резного медного блока -Exposed copper is a decorative block.=Потемневший медный блок это декоративный блок. Exposed Copper=Потемневший медный блок Waxed Exposed Copper=Вощёный потемневший медный блок -Exposed cut copper is a decorative block.=Потемневший резной медный блок это декоративный блок. -Exposed Cut Copper=Потемневший резной медный блок -Waxed Exposed Cut Copper=Вощёный потемневший резной медный блок -Molten Raw Copper. It is used to craft blocks.=Медный слиток. Используется для крафта блоков. -Oxidized copper is a decorative block.=Окисленный медный блок это декоративный блок. -Oxidized Copper=Окисленный медный блок -Waxed Oxidized Copper=Вощёный окисленный медный блок -Oxidized cut copper is a decorative block.=Окисленный резной медный блок это декоративный блок. -Oxidized Cut Copper=Окисленный резной медный блок -Waxed Oxidized Cut Copper=Вощёный окисленный резной медный блок -Raw Copper. Mine a Copper Ore to get it.=Необработанная медь. Добудьте медную руду, чтобы получить её. -Raw Copper=Необработанная медь -Slab of Cut Copper=Плита из резного медного блока -Slab of Exposed Cut Copper=Плита из потемневшего резного медного блока -Slab of Oxidized Cut Copper=Плита из окисленного резного медного блока -Slab of Weathered Cut Copper=Плита из состаренного резного медного блока -Waxed Slab of Cut Copper=Вощёная плита из резного медного блока -Waxed Slab of Exposed Cut Copper=Вощёная плита из потемневшего резного медного блока -Waxed Slab of Oxidized Cut Copper=Вощёная плита из окисленного резного медного блока -Waxed Slab of Weathered Cut Copper=Вощёная плита из состаренного резного медного блока -Some copper contained in stone, it is pretty common and can be found below sea level.=Залежи медной руды находятся в камне, медь довольно распространена и может быть найдена ниже уровня моря. -Stairs of Cut Copper=Ступени из резного медного блока -Stairs of Exposed Cut Copper=Ступени из потемневшего резного медного блока -Stairs of Oxidized Cut Copper=Ступени из окисленного резного медного блока -Stairs of Weathered Cut Copper=Ступени из состаренного резного медного блока -Waxed Stairs of Cut Copper=Вощёные ступени из резного медного блока -Waxed Stairs of Exposed Cut Copper=Вощёные ступени из потемневшего резного медного блока -Waxed Stairs of Oxidized Cut Copper=Вощёные ступени из окисленного резного медного блока -Waxed Stairs of Weathered Cut Copper=Вощёные ступени из состаренного резного медного блока -Weathered copper is a decorative block.=Состаренный медный блок это декоративный блок. Weathered Copper=Состаренный медный блок Waxed Weathered Copper=Вощёный состаренный медный блок -Weathered cut copper is a decorative block.=Состаренный резной медный блок это декоративный блок. +Oxidized Copper=Окисленный медный блок +Waxed Oxidized Copper=Вощёный окисленный медный блок +Cut Copper=Резной медный блок +Waxed Cut Copper=Вощёный резной медный блок +Exposed Cut Copper=Потемневший резной медный блок +Waxed Exposed Cut Copper=Вощёный потемневший резной медный блок Weathered Cut Copper=Состаренный резной медный блок Waxed Weathered Cut Copper=Вощёный состаренный резной медный блок +Oxidized Cut Copper=Окисленный резной медный блок +Waxed Oxidized Cut Copper=Вощёный окисленный резной медный блок +Copper Grate= +Waxed Copper Grate= +Exposed Copper Grate= +Waxed Exposed Copper Grate= +Weathered Copper Grate= +Waxed Weathered Copper Grate= +Oxidized Copper Grate= +Waxed Oxidized Copper Grate= +Chiseled Copper= +Waxed Chiseled Copper= +Exposed Chiseled Copper= +Waxed Exposed Chiseled Copper= +Weathered Chiseled Copper= +Waxed Weathered Chiseled Copper= +Oxidized Chiseled Copper= +Waxed Oxidized Chiseled Copper= +Copper Bulb= +Waxed Copper Bulb= +Exposed Copper Bulb= +Waxed Exposed Copper Bulb= +Weathered Copper Bulb= +Waxed Weathered Copper Bulb= +Oxidized Copper Bulb= +Waxed Oxidized Copper Bulb= +A block of copper is mostly a decorative block.=Медный блок — это декоративный блок. +Exposed copper is a decorative block.=Потемневший медный блок это декоративный блок. +Weathered copper is a decorative block.=Состаренный медный блок это декоративный блок. +Oxidized copper is a decorative block.=Окисленный медный блок это декоративный блок. +Cut copper is a decorative block.=Резной медный блок это декоративный блок. +Exposed cut copper is a decorative block.=Потемневший резной медный блок это декоративный блок. +Weathered cut copper is a decorative block.=Состаренный резной медный блок это декоративный блок. +Oxidized cut copper is a decorative block.=Окисленный резной медный блок это декоративный блок. +Copper grate is a decorative block.= +Exposed copper grate is a decorative block.= +Weathered copper grate is a decorative block.= +Oxidized copper grate is a decorative block.= +Chiseled copper is a decorative block.= +Exposed chiseled copper is a decorative block.= +Weathered chiseled copper is a decorative block.= +Oxidized chiseled copper is a decorative block.= +Copper bulb is a decorative block and a light source when lited.= +Exposed copper bulb is a decorative block and a light source when lited.= +Weathered copper bulb is a decorative block and a light source when lited.= +Oxidized copper bulb is a decorative block and a light source when lited.= +Copper bulb is a decorative block and a light source.= +Exposed copper bulb is a decorative block and a light source.= +Weathered copper bulb is a decorative block and a light source.= +Oxidized copper bulb is a decorative block and a light source.= +Slab of Cut Copper=Плита из резного медного блока +Double Slab of Cut Copper=Двойная плита из резного медного блока +Stairs of Cut Copper=Ступени из резного медного блока +Waxed Slab of Cut Copper=Вощёная плита из резного медного блока +Waxed Double Slab of Cut Copper=Вощёная двойная плита из резного медного блока +Waxed Stairs of Cut Copper=Вощёные ступени из резного медного блока +Slab of Exposed Cut Copper=Плита из потемневшего резного медного блока +Double Slab of Exposed Cut Copper=Двойная плита из потемневшего резного медного блока +Stairs of Exposed Cut Copper=Ступени из потемневшего резного медного блока +Waxed Slab of Exposed Cut Copper=Вощёная плита из потемневшего резного медного блока +Waxed Double Slab of Exposed Cut Copper=Вощёная двойная плита из потемневшего резного медного блока +Waxed Stairs of Exposed Cut Copper=Вощёные ступени из потемневшего резного медного блока +Slab of Weathered Cut Copper=Плита из состаренного резного медного блока +Double Slab of Weathered Cut Copper=Двойная плита из состаренного резного медного блока +Stairs of Weathered Cut Copper=Ступени из состаренного резного медного блока +Waxed Slab of Weathered Cut Copper=Вощёная плита из состаренного резного медного блока +Waxed Double Slab of Weathered Cut Copper=Вощёная двойная плита из состаренного резного медного блока +Waxed Stairs of Weathered Cut Copper=Вощёные ступени из состаренного резного медного блока +Slab of Oxidized Cut Copper=Плита из окисленного резного медного блока +Double Slab of Oxidized Cut Copper=Двойная плита из окисленного резного медного блока +Stairs of Oxidized Cut Copper=Ступени из окисленного резного медного блока +Waxed Slab of Oxidized Cut Copper=Вощёная плита из окисленного резного медного блока +Waxed Double Slab of Oxidized Cut Copper=Вощёная двойная плита из окисленного резного медного блока +Waxed Stairs of Oxidized Cut Copper=Вощёные ступени из окисленного резного медного блока +Copper Door= +Copper Trapdoor= +Waxed Copper Door= +Waxed Copper Trapdoor= +Exposed Copper Door= +Exposed Copper Trapdoor= +Waxed Exposed Copper Door= +Waxed Exposed Copper Trapdoor= +Weathered Copper Door= +Weathered Copper Trapdoor= +Waxed Weathered Copper Door= +Waxed Weathered Copper Trapdoor= +Oxidized Copper Door= +Oxidized Copper Trapdoor= +Waxed Oxidized Copper Door= +Waxed Oxidized Copper Trapdoor= +Copper Ingot=Медный слиток +Molten Raw Copper. It is used to craft blocks.=Медный слиток. Используется для крафта блоков. +Raw Copper=Необработанная медь +Raw Copper. Mine a Copper Ore to get it.=Необработанная медь. Добудьте медную руду, чтобы получить её. +Copper Ore=Медная руда +Some copper contained in stone, it is pretty common and can be found below sea level.=Залежи медной руды находятся в камне, медь довольно распространена и может быть найдена ниже уровня моря. +Block of Raw Copper=Блок необработанной меди +A block used for compact raw copper storage.=Блок используется для компактного хранения необработанной меди. diff --git a/mods/ITEMS/mcl_copper/locale/template.txt b/mods/ITEMS/mcl_copper/locale/template.txt index cca2eb983..7a58d8595 100644 --- a/mods/ITEMS/mcl_copper/locale/template.txt +++ b/mods/ITEMS/mcl_copper/locale/template.txt @@ -1,116 +1,113 @@ # textdomain: mcl_copper -A block of copper is mostly a decorative block.= -A block used for compact raw copper storage.= Block of Copper= Waxed Block of Copper= -Block of Raw Copper= -Copper Ingot= -Copper Ore= -Cut copper is a decorative block.= -Cut Copper= -Waxed Cut Copper= -Double Slab of Cut Copper= -Double Slab of Exposed Cut Copper= -Double Slab of Oxidized Cut Copper= -Double Slab of Weathered Cut Copper= -Waxed Double Slab of Cut Copper= -Waxed Double Slab of Exposed Cut Copper= -Waxed Double Slab of Oxidized Cut Copper= -Waxed Double Slab of Weathered Cut Copper= -Exposed copper is a decorative block.= Exposed Copper= Waxed Exposed Copper= -Exposed cut copper is a decorative block.= -Exposed Cut Copper= -Waxed Exposed Cut Copper= -Molten Raw Copper. It is used to craft blocks.= -Oxidized copper is a decorative block.= -Oxidized Copper= -Waxed Oxidized Copper= -Oxidized cut copper is a decorative block.= -Oxidized Cut Copper= -Waxed Oxidized Cut Copper= -Raw Copper. Mine a Copper Ore to get it.= -Raw Copper= -Slab of Cut Copper= -Slab of Exposed Cut Copper= -Slab of Oxidized Cut Copper= -Slab of Weathered Cut Copper= -Waxed Slab of Cut Copper= -Waxed Slab of Exposed Cut Copper= -Waxed Slab of Oxidized Cut Copper= -Waxed Slab of Weathered Cut Copper= -Some copper contained in stone, it is pretty common and can be found below sea level.= -Stairs of Cut Copper= -Stairs of Exposed Cut Copper= -Stairs of Oxidized Cut Copper= -Stairs of Weathered Cut Copper= -Waxed Stairs of Cut Copper= -Waxed Stairs of Exposed Cut Copper= -Waxed Stairs of Oxidized Cut Copper= -Waxed Stairs of Weathered Cut Copper= -Weathered copper is a decorative block.= Weathered Copper= Waxed Weathered Copper= -Weathered cut copper is a decorative block.= +Oxidized Copper= +Waxed Oxidized Copper= +Cut Copper= +Waxed Cut Copper= +Exposed Cut Copper= +Waxed Exposed Cut Copper= Weathered Cut Copper= Waxed Weathered Cut Copper= +Oxidized Cut Copper= +Waxed Oxidized Cut Copper= Copper Grate= Waxed Copper Grate= -Copper grate is a decorative block.= Exposed Copper Grate= Waxed Exposed Copper Grate= -Exposed copper grate is a decorative block.= Weathered Copper Grate= Waxed Weathered Copper Grate= -Weathered copper grate is a decorative block.= Oxidized Copper Grate= Waxed Oxidized Copper Grate= -Oxidized copper grate is a decorative block.= Chiseled Copper= Waxed Chiseled Copper= -Chiseled copper is a decorative block.= Exposed Chiseled Copper= Waxed Exposed Chiseled Copper= -Exposed chiseled copper is a decorative block.= Weathered Chiseled Copper= Waxed Weathered Chiseled Copper= -Weathered chiseled copper is a decorative block.= Oxidized Chiseled Copper= Waxed Oxidized Chiseled Copper= -Oxidized chiseled copper is a decorative block.= Copper Bulb= Waxed Copper Bulb= -Copper bulb is a decorative block and a light source.= -Copper bulb is a decorative block and a light source when lited.= Exposed Copper Bulb= Waxed Exposed Copper Bulb= -Exposed copper bulb is a decorative block and a light source.= -Exposed copper bulb is a decorative block and a light source when lited.= Weathered Copper Bulb= Waxed Weathered Copper Bulb= -Weathered copper bulb is a decorative block and a light source.= -Weathered copper bulb is a decorative block and a light source when lited.= Oxidized Copper Bulb= Waxed Oxidized Copper Bulb= -Oxidized copper bulb is a decorative block and a light source.= +A block of copper is mostly a decorative block.= +Exposed copper is a decorative block.= +Weathered copper is a decorative block.= +Oxidized copper is a decorative block.= +Cut copper is a decorative block.= +Exposed cut copper is a decorative block.= +Weathered cut copper is a decorative block.= +Oxidized cut copper is a decorative block.= +Copper grate is a decorative block.= +Exposed copper grate is a decorative block.= +Weathered copper grate is a decorative block.= +Oxidized copper grate is a decorative block.= +Chiseled copper is a decorative block.= +Exposed chiseled copper is a decorative block.= +Weathered chiseled copper is a decorative block.= +Oxidized chiseled copper is a decorative block.= +Copper bulb is a decorative block and a light source when lited.= +Exposed copper bulb is a decorative block and a light source when lited.= +Weathered copper bulb is a decorative block and a light source when lited.= Oxidized copper bulb is a decorative block and a light source when lited.= +Copper bulb is a decorative block and a light source.= +Exposed copper bulb is a decorative block and a light source.= +Weathered copper bulb is a decorative block and a light source.= +Oxidized copper bulb is a decorative block and a light source.= +Slab of Cut Copper= +Double Slab of Cut Copper= +Stairs of Cut Copper= +Waxed Slab of Cut Copper= +Waxed Double Slab of Cut Copper= +Waxed Stairs of Cut Copper= +Slab of Exposed Cut Copper= +Double Slab of Exposed Cut Copper= +Stairs of Exposed Cut Copper= +Waxed Slab of Exposed Cut Copper= +Waxed Double Slab of Exposed Cut Copper= +Waxed Stairs of Exposed Cut Copper= +Slab of Weathered Cut Copper= +Double Slab of Weathered Cut Copper= +Stairs of Weathered Cut Copper= +Waxed Slab of Weathered Cut Copper= +Waxed Double Slab of Weathered Cut Copper= +Waxed Stairs of Weathered Cut Copper= +Slab of Oxidized Cut Copper= +Double Slab of Oxidized Cut Copper= +Stairs of Oxidized Cut Copper= +Waxed Slab of Oxidized Cut Copper= +Waxed Double Slab of Oxidized Cut Copper= +Waxed Stairs of Oxidized Cut Copper= Copper Door= -Waxed Copper Door= -Exposed Copper Door= -Waxed Exposed Copper Door= -Weathered Copper Door= -Waxed Weathered Copper Door= -Oxidized Copper Door= -Waxed Oxidized Copper Door= Copper Trapdoor= +Waxed Copper Door= Waxed Copper Trapdoor= +Exposed Copper Door= Exposed Copper Trapdoor= +Waxed Exposed Copper Door= Waxed Exposed Copper Trapdoor= +Weathered Copper Door= Weathered Copper Trapdoor= +Waxed Weathered Copper Door= Waxed Weathered Copper Trapdoor= +Oxidized Copper Door= Oxidized Copper Trapdoor= +Waxed Oxidized Copper Door= Waxed Oxidized Copper Trapdoor= -@1 (Lit)= -@1 (Powered)= -@1 (Lit and Powered)= +Copper Ingot= +Molten Raw Copper. It is used to craft blocks.= +Raw Copper= +Raw Copper. Mine a Copper Ore to get it.= +Copper Ore= +Some copper contained in stone, it is pretty common and can be found below sea level.= +Block of Raw Copper= +A block used for compact raw copper storage.= From 3f04723c8ccf71f7d17875fed794005e54e999b2 Mon Sep 17 00:00:00 2001 From: JoseDouglas26 Date: Sun, 5 May 2024 09:27:43 -0300 Subject: [PATCH 10/13] Remove unused translation lines --- mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr b/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr index 980979c35..e33bf8d8c 100644 --- a/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr +++ b/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr @@ -49,7 +49,7 @@ Weathered cut copper is a decorative block.=Cobre lapidado desgastado é um bloc Oxidized cut copper is a decorative block.=Cobre lapidado oxidado é um bloco decorativo. Copper grate is a decorative block.=Grade de cobre é um bloco decorativo. Exposed copper grate is a decorative block.=Grade de cobre exposto é um bloco decorativo. -Weathered copper grate is a decorative block.= +Weathered copper grate is a decorative block.=Grade de cobre de desgastado é um bloco decorativo. Oxidized copper grate is a decorative block.=Grade de cobre oxidado é um bloco decorativo. Chiseled copper is a decorative block.=Cobre talhado é um bloco decorativo. Exposed chiseled copper is a decorative block.=Cobre talhado exposto é um bloco decorativo. @@ -111,11 +111,3 @@ Copper Ore=Minério de Cobre Some copper contained in stone, it is pretty common and can be found below sea level.=Um pouco de cobre contido em rocha, é bem comum e pode ser encontrado abaixo do nível do mar. Block of Raw Copper=Bloco de Cobre Crú A block used for compact raw copper storage.=Um bloco usado para armazenar minério de cobre compactado. - - -##### not used anymore ##### - -Weathered opper grate is a decorative block.=Grade de cobre de desgastado é um bloco decorativo. -@1 (Lit)=@1 (Aceso) -@1 (Powered)=@1 (Energizado) -@1 (Lit and Powered)=@1 (Aceso e Energizado) From 1e084612b01105f7a689daf8edcfc2ac796a16a1 Mon Sep 17 00:00:00 2001 From: JoseDouglas26 Date: Sun, 5 May 2024 10:04:20 -0300 Subject: [PATCH 11/13] Changes on translation-related files --- mods/ITEMS/mcl_copper/descriptions.lua | 38 ++++++++++++------- mods/ITEMS/mcl_copper/locale/mcl_copper.de.tr | 3 ++ mods/ITEMS/mcl_copper/locale/mcl_copper.fr.tr | 3 ++ mods/ITEMS/mcl_copper/locale/mcl_copper.ja.tr | 3 ++ .../mcl_copper/locale/mcl_copper.pt_BR.tr | 3 ++ mods/ITEMS/mcl_copper/locale/mcl_copper.ru.tr | 3 ++ mods/ITEMS/mcl_copper/locale/template.txt | 3 ++ 7 files changed, 42 insertions(+), 14 deletions(-) diff --git a/mods/ITEMS/mcl_copper/descriptions.lua b/mods/ITEMS/mcl_copper/descriptions.lua index 0715bf803..e6d67681c 100644 --- a/mods/ITEMS/mcl_copper/descriptions.lua +++ b/mods/ITEMS/mcl_copper/descriptions.lua @@ -1,7 +1,5 @@ local S = minetest.get_translator("mcl_copper") local lit_desc = "(Lit)" -local pow_desc = "(Powered)" -local mix_desc = "(Lit and Powered)" mcl_copper.copper_descs = { ["block"] = { @@ -35,22 +33,34 @@ mcl_copper.copper_descs = { S("Oxidized Copper Bulb"), S("Waxed Oxidized Copper Bulb") }, ["bulb_on"] = { - S("Copper Bulb "..lit_desc), S("Waxed Copper Bulb "..lit_desc), - S("Exposed Copper Bulb "..lit_desc), S("Waxed Exposed Copper Bulb "..lit_desc), - S("Weathered Copper Bulb "..lit_desc), S("Waxed Weathered Copper Bulb "..lit_desc), - S("Oxidized Copper Bulb "..lit_desc), S("Waxed Oxidized Copper Bulb "..lit_desc) + S("Copper Bulb").." "..S("(Lit)"), + S("Waxed Copper Bulb").." "..S("(Lit)"), + S("Exposed Copper Bulb").." "..S("(Lit)"), + S("Waxed Exposed Copper Bulb").." "..S("(Lit)"), + S("Weathered Copper Bulb").." "..S("(Lit)"), + S("Waxed Weathered Copper Bulb").." "..S("(Lit)"), + S("Oxidized Copper Bulb").." "..S("(Lit)"), + S("Waxed Oxidized Copper Bulb").." "..S("(Lit)") }, ["bulb_powered_off"] = { - S("Copper Bulb "..pow_desc), S("Waxed Copper Bulb "..pow_desc), - S("Exposed Copper Bulb "..pow_desc), S("Waxed Exposed Copper Bulb "..pow_desc), - S("Weathered Copper Bulb "..pow_desc), S("Waxed Weathered Copper Bulb "..pow_desc), - S("Oxidized Copper Bulb "..pow_desc), S("Waxed Oxidized Copper Bulb "..pow_desc) + S("Copper Bulb").." "..S("(Powered)"), + S("Waxed Copper Bulb").." "..S("(Powered)"), + S("Exposed Copper Bulb").." "..S("(Powered)"), + S("Waxed Exposed Copper Bulb").." "..S("(Powered)"), + S("Weathered Copper Bulb").." "..S("(Powered)"), + S("Waxed Weathered Copper Bulb").." "..S("(Powered)"), + S("Oxidized Copper Bulb").." "..S("(Powered)"), + S("Waxed Oxidized Copper Bulb").." "..S("(Powered)") }, ["bulb_powered_on"] = { - S("Copper Bulb "..mix_desc), S("Waxed Copper Bulb "..mix_desc), - S("Exposed Copper Bulb "..mix_desc), S("Waxed Exposed Copper Bulb "..mix_desc), - S("Weathered Copper Bulb "..mix_desc), S("Waxed Weathered Copper Bulb "..mix_desc), - S("Oxidized Copper Bulb "..mix_desc), S("Waxed Oxidized Copper Bulb "..mix_desc) + S("Copper Bulb").." "..S("(Lit and Powered)"), + S("Waxed Copper Bulb").." "..S("(Lit and Powered)"), + S("Exposed Copper Bulb").." "..S("(Lit and Powered)"), + S("Waxed Exposed Copper Bulb").." "..S("(Lit and Powered)"), + S("Weathered Copper Bulb").." "..S("(Lit and Powered)"), + S("Waxed Weathered Copper Bulb").." "..S("(Lit and Powered)"), + S("Oxidized Copper Bulb").." "..S("(Lit and Powered)"), + S("Waxed Oxidized Copper Bulb").." "..S("(Lit and Powered)") } } diff --git a/mods/ITEMS/mcl_copper/locale/mcl_copper.de.tr b/mods/ITEMS/mcl_copper/locale/mcl_copper.de.tr index 94adb315f..7adb2af0c 100644 --- a/mods/ITEMS/mcl_copper/locale/mcl_copper.de.tr +++ b/mods/ITEMS/mcl_copper/locale/mcl_copper.de.tr @@ -39,6 +39,9 @@ Weathered Copper Bulb= Waxed Weathered Copper Bulb= Oxidized Copper Bulb= Waxed Oxidized Copper Bulb= +(Lit)= +(Powered)= +(Lit and Powered)= A block of copper is mostly a decorative block.=Ein Kupferblock wird meistens als dekorativer Block verwendet. Exposed copper is a decorative block.=Ein Angelaufener Kupferblock ist ein dekorativer Block. Weathered copper is a decorative block.=Ein Verwitterter Kupferblock ist ein dekorativer Block. diff --git a/mods/ITEMS/mcl_copper/locale/mcl_copper.fr.tr b/mods/ITEMS/mcl_copper/locale/mcl_copper.fr.tr index 36f9754fb..9fed41cc8 100644 --- a/mods/ITEMS/mcl_copper/locale/mcl_copper.fr.tr +++ b/mods/ITEMS/mcl_copper/locale/mcl_copper.fr.tr @@ -39,6 +39,9 @@ Weathered Copper Bulb= Waxed Weathered Copper Bulb= Oxidized Copper Bulb= Waxed Oxidized Copper Bulb= +(Lit)= +(Powered)= +(Lit and Powered)= A block of copper is mostly a decorative block.=Le bloc de cuivre est surtout un bloc décoratif. Exposed copper is a decorative block.=Le cuivre exposé est un bloc décoratif. Weathered copper is a decorative block.=Le cuivre érodé est un bloc décoratif. diff --git a/mods/ITEMS/mcl_copper/locale/mcl_copper.ja.tr b/mods/ITEMS/mcl_copper/locale/mcl_copper.ja.tr index 8bac1e0a6..2d37e0319 100644 --- a/mods/ITEMS/mcl_copper/locale/mcl_copper.ja.tr +++ b/mods/ITEMS/mcl_copper/locale/mcl_copper.ja.tr @@ -39,6 +39,9 @@ Weathered Copper Bulb= Waxed Weathered Copper Bulb= Oxidized Copper Bulb= Waxed Oxidized Copper Bulb= +(Lit)= +(Powered)= +(Lit and Powered)= A block of copper is mostly a decorative block.=銅ブロックは、そのほとんどが装飾ブロックです。 Exposed copper is a decorative block.=少し酸化した銅は、装飾ブロックです。 Weathered copper is a decorative block.=半ば酸化した銅は、装飾ブロックです。 diff --git a/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr b/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr index e33bf8d8c..71ee7d2f8 100644 --- a/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr +++ b/mods/ITEMS/mcl_copper/locale/mcl_copper.pt_BR.tr @@ -39,6 +39,9 @@ Weathered Copper Bulb=Bulbo de Cobre Desgastado Waxed Weathered Copper Bulb=Bulbo de Cobre Desgastado Encerado Oxidized Copper Bulb=Bulbo de Cobre Oxidado Waxed Oxidized Copper Bulb=Bulbo de Cobre Oxidado Encerado +(Lit)=(Aceso) +(Powered)=(Energizado) +(Lit and Powered)=(Aceso e Energizado) A block of copper is mostly a decorative block.=Um bloco de cobre é principalmente um bloco decorativo. Exposed copper is a decorative block.=Cobre exposto é um bloco decorativo. Weathered copper is a decorative block.=Cobre desgastado é um bloco decorativo. diff --git a/mods/ITEMS/mcl_copper/locale/mcl_copper.ru.tr b/mods/ITEMS/mcl_copper/locale/mcl_copper.ru.tr index 8191d3f19..89d7e1bbe 100644 --- a/mods/ITEMS/mcl_copper/locale/mcl_copper.ru.tr +++ b/mods/ITEMS/mcl_copper/locale/mcl_copper.ru.tr @@ -39,6 +39,9 @@ Weathered Copper Bulb= Waxed Weathered Copper Bulb= Oxidized Copper Bulb= Waxed Oxidized Copper Bulb= +(Lit)= +(Powered)= +(Lit and Powered)= A block of copper is mostly a decorative block.=Медный блок — это декоративный блок. Exposed copper is a decorative block.=Потемневший медный блок это декоративный блок. Weathered copper is a decorative block.=Состаренный медный блок это декоративный блок. diff --git a/mods/ITEMS/mcl_copper/locale/template.txt b/mods/ITEMS/mcl_copper/locale/template.txt index 7a58d8595..f1bfb78f5 100644 --- a/mods/ITEMS/mcl_copper/locale/template.txt +++ b/mods/ITEMS/mcl_copper/locale/template.txt @@ -39,6 +39,9 @@ Weathered Copper Bulb= Waxed Weathered Copper Bulb= Oxidized Copper Bulb= Waxed Oxidized Copper Bulb= +(Lit)= +(Powered)= +(Lit and Powered)= A block of copper is mostly a decorative block.= Exposed copper is a decorative block.= Weathered copper is a decorative block.= From f8cadd77258279a0141657d52ea031f079c6f7ba Mon Sep 17 00:00:00 2001 From: JoseDouglas26 Date: Sun, 5 May 2024 10:53:41 -0300 Subject: [PATCH 12/13] Comments on crafting.lua --- mods/ITEMS/mcl_copper/crafting.lua | 83 ++++++++++++++++++------------ 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/mods/ITEMS/mcl_copper/crafting.lua b/mods/ITEMS/mcl_copper/crafting.lua index 628173e3f..0b0217d0d 100644 --- a/mods/ITEMS/mcl_copper/crafting.lua +++ b/mods/ITEMS/mcl_copper/crafting.lua @@ -1,39 +1,28 @@ -minetest.register_craft({ - output = "mcl_copper:block_raw", - recipe = { - { "mcl_copper:raw_copper", "mcl_copper:raw_copper", "mcl_copper:raw_copper" }, - { "mcl_copper:raw_copper", "mcl_copper:raw_copper", "mcl_copper:raw_copper" }, - { "mcl_copper:raw_copper", "mcl_copper:raw_copper", "mcl_copper:raw_copper" }, - }, -}) - -minetest.register_craft({ - output = "mcl_copper:block", - recipe = { - { "mcl_copper:copper_ingot", "mcl_copper:copper_ingot", "mcl_copper:copper_ingot" }, - { "mcl_copper:copper_ingot", "mcl_copper:copper_ingot", "mcl_copper:copper_ingot" }, - { "mcl_copper:copper_ingot", "mcl_copper:copper_ingot", "mcl_copper:copper_ingot" }, - }, -}) - +--- This function determines the format of the crafting recipe in the crafting grid based on the +---block name. Each block must have its own crafting format for the given material(s). +---Some materials in the recipe can be pre-defined (e.g. copper bulbs have fixed materials +--(blaze stick and redstone) and materials that vary according to the material parameter) +---@param name string +---@param material string +---@return table local function get_shape(name, material) - if name == "cut" then + if name == "cut" then -- Shape of cut copper blocks return { {material, material}, {material, material} } - elseif name == "grate" then + elseif name == "grate" then -- Shape of copper grates return { {"", material, ""}, {material, "", material}, {"", material, ""} } - elseif name == "chiseled" then + elseif name == "chiseled" then -- Shape of chiseled copper blocks return { {material}, {material}, } - elseif name == "bulb_off" then + elseif name == "bulb_off" then -- Shape of copper bulbs (with fixed materials) return { {"", material, ""}, {material, "mcl_mobitems:blaze_rod", material}, @@ -44,10 +33,19 @@ local function get_shape(name, material) end end +--- This function is responsible for recording the recipes for each block (including oxidized variants). +--- If the recipe's main material is the Block of Copper, the material parameter must be passed as "block". +--- If the main material is another block (as in the case of the chiseled copper block), the material +--- parameter must be a table containing 8 itemstrings of the blocks used in the recipes. +--- Special fixed materials (such as copper bulbs) must be registered to the crafting grid format in the +--- get_shape function. +---@param name string +---@param material string|table +---@param amount integer local function register_variants_recipes(name, material, amount) local names local materials = {} - + -- Handling the inconsistency of the original itemstrings if name ~= "cut" then names = { name, "waxed_"..name, @@ -63,7 +61,7 @@ local function register_variants_recipes(name, material, amount) "block_oxidized_"..name, "waxed_block_oxidized_"..name } end - + -- Checking the type of material if type(material) == "string" then materials = { "mcl_copper:"..material, "mcl_copper:waxed_"..material, @@ -74,7 +72,10 @@ local function register_variants_recipes(name, material, amount) else materials = material end - + --[[ + Registering each recipe according to the materials + blocks made from copper and its oxidized and waxed variations) + ]] for i = 1, 8 do minetest.register_craft({ output = "mcl_copper:"..names[i].." "..tostring(amount), @@ -82,11 +83,11 @@ local function register_variants_recipes(name, material, amount) }) end end - +-- Using the function above to record the recipes for cut copper blocks, copper grates and copper bulbs register_variants_recipes("cut", "block", 4) register_variants_recipes("grate", "block", 4) register_variants_recipes("bulb_off", "block", 4) - +-- Chiseled copper uses slabs as the main material. local chiseled_materials = { "mcl_stairs:slab_copper_cut", "mcl_stairs:slab_waxed_copper_cut", @@ -97,9 +98,9 @@ local chiseled_materials = { "mcl_stairs:slab_copper_oxidized_cut", "mcl_stairs:slab_waxed_copper_oxidized_cut" } - +-- Registering recipes for chiseled copper blocks using the slabs. register_variants_recipes("chiseled", chiseled_materials, 1) - +-- List of blocks that can be waxed. local waxable_blocks = { "block", "block_cut", @@ -122,7 +123,7 @@ local waxable_blocks = { "chiseled_oxidized", "bulb_off_oxidized" } - +-- Registering the waxing recipes for each block listed above. for _, w in ipairs(waxable_blocks) do minetest.register_craft({ output = "mcl_copper:waxed_"..w, @@ -131,7 +132,7 @@ for _, w in ipairs(waxable_blocks) do }, }) end - +-- List of blocks that can be cutted on stonecutter local cuttable_blocks = { "block", "waxed_block", @@ -142,13 +143,31 @@ local cuttable_blocks = { "block_oxidized", "waxed_block_oxidized" } - +-- Registering stonecutter recipes using the blocks listed above. for _, c in ipairs(cuttable_blocks) do mcl_stonecutter.register_recipe("mcl_copper:"..c, "mcl_copper:"..c.."_cut", 4) --mcl_stonecutter.register_recipe("mcl_copper:"..c, "mcl_copper:"..c:gsub("block", "grate"), 4) --mcl_stonecutter.register_recipe("mcl_copper:"..c, "mcl_copper:"..c:gsub("block", "chiseled"), 4) --mcl_stonecutter.register_recipe("mcl_copper:"..c.."_cut", "mcl_copper:"..c:gsub("block", "chiseled")) end +-- Registering blocks and items specific recipes +minetest.register_craft({ + output = "mcl_copper:block_raw", + recipe = { + { "mcl_copper:raw_copper", "mcl_copper:raw_copper", "mcl_copper:raw_copper" }, + { "mcl_copper:raw_copper", "mcl_copper:raw_copper", "mcl_copper:raw_copper" }, + { "mcl_copper:raw_copper", "mcl_copper:raw_copper", "mcl_copper:raw_copper" }, + }, +}) + +minetest.register_craft({ + output = "mcl_copper:block", + recipe = { + { "mcl_copper:copper_ingot", "mcl_copper:copper_ingot", "mcl_copper:copper_ingot" }, + { "mcl_copper:copper_ingot", "mcl_copper:copper_ingot", "mcl_copper:copper_ingot" }, + { "mcl_copper:copper_ingot", "mcl_copper:copper_ingot", "mcl_copper:copper_ingot" }, + }, +}) minetest.register_craft({ output = "mcl_copper:copper_ingot 9", From 96e042f3efdef56b48c2249caf037abc1a0318c7 Mon Sep 17 00:00:00 2001 From: JoseDouglas26 Date: Sun, 5 May 2024 11:05:42 -0300 Subject: [PATCH 13/13] Comments on mcl_copper/init.lua --- mods/ITEMS/mcl_copper/init.lua | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_copper/init.lua b/mods/ITEMS/mcl_copper/init.lua index e300f9143..7e3cf48e1 100644 --- a/mods/ITEMS/mcl_copper/init.lua +++ b/mods/ITEMS/mcl_copper/init.lua @@ -1,9 +1,17 @@ -local path = minetest.get_modpath("mcl_copper") +local path = minetest.get_modpath("mcl_copper") -- Getting mcl_copper mod path -mcl_copper = {} -- initialize global variable. +mcl_copper = {} -- Initializing global variable mcl_copper. +-- Loading the file containing the descriptions and longdescs of each block dofile(path .. "/descriptions.lua") +-- Loading the file that registers all blocks provided by this mod dofile(path .. "/nodes.lua") +-- Loading the file that registers craftitems dofile(path .. "/items.lua") +-- Loading the file that registers the blocks crafting recipes dofile(path .. "/crafting.lua") +--[[ + Loading the file that handles oxidized, waxed and stripped variants for blocks that are registered + in other mods and normally do not have these variants. +]] dofile(path .. "/functions.lua")