From f702a6597ba86569ebd894a1698608f60418f634 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Tue, 30 Oct 2018 20:29:46 -0400 Subject: [PATCH 01/13] fix missing worldgen depends --- technic_worldgen/depends.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/technic_worldgen/depends.txt b/technic_worldgen/depends.txt index ac858d0..3b1e4d0 100644 --- a/technic_worldgen/depends.txt +++ b/technic_worldgen/depends.txt @@ -1,3 +1,8 @@ default intllib? mg? +doors? +farming? +glooptest? +mesecons_doors? +vessels? From 44cb8df048e09b64214f59db73a3fd23cfe12e77 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Tue, 30 Oct 2018 20:29:28 -0400 Subject: [PATCH 02/13] use basic_materials mod where possible. --- concrete/depends.txt | 1 + concrete/init.lua | 40 ++--------- concrete/textures/technic_concrete_block.png | Bin 500 -> 0 bytes concrete/textures/technic_rebar.png | Bin 813 -> 0 bytes extranodes/depends.txt | 1 + extranodes/init.lua | 6 +- technic/crafts.lua | 63 ++++++------------ technic/depends.txt | 1 + technic/items.lua | 21 ------ technic/machines/HV/forcefield.lua | 2 +- technic/machines/HV/quarry.lua | 2 +- technic/machines/LV/cnc.lua | 2 +- technic/machines/LV/compressor.lua | 10 ++- technic/machines/LV/extractor.lua | 2 +- technic/machines/LV/geothermal.lua | 8 ++- technic/machines/LV/solar_panel.lua | 6 +- technic/machines/MV/centrifuge.lua | 2 +- technic/machines/MV/wind_mill.lua | 2 +- technic/machines/other/frames.lua | 12 ++-- technic/machines/register/alloy_recipes.lua | 2 +- technic/machines/register/grinder_recipes.lua | 2 +- technic/machines/supply_converter.lua | 5 +- technic/radiation.lua | 2 +- technic/textures/technic_fine_copper_wire.png | Bin 501 -> 0 bytes technic/textures/technic_fine_gold_wire.png | Bin 474 -> 0 bytes technic/textures/technic_fine_silver_wire.png | Bin 546 -> 0 bytes technic/textures/technic_motor.png | Bin 2517 -> 0 bytes technic/tools/chainsaw.lua | 6 +- technic/tools/mining_drill.lua | 2 +- technic/tools/mining_lasers.lua | 4 +- technic/tools/prospector.lua | 2 +- technic/tools/vacuum.lua | 2 +- technic_chests/copper_chest.lua | 2 +- technic_chests/depends.txt | 2 + technic_chests/gold_chest.lua | 2 +- technic_chests/init.lua | 57 ++++++++++++++++ technic_chests/iron_chest.lua | 2 +- technic_chests/mithril_chest.lua | 2 +- technic_chests/silver_chest.lua | 2 +- technic_worldgen/crafts.lua | 6 -- technic_worldgen/depends.txt | 1 + technic_worldgen/nodes.lua | 8 --- .../textures/technic_brass_block.png | Bin 649 -> 0 bytes .../textures/technic_brass_ingot.png | Bin 377 -> 0 bytes 44 files changed, 139 insertions(+), 153 deletions(-) delete mode 100644 concrete/textures/technic_concrete_block.png delete mode 100644 concrete/textures/technic_rebar.png delete mode 100644 technic/textures/technic_fine_copper_wire.png delete mode 100644 technic/textures/technic_fine_gold_wire.png delete mode 100644 technic/textures/technic_fine_silver_wire.png delete mode 100644 technic/textures/technic_motor.png delete mode 100644 technic_worldgen/textures/technic_brass_block.png delete mode 100644 technic_worldgen/textures/technic_brass_ingot.png diff --git a/concrete/depends.txt b/concrete/depends.txt index c48fe0d..269e83a 100644 --- a/concrete/depends.txt +++ b/concrete/depends.txt @@ -1,3 +1,4 @@ default +basic_materials intllib? diff --git a/concrete/init.lua b/concrete/init.lua index ca04733..1da6a51 100644 --- a/concrete/init.lua +++ b/concrete/init.lua @@ -23,24 +23,6 @@ else steel_ingot = "default:steel_ingot" end -minetest.register_craft({ - output = 'technic:rebar 6', - recipe = { - {'','', steel_ingot}, - {'',steel_ingot,''}, - {steel_ingot, '', ''}, - } -}) - -minetest.register_craft({ - output = 'technic:concrete 5', - recipe = { - {'default:stone','technic:rebar','default:stone'}, - {'technic:rebar','default:stone','technic:rebar'}, - {'default:stone','technic:rebar','default:stone'}, - } -}) - minetest.register_craft({ output = 'technic:concrete_post_platform 6', recipe = { @@ -51,9 +33,9 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:concrete_post 12', recipe = { - {'default:stone','technic:rebar','default:stone'}, - {'default:stone','technic:rebar','default:stone'}, - {'default:stone','technic:rebar','default:stone'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, } }) @@ -66,18 +48,6 @@ minetest.register_craft({ } }) -minetest.register_craftitem(":technic:rebar", { - description = S("Rebar"), - inventory_image = "technic_rebar.png", -}) - -minetest.register_node(":technic:concrete", { - description = S("Concrete Block"), - tiles = {"technic_concrete_block.png",}, - groups = {cracky=1, level=2, concrete=1}, - sounds = default.node_sound_stone_defaults(), -}) - minetest.register_node(":technic:blast_resistant_concrete", { description = S("Blast-resistant Concrete Block"), tiles = {"technic_blast_resistant_concrete_block.png",}, @@ -101,7 +71,7 @@ local box_right = {0, -0.3, -0.1, 0.5, 0.3, 0.1} minetest.register_node(":technic:concrete_post_platform", { description = S("Concrete Post Platform"), - tiles = {"technic_concrete_block.png",}, + tiles = {"basic_materials_concrete_block.png",}, groups={cracky=1, level=2}, sounds = default.node_sound_stone_defaults(), paramtype = "light", @@ -133,7 +103,7 @@ for platform = 0, 1 do minetest.register_node(":technic:concrete_post"..(platform == 1 and "_with_platform" or ""), { description = S("Concrete Post"), - tiles = {"technic_concrete_block.png"}, + tiles = {"basic_materials_concrete_block.png"}, groups = {cracky=1, level=2, concrete_post=1, not_in_creative_inventory=platform}, sounds = default.node_sound_stone_defaults(), drop = (platform == 1 and "technic:concrete_post_platform" or diff --git a/concrete/textures/technic_concrete_block.png b/concrete/textures/technic_concrete_block.png deleted file mode 100644 index cd94594c4d12f04959c21ae1dccb4189aebc87ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 500 zcmVP)wnr#}G&<1!)y zC~W%v{sR!6<5GIMt3dX4PcX!r_v0>RX1WAIO6;@{0^B{eC7pA2*|YN+Cj&}Ek|_3L zCN(pOA-l&hRChx@>8PTr>uwcEc5}`H>^hNGN$$J5TWAu;NC952`|r<>opao?rApF0 z$P$tQCAB0~OG?M&()sRY(5N~zI-m~3T6{@=LoT@YxJ zg{l(h{hY3#>{6Bgx^8tfqN@h!W4W8%cpW0ujNWetUsFI&lif{;@_LPJ;u)1v&3#|j zr7rFAe$IJ5m6#;eMN(>8=bW#vJ1FS7?(W_7uFf&Iy9*L8(m4yBX^`MNC$XfNfqc;2 qmAGo+>=Kla1W77Ds()0HWcwGgt1aS4)iwqI0000Yxd6vpvqW;(V! zHlBE76_4%6vWk@uMF^=CQD6~~(wCIBVnrAI6#Y)D*?=IBAZV3BP$N-^f=DeaH79fJVR;&F0z&i;*aLn9VYo7qPm?X*2^SldE%9mwXzH$Ws09Kae z6W{kY27^JT*=$~9jBRnw|8WHXfH#!VeE{F|dcD((vE@9^Zy95lD*%i!hm_JH48tp7 z7!IYBb4scE#u)7c003I+UkM?dG)+I5o0~gF2pJ0@ezDfN0RYfa%EyF|m1?zmCW@j} zA;g{#;?NZU0Jsoh*IN5ktJO;D_4=yTdXsZLb_D={w?c^hN~QAka5(HWo6WPF^IMcs z?g{{F?V(cY58wB%j7FmcDP^@NiU(3k>jVG*Qp(>r=eg&3pS4=8^IGc{lgVV?8DNHZ z#yJmawc6!0P1k}TxH}$?-#7yRFr4$JTI)0Ic6%jBl0~icoh-|kD*ymU#@Id2^A?tt zmabZBPZL768Dr8F0M=Tel-ki+U+(w&Unr&Ol+uSn2<-#_078f&%d)*72(AtWgLNT< z&hz|dt+jOmm>uO`Qp$ryqw#IG+g(#iy`D~|&y6u|006)k`&|ezO_F4z-|v4K1i_1= zqoV_7001C_JmZ|JG)+H`<9NL+%bhIC{&WTaUED!e*T)Zb~K$%Z%QeR6Ts{y6s7c0 rQ4}r4*x!`Whf+$7caVqo{ilBc1GJl=xluv200000NkvXXu0mjfdTMa{ diff --git a/extranodes/depends.txt b/extranodes/depends.txt index 4dcb99e..0279a18 100644 --- a/extranodes/depends.txt +++ b/extranodes/depends.txt @@ -1,5 +1,6 @@ default technic_worldgen +basic_materials concrete unifieddyes? intllib? diff --git a/extranodes/init.lua b/extranodes/init.lua index 1f65c29..5d8b260 100644 --- a/extranodes/init.lua +++ b/extranodes/init.lua @@ -30,7 +30,7 @@ if minetest.get_modpath("moreblocks") then stairsplus:register_all("technic", "concrete", "technic:concrete", { description=S("Concrete"), groups={cracky=3, not_in_creative_inventory=1}, - tiles={"technic_concrete_block.png"}, + tiles={"basic_materials_concrete_block.png"}, }) stairsplus:register_all("technic", "zinc_block", "technic:zinc_block", { @@ -57,10 +57,10 @@ if minetest.get_modpath("moreblocks") then tiles={"technic_stainless_steel_block.png"}, }) - stairsplus:register_all("technic", "brass_block", "technic:brass_block", { + stairsplus:register_all("technic", "brass_block", "basic_materials:brass_block", { description=S("Brass Block"), groups={cracky=1, not_in_creative_inventory=1}, - tiles={"technic_brass_block.png"}, + tiles={"basic_materials_brass_block.png"}, }) function register_technic_stairs_alias(modname, origname, newmod, newname) diff --git a/technic/crafts.lua b/technic/crafts.lua index 5d3ae04..90bd2dd 100644 --- a/technic/crafts.lua +++ b/technic/crafts.lua @@ -38,6 +38,12 @@ if pipeworks.enable_teleport_tube then }) end +-- basic materials' brass ingot + +minetest.clear_craft({ + output = "basic_materials:brass_ingot", +}) + -- tubes crafting recipes minetest.register_craft({ @@ -71,54 +77,24 @@ minetest.register_craft({ output = 'technic:red_energy_crystal', recipe = { {'moreores:silver_ingot', 'technic:battery', 'dye:red'}, - {'technic:battery', 'default:diamondblock', 'technic:battery'}, + {'technic:battery', 'basic_materials:energy_crystal_simple', 'technic:battery'}, {'dye:red', 'technic:battery', 'moreores:silver_ingot'}, } }) -minetest.register_craft({ - output = 'technic:fine_copper_wire 2', - recipe = { - {'', 'default:copper_ingot', ''}, - {'', 'default:copper_ingot', ''}, - {'', 'default:copper_ingot', ''}, - } -}) - -minetest.register_craft({ - output = 'technic:fine_gold_wire 2', - recipe = { - {'', 'default:gold_ingot', ''}, - {'', 'default:gold_ingot', ''}, - {'', 'default:gold_ingot', ''}, - } -}) - -minetest.register_craft({ - output = 'technic:fine_silver_wire 2', - recipe = { - {'', 'moreores:silver_ingot', ''}, - {'', 'moreores:silver_ingot', ''}, - {'', 'moreores:silver_ingot', ''}, - } -}) - minetest.register_craft({ output = 'technic:copper_coil 1', recipe = { - {'technic:fine_copper_wire', 'technic:wrought_iron_ingot', 'technic:fine_copper_wire'}, + {'basic_materials:copper_wire', 'technic:wrought_iron_ingot', 'basic_materials:copper_wire'}, {'technic:wrought_iron_ingot', '', 'technic:wrought_iron_ingot'}, - {'technic:fine_copper_wire', 'technic:wrought_iron_ingot', 'technic:fine_copper_wire'}, - } -}) - -minetest.register_craft({ - output = 'technic:motor', - recipe = { - {'technic:carbon_steel_ingot', 'technic:copper_coil', 'technic:carbon_steel_ingot'}, - {'technic:carbon_steel_ingot', 'technic:copper_coil', 'technic:carbon_steel_ingot'}, - {'technic:carbon_steel_ingot', 'default:copper_ingot', 'technic:carbon_steel_ingot'}, - } + {'basic_materials:copper_wire', 'technic:wrought_iron_ingot', 'basic_materials:copper_wire'}, + }, + replacements = { + {"basic_materials:copper_wire", "basic_materials:empty_spool"}, + {"basic_materials:copper_wire", "basic_materials:empty_spool"}, + {"basic_materials:copper_wire", "basic_materials:empty_spool"}, + {"basic_materials:copper_wire", "basic_materials:empty_spool"} + }, }) local isolation = mesecons_materials and "mesecons_materials:fiber" or "technic:rubber" @@ -153,10 +129,11 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:control_logic_unit', recipe = { - {'', 'technic:fine_gold_wire', ''}, + {'', 'basic_materials:gold_wire', ''}, {'default:copper_ingot', 'technic:silicon_wafer', 'default:copper_ingot'}, {'', 'technic:chromium_ingot', ''}, - } + }, + replacements = { {"basic_materials:gold_wire", "basic_materials:empty_spool"}, }, }) minetest.register_craft({ @@ -179,7 +156,7 @@ minetest.register_craft({ output = "technic:machine_casing", recipe = { { "technic:cast_iron_ingot", "technic:cast_iron_ingot", "technic:cast_iron_ingot" }, - { "technic:cast_iron_ingot", "technic:brass_ingot", "technic:cast_iron_ingot" }, + { "technic:cast_iron_ingot", "basic_materials:brass_ingot", "technic:cast_iron_ingot" }, { "technic:cast_iron_ingot", "technic:cast_iron_ingot", "technic:cast_iron_ingot" }, }, }) diff --git a/technic/depends.txt b/technic/depends.txt index 6b28f9f..1b76ab3 100644 --- a/technic/depends.txt +++ b/technic/depends.txt @@ -1,6 +1,7 @@ default pipeworks technic_worldgen +basic_materials bucket? screwdriver? mesecons? diff --git a/technic/items.lua b/technic/items.lua index a0edb96..d89ed46 100644 --- a/technic/items.lua +++ b/technic/items.lua @@ -69,32 +69,11 @@ minetest.register_tool("technic:red_energy_crystal", { } }) - -minetest.register_craftitem("technic:fine_copper_wire", { - description = S("Fine Copper Wire"), - inventory_image = "technic_fine_copper_wire.png", -}) - -minetest.register_craftitem("technic:fine_gold_wire", { - description = S("Fine Gold Wire"), - inventory_image = "technic_fine_gold_wire.png", -}) - -minetest.register_craftitem("technic:fine_silver_wire", { - description = S("Fine Silver Wire"), - inventory_image = "technic_fine_silver_wire.png", -}) - minetest.register_craftitem("technic:copper_coil", { description = S("Copper Coil"), inventory_image = "technic_copper_coil.png", }) -minetest.register_craftitem("technic:motor", { - description = S("Electric Motor"), - inventory_image = "technic_motor.png", -}) - minetest.register_craftitem("technic:lv_transformer", { description = S("Low Voltage Transformer"), inventory_image = "technic_lv_transformer.png", diff --git a/technic/machines/HV/forcefield.lua b/technic/machines/HV/forcefield.lua index 157dc33..230c8b0 100644 --- a/technic/machines/HV/forcefield.lua +++ b/technic/machines/HV/forcefield.lua @@ -17,7 +17,7 @@ local cable_entry = "^technic_cable_connection_overlay.png" minetest.register_craft({ output = "technic:forcefield_emitter_off", recipe = { - {"default:mese", "technic:motor", "default:mese" }, + {"default:mese", "basic_materials:motor", "default:mese" }, {"technic:deployer_off", "technic:machine_casing", "technic:deployer_off"}, {"default:mese", "technic:hv_cable", "default:mese" }, } diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua index 86ca395..b7cc501 100644 --- a/technic/machines/HV/quarry.lua +++ b/technic/machines/HV/quarry.lua @@ -7,7 +7,7 @@ local cable_entry = "^technic_cable_connection_overlay.png" minetest.register_craft({ recipe = { {"technic:carbon_plate", "pipeworks:filter", "technic:composite_plate"}, - {"technic:motor", "technic:machine_casing", "technic:diamond_drill_head"}, + {"basic_materials:motor", "technic:machine_casing", "technic:diamond_drill_head"}, {"technic:carbon_steel_block", "technic:hv_cable", "technic:carbon_steel_block"}}, output = "technic:quarry", }) diff --git a/technic/machines/LV/cnc.lua b/technic/machines/LV/cnc.lua index fdfec99..b8eb729 100644 --- a/technic/machines/LV/cnc.lua +++ b/technic/machines/LV/cnc.lua @@ -14,7 +14,7 @@ minetest.register_craft({ output = 'technic:cnc', recipe = { {'default:glass', 'technic:diamond_drill_head', 'default:glass'}, - {'technic:control_logic_unit', 'technic:machine_casing', 'technic:motor'}, + {'technic:control_logic_unit', 'technic:machine_casing', 'basic_materials:motor'}, {'technic:carbon_steel_ingot', 'technic:lv_cable', 'technic:carbon_steel_ingot'}, }, }) diff --git a/technic/machines/LV/compressor.lua b/technic/machines/LV/compressor.lua index 67b9f79..84eb4c5 100644 --- a/technic/machines/LV/compressor.lua +++ b/technic/machines/LV/compressor.lua @@ -4,10 +4,14 @@ minetest.register_alias("compressor", "technic:lv_compressor") minetest.register_craft({ output = 'technic:lv_compressor', recipe = { - {'default:stone', 'technic:motor', 'default:stone'}, + {'default:stone', 'basic_materials:motor', 'default:stone'}, {'mesecons:piston', 'technic:machine_casing', 'mesecons:piston'}, - {'technic:fine_silver_wire', 'technic:lv_cable', 'technic:fine_silver_wire'}, - } + {'basic_materials:silver_wire', 'technic:lv_cable', 'basic_materials:silver_wire'}, + }, + replacements = { + {"basic_materials:silver_wire", "basic_materials:empty_spool"}, + {"basic_materials:silver_wire", "basic_materials:empty_spool"} + }, }) technic.register_compressor({tier = "LV", demand = {300}, speed = 1}) diff --git a/technic/machines/LV/extractor.lua b/technic/machines/LV/extractor.lua index 55d0140..123ad05 100644 --- a/technic/machines/LV/extractor.lua +++ b/technic/machines/LV/extractor.lua @@ -4,7 +4,7 @@ minetest.register_alias("extractor", "technic:lv_extractor") minetest.register_craft({ output = 'technic:lv_extractor', recipe = { - {'technic:treetap', 'technic:motor', 'technic:treetap'}, + {'technic:treetap', 'basic_materials:motor', 'technic:treetap'}, {'technic:treetap', 'technic:machine_casing', 'technic:treetap'}, {'', 'technic:lv_cable', ''}, } diff --git a/technic/machines/LV/geothermal.lua b/technic/machines/LV/geothermal.lua index 27f4abc..d828f6d 100644 --- a/technic/machines/LV/geothermal.lua +++ b/technic/machines/LV/geothermal.lua @@ -11,9 +11,13 @@ minetest.register_craft({ output = 'technic:geothermal', recipe = { {'technic:granite', 'default:diamond', 'technic:granite'}, - {'technic:fine_copper_wire', 'technic:machine_casing', 'technic:fine_copper_wire'}, + {'basic_materials:copper_wire', 'technic:machine_casing', 'basic_materials:copper_wire'}, {'technic:granite', 'technic:lv_cable', 'technic:granite'}, - } + }, + replacements = { + {"basic_materials:copper_wire", "basic_materials:empty_spool"}, + {"basic_materials:copper_wire", "basic_materials:empty_spool"} + }, }) minetest.register_craftitem("technic:geothermal", { diff --git a/technic/machines/LV/solar_panel.lua b/technic/machines/LV/solar_panel.lua index c072b13..6143fa9 100644 --- a/technic/machines/LV/solar_panel.lua +++ b/technic/machines/LV/solar_panel.lua @@ -9,9 +9,9 @@ minetest.register_craft({ output = 'technic:solar_panel', recipe = { {'technic:doped_silicon_wafer', 'technic:doped_silicon_wafer', 'technic:doped_silicon_wafer'}, - {'technic:fine_silver_wire', 'technic:lv_cable', 'mesecons_materials:glue'}, - - } + {'basic_materials:silver_wire', 'technic:lv_cable', 'mesecons_materials:glue'}, + }, + replacements = { {"basic_materials:silver_wire", "basic_materials:empty_spool"}, }, }) diff --git a/technic/machines/MV/centrifuge.lua b/technic/machines/MV/centrifuge.lua index a0aad64..fdc086f 100644 --- a/technic/machines/MV/centrifuge.lua +++ b/technic/machines/MV/centrifuge.lua @@ -1,7 +1,7 @@ minetest.register_craft({ output = "technic:mv_centrifuge", recipe = { - {"technic:motor", "technic:copper_plate", "technic:diamond_drill_head"}, + {"basic_materials:motor", "technic:copper_plate", "technic:diamond_drill_head"}, {"technic:copper_plate", "technic:machine_casing", "technic:copper_plate" }, {"pipeworks:one_way_tube", "technic:mv_cable", "pipeworks:mese_filter" }, } diff --git a/technic/machines/MV/wind_mill.lua b/technic/machines/MV/wind_mill.lua index 9df12b9..1baf54c 100644 --- a/technic/machines/MV/wind_mill.lua +++ b/technic/machines/MV/wind_mill.lua @@ -13,7 +13,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:wind_mill', recipe = { - {'', 'technic:motor', ''}, + {'', 'basic_materials:motor', ''}, {'technic:carbon_steel_ingot', 'technic:carbon_steel_block', 'technic:carbon_steel_ingot'}, {'', 'technic:mv_cable', ''}, } diff --git a/technic/machines/other/frames.lua b/technic/machines/other/frames.lua index d5c60a3..f991ba7 100644 --- a/technic/machines/other/frames.lua +++ b/technic/machines/other/frames.lua @@ -979,7 +979,7 @@ minetest.register_craft({ output = 'technic:frame_111111', recipe = { { '', 'default:stick', '' }, - { 'default:stick', 'technic:brass_ingot', 'default:stick' }, + { 'default:stick', 'basic_materials:brass_ingot', 'default:stick' }, { '', 'default:stick', '' }, } }) @@ -988,7 +988,7 @@ minetest.register_craft({ output = 'technic:frame_motor', recipe = { { '', 'technic:frame_111111', '' }, - { 'group:mesecon_conductor_craftable', 'technic:motor', 'group:mesecon_conductor_craftable' }, + { 'group:mesecon_conductor_craftable', 'basic_materials:motor', 'group:mesecon_conductor_craftable' }, { '', 'technic:frame_111111', '' }, } }) @@ -996,9 +996,9 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:template 10', recipe = { - { '', 'technic:brass_ingot', '' }, - { 'technic:brass_ingot', 'default:mese_crystal', 'technic:brass_ingot' }, - { '', 'technic:brass_ingot', '' }, + { '', 'basic_materials:brass_ingot', '' }, + { 'basic_materials:brass_ingot', 'default:mese_crystal', 'basic_materials:brass_ingot' }, + { '', 'basic_materials:brass_ingot', '' }, } }) @@ -1016,7 +1016,7 @@ minetest.register_craft({ output = 'technic:template_motor', recipe = { { '', 'technic:template', '' }, - { 'group:mesecon_conductor_craftable', 'technic:motor', 'group:mesecon_conductor_craftable' }, + { 'group:mesecon_conductor_craftable', 'basic_materials:motor', 'group:mesecon_conductor_craftable' }, { '', 'technic:template', '' }, } }) diff --git a/technic/machines/register/alloy_recipes.lua b/technic/machines/register/alloy_recipes.lua index 3aeacd5..8731b8e 100644 --- a/technic/machines/register/alloy_recipes.lua +++ b/technic/machines/register/alloy_recipes.lua @@ -21,7 +21,7 @@ local recipes = { {"technic:carbon_steel_dust 3", "technic:chromium_dust", "technic:stainless_steel_dust 4"}, {"technic:carbon_steel_ingot 3", "technic:chromium_ingot", "technic:stainless_steel_ingot 4"}, {"technic:copper_dust 2", "technic:zinc_dust", "technic:brass_dust 3"}, - {"default:copper_ingot 2", "technic:zinc_ingot", "technic:brass_ingot 3"}, + {"default:copper_ingot 2", "technic:zinc_ingot", "basic_materials:brass_ingot 3"}, {"default:sand 2", "technic:coal_dust 2", "technic:silicon_wafer"}, {"technic:silicon_wafer", "technic:gold_dust", "technic:doped_silicon_wafer"}, -- from https://en.wikipedia.org/wiki/Carbon_black diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index 8c8e178..da90aad 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -93,7 +93,7 @@ local function register_dust(name, ingot) end -- Sorted alphibeticaly -register_dust("Brass", "technic:brass_ingot") +register_dust("Brass", "basic_materials:brass_ingot") register_dust("Bronze", "default:bronze_ingot") register_dust("Carbon Steel", "technic:carbon_steel_ingot") register_dust("Cast Iron", "technic:cast_iron_ingot") diff --git a/technic/machines/supply_converter.lua b/technic/machines/supply_converter.lua index 9202c4a..24601c6 100644 --- a/technic/machines/supply_converter.lua +++ b/technic/machines/supply_converter.lua @@ -201,10 +201,11 @@ minetest.register_node("technic:supply_converter", { minetest.register_craft({ output = 'technic:supply_converter 1', recipe = { - {'technic:fine_gold_wire', 'technic:rubber', 'technic:doped_silicon_wafer'}, + {'basic_materials:gold_wire', 'technic:rubber', 'technic:doped_silicon_wafer'}, {'technic:mv_transformer', 'technic:machine_casing', 'technic:lv_transformer'}, {'technic:mv_cable', 'technic:rubber', 'technic:lv_cable'}, - } + }, + replacements = { {"basic_materials:gold_wire", "basic_materials:empty_spool"}, }, }) for tier, machines in pairs(technic.machines) do diff --git a/technic/radiation.lua b/technic/radiation.lua index a4c49c6..6e518d8 100644 --- a/technic/radiation.lua +++ b/technic/radiation.lua @@ -146,7 +146,7 @@ local rad_resistance_node = { ["moreores:mithril_block"] = 26, ["moreores:silver_block"] = 53, ["snow:snow_brick"] = 2.8, - ["technic:brass_block"] = 43, + ["basic_materials:brass_block"] = 43, ["technic:carbon_steel_block"] = 40, ["technic:cast_iron_block"] = 40, ["technic:chernobylite_block"] = 40, diff --git a/technic/textures/technic_fine_copper_wire.png b/technic/textures/technic_fine_copper_wire.png deleted file mode 100644 index 3e663bb7e2d3a540f8456635c9d177900844368b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 501 zcmV-dlEB>=Z-(mAYxRGrl*>zZXMa;Y zqSOI?OqIKZp^fo)$3#S~R^aaJt_4rMK&^p;Bcmt{HGv>}UJV^JErRie`n^HM^p_!$ z2$|5svDh%FoRt#xw?c~{E?%F^p$v&4M7|#-UW^(6`1neFm??GbSQBw~ep|UvFkTPU z!=W&nIsGNO00X@IU@}!>G6gg--s)8y3*na196Nbm_*Pjr6;tk)!p~D@GPC6l!J~I) zdA$U|jDa{`*8X_iTMwQZqX~frLwNQ+N#_kjgm|i0G!Qsb=j&Vb<=YwQ1Xgn8aGoen zU@^*858R#IH|i=-_94q6hqFYH2YS|UFo&n3b{ASPiU`j~CW8Vbf+WKgqJn7`{MRNf rs@dBJe#d40WIN@Tf!7lJx8HaUfqAw^4!Om(00000NkvXXu0mjf1nkxL diff --git a/technic/textures/technic_fine_gold_wire.png b/technic/textures/technic_fine_gold_wire.png deleted file mode 100644 index 54a7a52d866dfbfc8dd2e10461ee3265638a772d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 474 zcmV<00VV#4P) zK~y-6rISrd0#Ou(pEC?Y<0vgMC?rB$%t9r|tVNqvE&Hi0qD70KgqvB_twL zHhxsfFsDUC41N(FxSPwlFVA`3dqh=Pq>P1L&lBifOTTn1GZD>6mxHRP4TKh$A#|#u z<_Hq|Dsu@gPDDTB&@XXBPF|&22iJgJA9|fAf&9kkpG$u^gHx$NAr0nMbl%dL=>sXy3Ervb+6H{R!`?dFx54N@GBw3Sr=W7vg4=h<+Td=$a|8055HrC1 zfaF2c8=15VeoZtCAvOZ<6>{r908VlIBcZBOPx%UMm+8;ynMm-TT6i130sbO9(X~qQzifpnVEA!A(+#8yD@uXXwJ6 z5SrjHv4mktm;o2Xr>IcLK)}R-zznym3PYk&a^P+*=lu6O|G7tzQZi4xnydOHfuH^U z__$tw7I9(Lr5^-R*L9L4L1Z%g==G!!g7<}j@*=@ettRhBBL-ne`|^@)(?kdXz$}`S zfa`g(TB*?YeNq9von9ZKe7>uGeK0MU;z0bX|Wa?d-fx5onr5 z6h*w<*x=jw`INCq9Aj0h1lQNtj+31t0C29ZWSk@{s4Bm1ZfG_d3c%-+6Zz-vj>AfY zH|y)X+uVGlOL?F#E|S$Wgb)meL%yD!$?u(xydRDDXj$}qpWnB)DYDc*$mep(QLQG0 z5R^+L48x%3y6o@nvSb*DOok78dns>}S-aqRo{Zy|CBwk(b}1K&j}J^GODUf`jb>AJ kYPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m4F01m4Gj_kzz00007bV*G`2iyuB z0~$4@Ghwy>00~t|L_t(o!_AjjY+ThD$A9N8GxyGNXJUIial8;?661u#iK(zb1Q3N5 zXced`;RhO^5~xKjYUu*7^Z&O0fq%p9y6Y~!ZWEX5`0&FIhet<8zw3G4 z)*uL46-6oOy1sq)?%jXv?(SyCjvfCS0Jq+H>n}k5(D#FDq?AZ0r4T{@Qc)CPn&zPI z`*-fyvuEtV2Os2>S6;c~Ia{}G<=uDRy?g*YJw1t&Cr>VvZJScDC@=OELLh`dO34Kv zLWq~uMC?cJz4d1Re){O6YbM6W?{ysK4n1%8clh7hinw@)`K?BaggQDi*)* zx~|CQ^HeGo6h#3*({+%NAPA^bDo82Ob$wudetuX8aYHhhsP_GUxD}_msv66(yi_W+ zsi&vs*u^o_uL987*>#PoDz^wBFin%m$w_S6M$>ida+x3qKnOy*j;g9mPEOWNPfxc7 zK@h1_TsCdm#Ffo0BoY?B?~B=N_9vUK-Ta68RrST8p`oRVd=&sqQ_H^Zp=lbf>*D)9 zhGC$oDj{9R^E?zG@O>X41dEG{7={6WidIIzsc6&6GxmPYOs01kz?*OGAV8*-K;}EUx>9S`t`&!Sdr2mfWV5pr3I$4~5{6+geEKv~Q`1-p zi$o$pO-&7kX|TAsh+A>V=kv_Y&N4SQk70zVI2BY?As&yTC<=2B+>2#XL#ztbX7=xdEMl2fT1iU7D4ypL1OY)1Gyp6!uxt08gp`uLzFuB<;rEP;jF3nq=u_kG&h+6aY0 zBrJ<)EJ`>O;?SW(_`Xk5Qxm67o#M!mJ_6szipN=4SfH-1j=sJ=Mn^{xih}F9*tU&R zac~@m&jE-@2opbKC8=Q!bb3?CiwzJXBRBkdn2nt>kh! zrl+TAX=x!{o95K%)2OOSV`C$p=h4;Gg>Bp9ayiQ7GL=dNw^E_vx}TqffyBJf+m;pQ z*x)e?!(d~3JB{`AG_P)^rKN?{tDBjcn&S1>x3gl!3R+uRSy)(LdU~34I?b9jYZw_B z!Llr((J1+Rp4!@4&YU@e=ec;EkCgJCI|bmcpL{~uwnv13tFF3=p`jth#>N<*7$=!b zvREjPT#=;zXg@&^;5ZH)9UYuJd6LnwF;>;pp{gnq6BATbSJTwg#MIOj`FtMNbqR$+ zD2jsT1^B*?s;X$3HUpqaDQRqK;-;H!+FmY~+cZrhm&=n(COCHN7@?4k>-&t4k8}3y zS#(_|6bezPRH#j-S(u+EpUIG&Dp<$F;0WrxAebx=1PUJde4#Ic8>N2#3QI zi$${8EOEgyRE9!6DFR8__EJYumJilPuU!g57&MX)wq0f+pGQ%Yw=V= zIB^11(~wf4X&R2>kV>UwG!_%-+S;@Ab*pas<*$F`E$@OIJKper^W;;N`T6;s8#ive zQB_sq@fg+B)u^h55RlL385?8^S2e}wLvr*U9R+4EY=?ih2H4z?|=GITUWU_ zIDk{JU%0-ji$o$pRdp4GVv&}X77E3}vi!1bo7_SURnySU=lDXdHBBQF3enKeKzn;T zK@gn#vfy9Pgs;8!8Y81)YR9H_cjZ!RiIL%98X6nfwr$%owdJzS?CcDYNCek)5kg=X z29ZdF=H_OSE0)H&A_O~k?j#%zKQlc&{lsO<@}2Lzb7xIe^6wydzS)?{JHV}wlP4a(!3(zy9B{Wy|96x^^|$NSuYczG=b!iPzWeU~?r8?l-QA7ndiAr}*@;Xh zBXhZ&kWzB>)mL-H6<4shxQLYUP&gcZde5FcJHOVq;l*~#&9_|VdhWsT@o`yQT`jCc z0;GIZ2=U~;efvftkqD(y>9WpJ{u2QEKHB$p(=@MJvu4d9%d&oU|F&)FM<0FkfU2q^ fz-0&jzp#G*HQ{KJ-<%*d00000NkvXXu0mjf)@I&w diff --git a/technic/tools/chainsaw.lua b/technic/tools/chainsaw.lua index 3653d2d..8245fd6 100644 --- a/technic/tools/chainsaw.lua +++ b/technic/tools/chainsaw.lua @@ -363,8 +363,10 @@ minetest.register_craft({ output = "technic:chainsaw", recipe = { {"technic:stainless_steel_ingot", trigger, "technic:battery"}, - {"technic:fine_copper_wire", "technic:motor", "technic:battery"}, + {"basic_materials:copper_wire", "basic_materials:motor", "technic:battery"}, {"", "", "technic:stainless_steel_ingot"}, - } + }, + replacements = { {"basic_materials:copper_wire", "basic_materials:empty_spool"}, }, + }) diff --git a/technic/tools/mining_drill.lua b/technic/tools/mining_drill.lua index 1cf7491..250c461 100644 --- a/technic/tools/mining_drill.lua +++ b/technic/tools/mining_drill.lua @@ -7,7 +7,7 @@ minetest.register_craft({ output = 'technic:mining_drill', recipe = { {'default:tin_ingot', 'technic:diamond_drill_head', 'default:tin_ingot'}, - {'technic:stainless_steel_ingot', 'technic:motor', 'technic:stainless_steel_ingot'}, + {'technic:stainless_steel_ingot', 'basic_materials:motor', 'technic:stainless_steel_ingot'}, {'', 'technic:red_energy_crystal', 'default:copper_ingot'}, } }) diff --git a/technic/tools/mining_lasers.lua b/technic/tools/mining_lasers.lua index 6015e5a..ba5a726 100644 --- a/technic/tools/mining_lasers.lua +++ b/technic/tools/mining_lasers.lua @@ -11,8 +11,8 @@ local S = technic.getter minetest.register_craft({ output = "technic:laser_mk1", recipe = { - {"default:diamond", "technic:brass_ingot", "default:obsidian_glass"}, - {"", "technic:brass_ingot", "technic:red_energy_crystal"}, + {"default:diamond", "basic_materials:brass_ingot", "default:obsidian_glass"}, + {"", "basic_materials:brass_ingot", "technic:red_energy_crystal"}, {"", "", "default:copper_ingot"}, } }) diff --git a/technic/tools/prospector.lua b/technic/tools/prospector.lua index b28f1d8..9a918a2 100644 --- a/technic/tools/prospector.lua +++ b/technic/tools/prospector.lua @@ -122,7 +122,7 @@ minetest.register_craft({ output = "technic:prospector", recipe = { {"moreores:pick_silver", "moreores:mithril_block", "pipeworks:teleport_tube_1"}, - {"technic:brass_ingot", "technic:control_logic_unit", "technic:brass_ingot"}, + {"basic_materials:brass_ingot", "technic:control_logic_unit", "basic_materials:brass_ingot"}, {"", "technic:blue_energy_crystal", ""}, } }) diff --git a/technic/tools/vacuum.lua b/technic/tools/vacuum.lua index 037f3bb..b5afcb5 100644 --- a/technic/tools/vacuum.lua +++ b/technic/tools/vacuum.lua @@ -55,7 +55,7 @@ minetest.register_craft({ output = 'technic:vacuum', recipe = { {'pipeworks:tube_1', 'pipeworks:filter', 'technic:battery'}, - {'pipeworks:tube_1', 'technic:motor', 'technic:battery'}, + {'pipeworks:tube_1', 'basic_materials:motor', 'technic:battery'}, {'technic:stainless_steel_ingot', '', ''}, } }) diff --git a/technic_chests/copper_chest.lua b/technic_chests/copper_chest.lua index d40284b..fda1db0 100644 --- a/technic_chests/copper_chest.lua +++ b/technic_chests/copper_chest.lua @@ -19,7 +19,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:copper_locked_chest 1', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:copper_chest'}, } }) diff --git a/technic_chests/depends.txt b/technic_chests/depends.txt index b9ca665..5d9ea6c 100644 --- a/technic_chests/depends.txt +++ b/technic_chests/depends.txt @@ -1,4 +1,6 @@ default +basic_materials +moreblocks? moreores? pipeworks? intllib? diff --git a/technic_chests/gold_chest.lua b/technic_chests/gold_chest.lua index c66b2f6..7a50b70 100644 --- a/technic_chests/gold_chest.lua +++ b/technic_chests/gold_chest.lua @@ -30,7 +30,7 @@ end minetest.register_craft({ output = 'technic:gold_locked_chest', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:gold_chest'}, } }) diff --git a/technic_chests/init.lua b/technic_chests/init.lua index 6b1a1b2..188e516 100644 --- a/technic_chests/init.lua +++ b/technic_chests/init.lua @@ -15,6 +15,63 @@ dofile(modpath.."/silver_chest.lua") dofile(modpath.."/gold_chest.lua") dofile(modpath.."/mithril_chest.lua") +-- undo all of the locked wooden chest recipes created by default and +-- moreblocks, and just make them use a padlock. + +if minetest.get_modpath("moreblocks") then + minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:gold_ingot", + } + }) + + minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:bronze_ingot", + } + }) + + minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:copper_ingot", + } + }) +end + +minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:steel_ingot", + } +}) + +minetest.clear_craft({output = "default:chest_locked"}) + +minetest.register_craft({ + output = "default:chest_locked", + recipe = { + { "group:wood", "group:wood", "group:wood" }, + { "group:wood", "basic_materials:padlock", "group:wood" }, + { "group:wood", "group:wood", "group:wood" } + } +}) + +minetest.register_craft({ + output = "default:chest_locked", + type = "shapeless", + recipe = { + "default:chest", + "basic_materials:padlock" + } +}) + minetest.register_lbm({ name = "technic_chests:fix_wooden_chests", nodenames = {"default:chest"}, diff --git a/technic_chests/iron_chest.lua b/technic_chests/iron_chest.lua index 90434bb..237067b 100644 --- a/technic_chests/iron_chest.lua +++ b/technic_chests/iron_chest.lua @@ -26,7 +26,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:iron_locked_chest 1', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:iron_chest'}, } }) diff --git a/technic_chests/mithril_chest.lua b/technic_chests/mithril_chest.lua index 909ff9e..05cbc40 100644 --- a/technic_chests/mithril_chest.lua +++ b/technic_chests/mithril_chest.lua @@ -21,7 +21,7 @@ end minetest.register_craft({ output = 'technic:mithril_locked_chest 1', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:mithril_chest'}, } }) diff --git a/technic_chests/silver_chest.lua b/technic_chests/silver_chest.lua index c615304..4de196d 100644 --- a/technic_chests/silver_chest.lua +++ b/technic_chests/silver_chest.lua @@ -21,7 +21,7 @@ end minetest.register_craft({ output = 'technic:silver_locked_chest', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:silver_chest'}, } }) diff --git a/technic_worldgen/crafts.lua b/technic_worldgen/crafts.lua index fba9df9..0590e70 100644 --- a/technic_worldgen/crafts.lua +++ b/technic_worldgen/crafts.lua @@ -48,11 +48,6 @@ minetest.register_craftitem(":technic:sulfur_lump", { inventory_image = "technic_sulfur_lump.png", }) -minetest.register_craftitem(":technic:brass_ingot", { - description = S("Brass Ingot"), - inventory_image = "technic_brass_ingot.png", -}) - minetest.register_alias("technic:wrought_iron_ingot", "default:steel_ingot") minetest.override_item("default:steel_ingot", { @@ -97,7 +92,6 @@ register_block("technic:uranium_block", "technic:uranium_ingot") register_block("technic:chromium_block", "technic:chromium_ingot") register_block("technic:zinc_block", "technic:zinc_ingot") register_block("technic:lead_block", "technic:lead_ingot") -register_block("technic:brass_block", "technic:brass_ingot") register_block("technic:cast_iron_block", "technic:cast_iron_ingot") register_block("technic:carbon_steel_block", "technic:carbon_steel_ingot") register_block("technic:stainless_steel_block", "technic:stainless_steel_ingot") diff --git a/technic_worldgen/depends.txt b/technic_worldgen/depends.txt index 3b1e4d0..6a92b7d 100644 --- a/technic_worldgen/depends.txt +++ b/technic_worldgen/depends.txt @@ -1,4 +1,5 @@ default +basic_materials intllib? mg? doors? diff --git a/technic_worldgen/nodes.lua b/technic_worldgen/nodes.lua index f3a88e4..14b4eba 100644 --- a/technic_worldgen/nodes.lua +++ b/technic_worldgen/nodes.lua @@ -133,14 +133,6 @@ minetest.register_node(":technic:stainless_steel_block", { sounds = default.node_sound_stone_defaults() }) -minetest.register_node(":technic:brass_block", { - description = S("Brass Block"), - tiles = { "technic_brass_block.png" }, - is_ground_content = true, - groups = {cracky=1, level=2}, - sounds = default.node_sound_stone_defaults() -}) - minetest.register_craft({ output = 'technic:marble_bricks 4', recipe = { diff --git a/technic_worldgen/textures/technic_brass_block.png b/technic_worldgen/textures/technic_brass_block.png deleted file mode 100644 index bc6fe7840712a97cc4d54379ab631fe2eb6e3b00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 649 zcmV;40(Sk0P)ni?o*@+5TwtCX|`AObCLyv;eeL{QGY&&uw4k(Y_fr z>mqnZtlTndW1Hh;UFX9v008j!ha)%Vc^HO&{%t})UBwWmv;kmj1mLEOmU-GW^V@d^ z0OREK?K*NEzyAC@gm64v>niU19zY0KtrBKt#*6#%#eLa!!!&#TdYH6&1fsslj^`;& z>@d14OZ$EV0MZitr_X1jsmd)Encg2~2@8PWuFL@Gb)A2FIAtp

*9|Rgxs*i3xsN+hv|^ zpOnPkRdO0@R{HBfB?QbKC!TSAN-bZ~pvL7AvJl?+#Z0 zzx;G7B2}4*h=^?JEQE#Flz9aByKQ>6O(Cv1&pL_KU+?z-yqC-1j3%uaz-4e{X1*P# j*m70a-Qim1rp(O$?$J2PM!a<>00000NkvXXu0mjf=*T)? diff --git a/technic_worldgen/textures/technic_brass_ingot.png b/technic_worldgen/textures/technic_brass_ingot.png deleted file mode 100644 index 06056e7892ae78710e8ec69d03221b1d85c898fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 377 zcmV-<0fzpGP)B1yIeg@ZIko6a`W5M+yOQgA~Ex41OldP@xrZGpA)4|qsJP+$-x z4N+?iT}YjIr(HwbNqOpA54`Zg_x+yt<$2*xNLO)n6*uTj90dYwmTEY*MJ$?g&1M%x zL-76x!@y#>ju4jUbZqSQ8+Pjzr~S^!K^_1_LlA?&{Pro5JW2P{MiOPhp)g`t;=aC1 z+j?fLpiwzgdmDJ*^2Q$0Sme9p3BSKJiU7>atpi{+AF#{@Rm13IP*5t|)OL^~38qse zgiwgb%W@y+e7xYap8Tx^UB%6A85^Gh;QHbSfZ6%QK(J~UKQpk*2A0_%5=#+{ zr&(AkaJ;`lGMN|%`e#%$1RcW#$Y$`3JXz))XXjUaVBi_OFteG=z==Z*ejAN~|B1c; XKVOH-ua-~u00000NkvXXu0mjf6kwxM From 3d52b679b014a92dad8e298c97095b11533ca0c1 Mon Sep 17 00:00:00 2001 From: Thomas Rudin Date: Fri, 16 Nov 2018 21:36:03 +0100 Subject: [PATCH 03/13] Quarry: Make use of fake digger from pipeworks (#453) Fixes crash when digging empty protected chests (https://github.com/minetest/minetest_game/blob/backport-0.4/mods/default/nodes.lua#L1868) --- technic/machines/HV/quarry.lua | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua index b7cc501..0a45559 100644 --- a/technic/machines/HV/quarry.lua +++ b/technic/machines/HV/quarry.lua @@ -146,15 +146,9 @@ local function quarry_run(pos, node) dignode = technic.get_or_load_node(digpos) or minetest.get_node(digpos) local dignodedef = minetest.registered_nodes[dignode.name] or {diggable=false} -- doors mod among other thing does NOT like a nil digger... - local fakedigger = { - get_player_name = function() - return "!technic_quarry_fake_digger" - end, - is_player = function() return false end, - get_wielded_item = function() - return ItemStack("air") - end, - } + local fakedigger = pipeworks.create_fake_player({ + name = owner + }) if not dignodedef.diggable or (dignodedef.can_dig and not dignodedef.can_dig(digpos, fakedigger)) then can_dig = false end From 8409be32fcb59195f48d409398c0e776a8170e97 Mon Sep 17 00:00:00 2001 From: 12Me21 <12Me21.MC@gmail.com> Date: Fri, 23 Nov 2018 14:25:32 -0500 Subject: [PATCH 04/13] Fix cable plate placement (#446) Cable plate placement now uses minetest.item_place --- technic/machines/register/cables.lua | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/technic/machines/register/cables.lua b/technic/machines/register/cables.lua index 1e8cee9..924128e 100644 --- a/technic/machines/register/cables.lua +++ b/technic/machines/register/cables.lua @@ -117,6 +117,19 @@ local function clear_networks(pos) end end +local function item_place_override_node(itemstack, placer, pointed, node) + -- Call the default on_place function with a fake itemstack + local temp_itemstack = ItemStack(itemstack) + temp_itemstack:set_name(node.name) + local original_count = temp_itemstack:get_count() + temp_itemstack = + minetest.item_place(temp_itemstack, placer, pointed, node.param2) or + temp_itemstack + -- Remove the same number of items from the real itemstack + itemstack:take_item(original_count - temp_itemstack:get_count()) + return itemstack +end + function technic.register_cable(tier, size) local ltier = string.lower(tier) cable_tier["technic:"..ltier.."_cable"] = tier @@ -228,11 +241,10 @@ function technic.register_cable(tier, size) num = xyz[((fine_pointed[bigger] < 0 and "-") or "") .. bigger] end end - minetest.set_node(pointed_thing.above, {name = "technic:"..ltier.."_cable_plate_"..num}) - if not (creative and creative.is_enabled_for(placer)) then - itemstack:take_item() - end - return itemstack + return item_place_override_node( + itemstack, placer, pointed_thing, + {name = "technic:"..ltier.."_cable_plate_"..num} + ) end else def.groups.not_in_creative_inventory = 1 From 2b2411d1eea704d6789ce22dac4fdc77516fb88a Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Fri, 23 Nov 2018 14:48:23 -0500 Subject: [PATCH 05/13] blast-resistant concrete stairs/slopes/et. al (#455) if moreblocks is installed. --- concrete/depends.txt | 2 +- concrete/init.lua | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/concrete/depends.txt b/concrete/depends.txt index 269e83a..5ca909c 100644 --- a/concrete/depends.txt +++ b/concrete/depends.txt @@ -1,4 +1,4 @@ default basic_materials intllib? - +moreblocks? diff --git a/concrete/init.lua b/concrete/init.lua index 1da6a51..d309613 100644 --- a/concrete/init.lua +++ b/concrete/init.lua @@ -61,6 +61,20 @@ minetest.register_node(":technic:blast_resistant_concrete", { end, }) +if minetest.get_modpath("moreblocks") then + stairsplus:register_all("technic","blast_resistant_concrete","technic:blast_resistant_concrete",{ + description = "Blast-resistant Concrete", + tiles = {"technic_blast_resistant_concrete_block.png",}, + groups = {cracky=1, level=3, concrete=1}, + sounds = default.node_sound_stone_defaults(), + on_blast = function(pos, intensity) + if intensity > 1 then + minetest.remove_node(pos) + minetest.add_item(pos, "technic:blast_resistant_concrete") + end + end, + }) +end local box_platform = {-0.5, 0.3, -0.5, 0.5, 0.5, 0.5} local box_post = {-0.15, -0.5, -0.15, 0.15, 0.5, 0.15} From 51d7bd81ffd8d006adbf40a0aa0056f5d09e0c12 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sat, 24 Nov 2018 11:35:06 -0500 Subject: [PATCH 06/13] let moreblocks handle brass block stairs et. al (#456) --- extranodes/init.lua | 6 ------ 1 file changed, 6 deletions(-) diff --git a/extranodes/init.lua b/extranodes/init.lua index 5d8b260..06e110e 100644 --- a/extranodes/init.lua +++ b/extranodes/init.lua @@ -57,12 +57,6 @@ if minetest.get_modpath("moreblocks") then tiles={"technic_stainless_steel_block.png"}, }) - stairsplus:register_all("technic", "brass_block", "basic_materials:brass_block", { - description=S("Brass Block"), - groups={cracky=1, not_in_creative_inventory=1}, - tiles={"basic_materials_brass_block.png"}, - }) - function register_technic_stairs_alias(modname, origname, newmod, newname) minetest.register_alias(modname .. ":slab_" .. origname, newmod..":slab_" .. newname) minetest.register_alias(modname .. ":slab_" .. origname .. "_inverted", newmod..":slab_" .. newname .. "_inverted") From dc0689018d27a68ae2987194285558b3add09be2 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sun, 25 Nov 2018 06:54:27 -0500 Subject: [PATCH 07/13] move CNC machine into its own mod --- technic/locale/de.txt | 36 ------------------ technic/locale/es.txt | 35 ----------------- technic/locale/it.txt | 36 ------------------ technic/locale/template.txt | 35 ----------------- technic/machines/LV/init.lua | 5 --- {technic/machines/LV => technic_cnc}/cnc.lua | 7 ++-- .../machines/LV => technic_cnc}/cnc_api.lua | 30 +++++++-------- .../cnc_materials.lua | 0 technic_cnc/depends.txt | 2 + technic_cnc/init.lua | 13 +++++++ technic_cnc/locale/de.txt | 35 +++++++++++++++++ technic_cnc/locale/es.txt | 34 +++++++++++++++++ technic_cnc/locale/it.txt | 35 +++++++++++++++++ technic_cnc/locale/template.txt | 35 +++++++++++++++++ .../models/technic_cnc_cylinder.obj | 0 .../technic_cnc_cylinder_horizontal.obj | 0 .../models/technic_cnc_innercorner.obj | 0 .../technic_cnc_innercorner_upsdown.obj | 0 .../models/technic_cnc_oblate_spheroid.obj | 0 .../models/technic_cnc_one_curved_edge.obj | 0 .../models/technic_cnc_outercorner.obj | 0 .../technic_cnc_outercorner_upsdown.obj | 0 .../models/technic_cnc_pyramid.obj | 0 .../models/technic_cnc_pyramid_spike.obj | 0 .../models/technic_cnc_slope.obj | 0 .../models/technic_cnc_slope_horizontal.obj | 0 .../models/technic_cnc_slope_upsdown.obj | 0 .../models/technic_cnc_sphere.obj | 0 .../models/technic_cnc_two_curved_edge.obj | 0 .../textures/technic_cnc_bottom.png | Bin .../textures/technic_cnc_cylinder.png | Bin .../technic_cnc_cylinder_horizontal.png | Bin .../textures/technic_cnc_element_cross.png | Bin .../textures/technic_cnc_element_edge.png | Bin .../textures/technic_cnc_element_end.png | Bin .../textures/technic_cnc_element_straight.png | Bin .../textures/technic_cnc_element_t.png | Bin .../textures/technic_cnc_front.png | Bin .../textures/technic_cnc_front_active.png | Bin .../textures/technic_cnc_full.png | Bin .../textures/technic_cnc_half.png | Bin .../technic_cnc_milling_background.png | Bin .../textures/technic_cnc_oblate_spheroid.png | Bin .../textures/technic_cnc_onecurvededge.png | Bin .../textures/technic_cnc_pyramid.png | Bin .../textures/technic_cnc_side.png | Bin .../textures/technic_cnc_slope.png | Bin .../textures/technic_cnc_slope_edge.png | Bin .../technic_cnc_slope_edge_upsdwn.png | Bin .../textures/technic_cnc_slope_inner_edge.png | Bin .../technic_cnc_slope_inner_edge_upsdwn.png | Bin .../textures/technic_cnc_slope_lying.png | Bin .../textures/technic_cnc_slope_upsdwn.png | Bin .../textures/technic_cnc_sphere.png | Bin .../textures/technic_cnc_spike.png | Bin .../textures/technic_cnc_stick.png | Bin .../textures/technic_cnc_top.png | Bin .../textures/technic_cnc_top_active.png | Bin .../textures/technic_cnc_twocurvededge.png | Bin 59 files changed, 173 insertions(+), 165 deletions(-) rename {technic/machines/LV => technic_cnc}/cnc.lua (98%) rename {technic/machines/LV => technic_cnc}/cnc_api.lua (94%) rename technic/machines/LV/cnc_nodes.lua => technic_cnc/cnc_materials.lua (100%) create mode 100644 technic_cnc/depends.txt create mode 100644 technic_cnc/init.lua create mode 100644 technic_cnc/locale/de.txt create mode 100644 technic_cnc/locale/es.txt create mode 100644 technic_cnc/locale/it.txt create mode 100644 technic_cnc/locale/template.txt rename technic/models/technic_cylinder.obj => technic_cnc/models/technic_cnc_cylinder.obj (100%) rename technic/models/technic_cylinder_horizontal.obj => technic_cnc/models/technic_cnc_cylinder_horizontal.obj (100%) rename technic/models/technic_innercorner.obj => technic_cnc/models/technic_cnc_innercorner.obj (100%) rename technic/models/technic_innercorner_upsdown.obj => technic_cnc/models/technic_cnc_innercorner_upsdown.obj (100%) rename technic/models/technic_oblate_spheroid.obj => technic_cnc/models/technic_cnc_oblate_spheroid.obj (100%) rename technic/models/technic_one_curved_edge.obj => technic_cnc/models/technic_cnc_one_curved_edge.obj (100%) rename technic/models/technic_outercorner.obj => technic_cnc/models/technic_cnc_outercorner.obj (100%) rename technic/models/technic_outercorner_upsdown.obj => technic_cnc/models/technic_cnc_outercorner_upsdown.obj (100%) rename technic/models/technic_pyramid.obj => technic_cnc/models/technic_cnc_pyramid.obj (100%) rename technic/models/technic_pyramid_spike.obj => technic_cnc/models/technic_cnc_pyramid_spike.obj (100%) rename technic/models/technic_slope.obj => technic_cnc/models/technic_cnc_slope.obj (100%) rename technic/models/technic_slope_horizontal.obj => technic_cnc/models/technic_cnc_slope_horizontal.obj (100%) rename technic/models/technic_slope_upsdown.obj => technic_cnc/models/technic_cnc_slope_upsdown.obj (100%) rename technic/models/technic_sphere.obj => technic_cnc/models/technic_cnc_sphere.obj (100%) rename technic/models/technic_two_curved_edge.obj => technic_cnc/models/technic_cnc_two_curved_edge.obj (100%) rename {technic => technic_cnc}/textures/technic_cnc_bottom.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_cylinder.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_cylinder_horizontal.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_element_cross.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_element_edge.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_element_end.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_element_straight.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_element_t.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_front.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_front_active.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_full.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_half.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_milling_background.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_oblate_spheroid.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_onecurvededge.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_pyramid.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_side.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_slope.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_slope_edge.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_slope_edge_upsdwn.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_slope_inner_edge.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_slope_inner_edge_upsdwn.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_slope_lying.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_slope_upsdwn.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_sphere.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_spike.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_stick.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_top.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_top_active.png (100%) rename {technic => technic_cnc}/textures/technic_cnc_twocurvededge.png (100%) diff --git a/technic/locale/de.txt b/technic/locale/de.txt index 855ec5a..69bcb3d 100644 --- a/technic/locale/de.txt +++ b/technic/locale/de.txt @@ -67,7 +67,6 @@ Disabled = %s Alloy Furnace = %s Legierungsofen %s Battery Box = %s Batteriebox %s Cable = %s Kabel -%s CNC Machine = %s CNC-Maschine %s Compressor = %s Kompressor %s Extractor = %s Extraktor %s Forcefield Emitter = %s Kraftfeld-Emitter @@ -121,41 +120,6 @@ Digging finished = Digging %d m above machine = Digging %d m below machine = -## CNC -Cylinder = Zylinder -Element Cross = Halbes Kreuzelement -Element Cross Double = Kreuzelement -Element Edge = Halbes Eckelement -Element Edge Double = Eckelement -Element End = Halbes Endelement -Element End Double = Endelement -Element Straight = Halbes aufrechtes Element -Element Straight Double = Aufrechtes Element -Element T = Halbes T-Element -Element T Double = T-Element -Horizontal Cylinder = Liegender Zylinder -One Curved Edge Block = Block mit einer abgerundeten Kante -Pyramid = Pyramide -Slope = Schraege -Slope Edge = Schraege mit Ecke -Slope Inner Edge = Schraege mit Innenecke -Slope Lying = Liegende Schraege -Slope Upside Down = Umgedrehte Schraege -Slope Upside Down Edge = Umgedrehte Schraege mit Ecke -Slope Upside Down Inner Edge = Umgedrehte Schraege mit Innenecke -Sphere = Kugel -Spike = Spitze -Stick = Stange -Two Curved Edge Block = Block mit zwei abgerundeten Kanten -Brick = Ziegel: -Cobble = Pflasterstein: -Dirt = Erde: -Leaves = Laub: -Sandstone = Sandstein: -Stone = Stein: -Tree = Baumstamm: -Wooden = Holz: - ## Grinder Recipes # $1: Name %s Dust = %sstaub diff --git a/technic/locale/es.txt b/technic/locale/es.txt index 7945d65..2c1cdca 100644 --- a/technic/locale/es.txt +++ b/technic/locale/es.txt @@ -63,7 +63,6 @@ Disabled = %s Alloy Furnace = Horno de Aleacion %s %s Battery Box = Caja de Bateria %s %s Cable = Cable %s -%s CNC Machine = Maquina CNC %s %s Compressor = Compresor %s %s Extractor = Extractor %s %s Forcefield Emitter = Emisor de Campo de Fuerza %s @@ -115,40 +114,6 @@ Digging finished = Digging %d m above machine = Digging %d m below machine = -## CNC Machine -Element Edge = Elemento Borde -Tree = Arbol -Element Cross Double = Elemento Cruz Doble -Spike = Pica -Element Edge Double = Elemento Borde Doble -Two Curved Edge Block = Dos Bloques de Borde Curvados -Pyramid = Piramide -Slope Upside Down Inner Edge = Borde Interno de Rampa Al Reves -Slope Upside Down Edge = Borde de Rampa Al Reves -Element Straight Double = Elemento Doble Recto -Sphere = Esfera -Element End Double = Doble Fin de Elemento -Element Straight = Recta de Elemento -Horizontal Cylinder = Cilindro Horizontal -Slope Inner Edge = Borde Interno de Rampa -One Curved Edge Block = Un Bloque de Borde Curvado -Element Cross = Cruce de Elementos -Stick = Varita -Element End = Fin de Elemento -Slope Lying = Rampa en Reposo -Slope Upside Down = Rampa Al Reves -Slope Edge = Borde de Rampa -Slope = Rampa -Element T = Elemento T -Cylinder = Cilindro -Cobble = Adoquines -Stone = Piedra -Brick = Ladrillo -Dirt = Tierra -Sandstone = Arenisca -Wooden = Madera -Leaves = Hojas - ## Grinder Recipes # $1: Name %s Dust = Polvo de %s diff --git a/technic/locale/it.txt b/technic/locale/it.txt index a092a53..18b0e4f 100644 --- a/technic/locale/it.txt +++ b/technic/locale/it.txt @@ -64,7 +64,6 @@ Disabled = Disabilitato %s Alloy Furnace = %s Fornace per leghe %s Battery Box = %s Box batterie %s Cable = Cavo %s -%s CNC Machine = Tornio CNC %s %s Compressor = Compressore %s %s Extractor = Estrattore %s %s Forcefield Emitter = Emettitore di campo di forza %s @@ -118,41 +117,6 @@ Digging finished = Scavo finito Digging %d m above machine = Scavo di %d m sopra la macchina Digging %d m below machine = Scavo di %d m sotto la macchina -## CNC -Cylinder = Cilindro -Element Cross = Elemento a croce -Element Cross Double = Elemento a croce doppio -Element Edge = Elemento bordo -Element Edge Double = Elemento bordo doppio -Element End = Elemento finale -Element End Double = Elemento finale doppio -Element Straight = Elemento dritto -Element Straight Double = Elemento dritto doppio -Element T = Elemento a T -Element T Double = Elemento a T doppio -Horizontal Cylinder = Cilindro orizzontale -One Curved Edge Block = Blocco con bordo curvo -Pyramid = Piramide -Slope = Inclinato -Slope Edge = Bordo inclinato -Slope Inner Edge = Bordo interno inclinato -Slope Lying = Pendenza bugiarda -Slope Upside Down = Pendenza capovolta -Slope Upside Down Edge = Bordo inclinato capovolto -Slope Upside Down Inner Edge = Bordo interno inclinato capovolto -Sphere = Sfera -Spike = Spuntone -Stick = Bastone -Two Curved Edge Block = Blocco con bordo a doppia curva -Brick = Mattone -Cobble = Ciottolato -Dirt = Terra -Leaves = Foglie -Sandstone = Arenaria -Stone = Pietra -Tree = Albero -Wooden = Legno - ## Grinder Recipes # $1: Name %s Dust = Polvere di %s diff --git a/technic/locale/template.txt b/technic/locale/template.txt index 0464241..f94ccda 100644 --- a/technic/locale/template.txt +++ b/technic/locale/template.txt @@ -71,7 +71,6 @@ Disabled = %s Alloy Furnace = %s Battery Box = %s Cable = -%s CNC Machine = %s Centrifuge = %s Compressor = %s Extractor = @@ -127,40 +126,6 @@ Digging %d m above machine = Digging %d m below machine = @1 (@2 @3 -> @4 @5) = -## CNC -Cylinder = -Element Cross = -Element Cross Double = -Element Edge = -Element Edge Double = -Element End = -Element End Double = -Element Straight = -Element Straight Double = -Element T = -Element T Double = -Horizontal Cylinder = -One Curved Edge Block = -Pyramid = -Slope = -Slope Edge = -Slope Inner Edge = -Slope Lying = -Slope Upside Down = -Slope Upside Down Edge = -Slope Upside Down Inner Edge = -Sphere = -Spike = -Stick = -Two Curved Edge Block = -Brick = -Cobble = -Dirt = -Leaves = -Sandstone = -Stone = -Tree = -Wooden = ## Grinder Recipes # $1: Name diff --git a/technic/machines/LV/init.lua b/technic/machines/LV/init.lua index 30523c9..fde684d 100644 --- a/technic/machines/LV/init.lua +++ b/technic/machines/LV/init.lua @@ -22,8 +22,3 @@ dofile(path.."/extractor.lua") dofile(path.."/compressor.lua") dofile(path.."/music_player.lua") - -dofile(path.."/cnc.lua") -dofile(path.."/cnc_api.lua") -dofile(path.."/cnc_nodes.lua") - diff --git a/technic/machines/LV/cnc.lua b/technic_cnc/cnc.lua similarity index 98% rename from technic/machines/LV/cnc.lua rename to technic_cnc/cnc.lua index b8eb729..642560f 100644 --- a/technic/machines/LV/cnc.lua +++ b/technic_cnc/cnc.lua @@ -7,8 +7,9 @@ -- I could imagine some form of API allowing modders to come with their own node -- box definitions and easily stuff it in the this machine for production. -local S = technic.getter +local technic_modpath = minetest.get_modpath("technic") +local S = technic.getter minetest.register_craft({ output = 'technic:cnc', @@ -181,7 +182,7 @@ local run = function(pos, node) end -- The actual block inactive state -minetest.register_node("technic:cnc", { +minetest.register_node(":technic:cnc", { description = S("%s CNC Machine"):format("LV"), tiles = {"technic_cnc_top.png", "technic_cnc_bottom.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front.png"}, @@ -207,7 +208,7 @@ minetest.register_node("technic:cnc", { }) -- Active state block -minetest.register_node("technic:cnc_active", { +minetest.register_node(":technic:cnc_active", { description = S("%s CNC Machine"):format("LV"), tiles = {"technic_cnc_top_active.png", "technic_cnc_bottom.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front_active.png"}, diff --git a/technic/machines/LV/cnc_api.lua b/technic_cnc/cnc_api.lua similarity index 94% rename from technic/machines/LV/cnc_api.lua rename to technic_cnc/cnc_api.lua index f5aae5c..c801fbc 100644 --- a/technic/machines/LV/cnc_api.lua +++ b/technic_cnc/cnc_api.lua @@ -83,7 +83,7 @@ technic.cnc.programs = { }, { suffix = "technic_cnc_oblate_spheroid", - model = "technic_oblate_spheroid.obj", + model = "technic_cnc_oblate_spheroid.obj", desc = S("Oblate spheroid"), cbox = { type = "fixed", @@ -96,32 +96,32 @@ technic.cnc.programs = { }, { suffix = "technic_cnc_sphere", - model = "technic_sphere.obj", + model = "technic_cnc_sphere.obj", desc = S("Sphere") }, { suffix = "technic_cnc_cylinder_horizontal", - model = "technic_cylinder_horizontal.obj", + model = "technic_cnc_cylinder_horizontal.obj", desc = S("Horizontal Cylinder") }, { suffix = "technic_cnc_cylinder", - model = "technic_cylinder.obj", + model = "technic_cnc_cylinder.obj", desc = S("Cylinder") }, { suffix = "technic_cnc_twocurvededge", - model = "technic_two_curved_edge.obj", + model = "technic_cnc_two_curved_edge.obj", desc = S("Two Curved Edge/Corner Block") }, { suffix = "technic_cnc_onecurvededge", - model = "technic_one_curved_edge.obj", + model = "technic_cnc_one_curved_edge.obj", desc = S("One Curved Edge Block") }, { suffix = "technic_cnc_spike", - model = "technic_pyramid_spike.obj", + model = "technic_cnc_pyramid_spike.obj", desc = S("Spike"), cbox = { type = "fixed", @@ -135,7 +135,7 @@ technic.cnc.programs = { }, { suffix = "technic_cnc_pyramid", - model = "technic_pyramid.obj", + model = "technic_cnc_pyramid.obj", desc = S("Pyramid"), cbox = { type = "fixed", @@ -149,7 +149,7 @@ technic.cnc.programs = { }, { suffix = "technic_cnc_slope_inner_edge_upsdown", - model = "technic_innercorner_upsdown.obj", + model = "technic_cnc_innercorner_upsdown.obj", desc = S("Slope Upside Down Inner Edge/Corner"), sbox = { type = "fixed", @@ -170,7 +170,7 @@ technic.cnc.programs = { }, { suffix = "technic_cnc_slope_edge_upsdown", - model = "technic_outercorner_upsdown.obj", + model = "technic_cnc_outercorner_upsdown.obj", desc = S("Slope Upside Down Outer Edge/Corner"), cbox = { type = "fixed", @@ -184,7 +184,7 @@ technic.cnc.programs = { }, { suffix = "technic_cnc_slope_inner_edge", - model = "technic_innercorner.obj", + model = "technic_cnc_innercorner.obj", desc = S("Slope Inner Edge/Corner"), sbox = { type = "fixed", @@ -205,7 +205,7 @@ technic.cnc.programs = { }, { suffix = "technic_cnc_slope_edge", - model = "technic_outercorner.obj", + model = "technic_cnc_outercorner.obj", desc = S("Slope Outer Edge/Corner"), cbox = { type = "fixed", @@ -219,7 +219,7 @@ technic.cnc.programs = { }, { suffix = "technic_cnc_slope_upsdown", - model = "technic_slope_upsdown.obj", + model = "technic_cnc_slope_upsdown.obj", desc = S("Slope Upside Down"), cbox = { type = "fixed", @@ -233,7 +233,7 @@ technic.cnc.programs = { }, { suffix = "technic_cnc_slope_lying", - model = "technic_slope_horizontal.obj", + model = "technic_cnc_slope_horizontal.obj", desc = S("Slope Lying"), cbox = { type = "fixed", @@ -247,7 +247,7 @@ technic.cnc.programs = { }, { suffix = "technic_cnc_slope", - model = "technic_slope.obj", + model = "technic_cnc_slope.obj", desc = S("Slope"), cbox = { type = "fixed", diff --git a/technic/machines/LV/cnc_nodes.lua b/technic_cnc/cnc_materials.lua similarity index 100% rename from technic/machines/LV/cnc_nodes.lua rename to technic_cnc/cnc_materials.lua diff --git a/technic_cnc/depends.txt b/technic_cnc/depends.txt new file mode 100644 index 0000000..d684218 --- /dev/null +++ b/technic_cnc/depends.txt @@ -0,0 +1,2 @@ +default +technic diff --git a/technic_cnc/init.lua b/technic_cnc/init.lua new file mode 100644 index 0000000..afdb0b8 --- /dev/null +++ b/technic_cnc/init.lua @@ -0,0 +1,13 @@ +local modpath = minetest.get_modpath("technic_cnc") + +technic_cnc = {} + +if rawget(_G, "intllib") then + technic_cnc.getter = intllib.Getter() +else + technic_cnc.getter = function(s,a,...)if a==nil then return s end a={a,...}return s:gsub("(@?)@(%(?)(%d+)(%)?)",function(e,o,n,c)if e==""then return a[tonumber(n)]..(o==""and c or"")else return"@"..o..n..c end end) end +end + +dofile(modpath.."/cnc.lua") +dofile(modpath.."/cnc_api.lua") +dofile(modpath.."/cnc_materials.lua") diff --git a/technic_cnc/locale/de.txt b/technic_cnc/locale/de.txt new file mode 100644 index 0000000..a8a3962 --- /dev/null +++ b/technic_cnc/locale/de.txt @@ -0,0 +1,35 @@ +## CNC +%s CNC Machine = %s CNC-Maschine +Cylinder = Zylinder +Element Cross = Halbes Kreuzelement +Element Cross Double = Kreuzelement +Element Edge = Halbes Eckelement +Element Edge Double = Eckelement +Element End = Halbes Endelement +Element End Double = Endelement +Element Straight = Halbes aufrechtes Element +Element Straight Double = Aufrechtes Element +Element T = Halbes T-Element +Element T Double = T-Element +Horizontal Cylinder = Liegender Zylinder +One Curved Edge Block = Block mit einer abgerundeten Kante +Pyramid = Pyramide +Slope = Schraege +Slope Edge = Schraege mit Ecke +Slope Inner Edge = Schraege mit Innenecke +Slope Lying = Liegende Schraege +Slope Upside Down = Umgedrehte Schraege +Slope Upside Down Edge = Umgedrehte Schraege mit Ecke +Slope Upside Down Inner Edge = Umgedrehte Schraege mit Innenecke +Sphere = Kugel +Spike = Spitze +Stick = Stange +Two Curved Edge Block = Block mit zwei abgerundeten Kanten +Brick = Ziegel: +Cobble = Pflasterstein: +Dirt = Erde: +Leaves = Laub: +Sandstone = Sandstein: +Stone = Stein: +Tree = Baumstamm: +Wooden = Holz: diff --git a/technic_cnc/locale/es.txt b/technic_cnc/locale/es.txt new file mode 100644 index 0000000..036f987 --- /dev/null +++ b/technic_cnc/locale/es.txt @@ -0,0 +1,34 @@ +## CNC +%s CNC Machine = Maquina CNC %s +Element Edge = Elemento Borde +Tree = Arbol +Element Cross Double = Elemento Cruz Doble +Spike = Pica +Element Edge Double = Elemento Borde Doble +Two Curved Edge Block = Dos Bloques de Borde Curvados +Pyramid = Piramide +Slope Upside Down Inner Edge = Borde Interno de Rampa Al Reves +Slope Upside Down Edge = Borde de Rampa Al Reves +Element Straight Double = Elemento Doble Recto +Sphere = Esfera +Element End Double = Doble Fin de Elemento +Element Straight = Recta de Elemento +Horizontal Cylinder = Cilindro Horizontal +Slope Inner Edge = Borde Interno de Rampa +One Curved Edge Block = Un Bloque de Borde Curvado +Element Cross = Cruce de Elementos +Stick = Varita +Element End = Fin de Elemento +Slope Lying = Rampa en Reposo +Slope Upside Down = Rampa Al Reves +Slope Edge = Borde de Rampa +Slope = Rampa +Element T = Elemento T +Cylinder = Cilindro +Cobble = Adoquines +Stone = Piedra +Brick = Ladrillo +Dirt = Tierra +Sandstone = Arenisca +Wooden = Madera +Leaves = Hojas diff --git a/technic_cnc/locale/it.txt b/technic_cnc/locale/it.txt new file mode 100644 index 0000000..1527f11 --- /dev/null +++ b/technic_cnc/locale/it.txt @@ -0,0 +1,35 @@ +## CNC +%s CNC Machine = Tornio CNC %s +Cylinder = Cilindro +Element Cross = Elemento a croce +Element Cross Double = Elemento a croce doppio +Element Edge = Elemento bordo +Element Edge Double = Elemento bordo doppio +Element End = Elemento finale +Element End Double = Elemento finale doppio +Element Straight = Elemento dritto +Element Straight Double = Elemento dritto doppio +Element T = Elemento a T +Element T Double = Elemento a T doppio +Horizontal Cylinder = Cilindro orizzontale +One Curved Edge Block = Blocco con bordo curvo +Pyramid = Piramide +Slope = Inclinato +Slope Edge = Bordo inclinato +Slope Inner Edge = Bordo interno inclinato +Slope Lying = Pendenza bugiarda +Slope Upside Down = Pendenza capovolta +Slope Upside Down Edge = Bordo inclinato capovolto +Slope Upside Down Inner Edge = Bordo interno inclinato capovolto +Sphere = Sfera +Spike = Spuntone +Stick = Bastone +Two Curved Edge Block = Blocco con bordo a doppia curva +Brick = Mattone +Cobble = Ciottolato +Dirt = Terra +Leaves = Foglie +Sandstone = Arenaria +Stone = Pietra +Tree = Albero +Wooden = Legno diff --git a/technic_cnc/locale/template.txt b/technic_cnc/locale/template.txt new file mode 100644 index 0000000..2b159ea --- /dev/null +++ b/technic_cnc/locale/template.txt @@ -0,0 +1,35 @@ +## CNC +%s CNC Machine = +Cylinder = +Element Cross = +Element Cross Double = +Element Edge = +Element Edge Double = +Element End = +Element End Double = +Element Straight = +Element Straight Double = +Element T = +Element T Double = +Horizontal Cylinder = +One Curved Edge Block = +Pyramid = +Slope = +Slope Edge = +Slope Inner Edge = +Slope Lying = +Slope Upside Down = +Slope Upside Down Edge = +Slope Upside Down Inner Edge = +Sphere = +Spike = +Stick = +Two Curved Edge Block = +Brick = +Cobble = +Dirt = +Leaves = +Sandstone = +Stone = +Tree = +Wooden = diff --git a/technic/models/technic_cylinder.obj b/technic_cnc/models/technic_cnc_cylinder.obj similarity index 100% rename from technic/models/technic_cylinder.obj rename to technic_cnc/models/technic_cnc_cylinder.obj diff --git a/technic/models/technic_cylinder_horizontal.obj b/technic_cnc/models/technic_cnc_cylinder_horizontal.obj similarity index 100% rename from technic/models/technic_cylinder_horizontal.obj rename to technic_cnc/models/technic_cnc_cylinder_horizontal.obj diff --git a/technic/models/technic_innercorner.obj b/technic_cnc/models/technic_cnc_innercorner.obj similarity index 100% rename from technic/models/technic_innercorner.obj rename to technic_cnc/models/technic_cnc_innercorner.obj diff --git a/technic/models/technic_innercorner_upsdown.obj b/technic_cnc/models/technic_cnc_innercorner_upsdown.obj similarity index 100% rename from technic/models/technic_innercorner_upsdown.obj rename to technic_cnc/models/technic_cnc_innercorner_upsdown.obj diff --git a/technic/models/technic_oblate_spheroid.obj b/technic_cnc/models/technic_cnc_oblate_spheroid.obj similarity index 100% rename from technic/models/technic_oblate_spheroid.obj rename to technic_cnc/models/technic_cnc_oblate_spheroid.obj diff --git a/technic/models/technic_one_curved_edge.obj b/technic_cnc/models/technic_cnc_one_curved_edge.obj similarity index 100% rename from technic/models/technic_one_curved_edge.obj rename to technic_cnc/models/technic_cnc_one_curved_edge.obj diff --git a/technic/models/technic_outercorner.obj b/technic_cnc/models/technic_cnc_outercorner.obj similarity index 100% rename from technic/models/technic_outercorner.obj rename to technic_cnc/models/technic_cnc_outercorner.obj diff --git a/technic/models/technic_outercorner_upsdown.obj b/technic_cnc/models/technic_cnc_outercorner_upsdown.obj similarity index 100% rename from technic/models/technic_outercorner_upsdown.obj rename to technic_cnc/models/technic_cnc_outercorner_upsdown.obj diff --git a/technic/models/technic_pyramid.obj b/technic_cnc/models/technic_cnc_pyramid.obj similarity index 100% rename from technic/models/technic_pyramid.obj rename to technic_cnc/models/technic_cnc_pyramid.obj diff --git a/technic/models/technic_pyramid_spike.obj b/technic_cnc/models/technic_cnc_pyramid_spike.obj similarity index 100% rename from technic/models/technic_pyramid_spike.obj rename to technic_cnc/models/technic_cnc_pyramid_spike.obj diff --git a/technic/models/technic_slope.obj b/technic_cnc/models/technic_cnc_slope.obj similarity index 100% rename from technic/models/technic_slope.obj rename to technic_cnc/models/technic_cnc_slope.obj diff --git a/technic/models/technic_slope_horizontal.obj b/technic_cnc/models/technic_cnc_slope_horizontal.obj similarity index 100% rename from technic/models/technic_slope_horizontal.obj rename to technic_cnc/models/technic_cnc_slope_horizontal.obj diff --git a/technic/models/technic_slope_upsdown.obj b/technic_cnc/models/technic_cnc_slope_upsdown.obj similarity index 100% rename from technic/models/technic_slope_upsdown.obj rename to technic_cnc/models/technic_cnc_slope_upsdown.obj diff --git a/technic/models/technic_sphere.obj b/technic_cnc/models/technic_cnc_sphere.obj similarity index 100% rename from technic/models/technic_sphere.obj rename to technic_cnc/models/technic_cnc_sphere.obj diff --git a/technic/models/technic_two_curved_edge.obj b/technic_cnc/models/technic_cnc_two_curved_edge.obj similarity index 100% rename from technic/models/technic_two_curved_edge.obj rename to technic_cnc/models/technic_cnc_two_curved_edge.obj diff --git a/technic/textures/technic_cnc_bottom.png b/technic_cnc/textures/technic_cnc_bottom.png similarity index 100% rename from technic/textures/technic_cnc_bottom.png rename to technic_cnc/textures/technic_cnc_bottom.png diff --git a/technic/textures/technic_cnc_cylinder.png b/technic_cnc/textures/technic_cnc_cylinder.png similarity index 100% rename from technic/textures/technic_cnc_cylinder.png rename to technic_cnc/textures/technic_cnc_cylinder.png diff --git a/technic/textures/technic_cnc_cylinder_horizontal.png b/technic_cnc/textures/technic_cnc_cylinder_horizontal.png similarity index 100% rename from technic/textures/technic_cnc_cylinder_horizontal.png rename to technic_cnc/textures/technic_cnc_cylinder_horizontal.png diff --git a/technic/textures/technic_cnc_element_cross.png b/technic_cnc/textures/technic_cnc_element_cross.png similarity index 100% rename from technic/textures/technic_cnc_element_cross.png rename to technic_cnc/textures/technic_cnc_element_cross.png diff --git a/technic/textures/technic_cnc_element_edge.png b/technic_cnc/textures/technic_cnc_element_edge.png similarity index 100% rename from technic/textures/technic_cnc_element_edge.png rename to technic_cnc/textures/technic_cnc_element_edge.png diff --git a/technic/textures/technic_cnc_element_end.png b/technic_cnc/textures/technic_cnc_element_end.png similarity index 100% rename from technic/textures/technic_cnc_element_end.png rename to technic_cnc/textures/technic_cnc_element_end.png diff --git a/technic/textures/technic_cnc_element_straight.png b/technic_cnc/textures/technic_cnc_element_straight.png similarity index 100% rename from technic/textures/technic_cnc_element_straight.png rename to technic_cnc/textures/technic_cnc_element_straight.png diff --git a/technic/textures/technic_cnc_element_t.png b/technic_cnc/textures/technic_cnc_element_t.png similarity index 100% rename from technic/textures/technic_cnc_element_t.png rename to technic_cnc/textures/technic_cnc_element_t.png diff --git a/technic/textures/technic_cnc_front.png b/technic_cnc/textures/technic_cnc_front.png similarity index 100% rename from technic/textures/technic_cnc_front.png rename to technic_cnc/textures/technic_cnc_front.png diff --git a/technic/textures/technic_cnc_front_active.png b/technic_cnc/textures/technic_cnc_front_active.png similarity index 100% rename from technic/textures/technic_cnc_front_active.png rename to technic_cnc/textures/technic_cnc_front_active.png diff --git a/technic/textures/technic_cnc_full.png b/technic_cnc/textures/technic_cnc_full.png similarity index 100% rename from technic/textures/technic_cnc_full.png rename to technic_cnc/textures/technic_cnc_full.png diff --git a/technic/textures/technic_cnc_half.png b/technic_cnc/textures/technic_cnc_half.png similarity index 100% rename from technic/textures/technic_cnc_half.png rename to technic_cnc/textures/technic_cnc_half.png diff --git a/technic/textures/technic_cnc_milling_background.png b/technic_cnc/textures/technic_cnc_milling_background.png similarity index 100% rename from technic/textures/technic_cnc_milling_background.png rename to technic_cnc/textures/technic_cnc_milling_background.png diff --git a/technic/textures/technic_cnc_oblate_spheroid.png b/technic_cnc/textures/technic_cnc_oblate_spheroid.png similarity index 100% rename from technic/textures/technic_cnc_oblate_spheroid.png rename to technic_cnc/textures/technic_cnc_oblate_spheroid.png diff --git a/technic/textures/technic_cnc_onecurvededge.png b/technic_cnc/textures/technic_cnc_onecurvededge.png similarity index 100% rename from technic/textures/technic_cnc_onecurvededge.png rename to technic_cnc/textures/technic_cnc_onecurvededge.png diff --git a/technic/textures/technic_cnc_pyramid.png b/technic_cnc/textures/technic_cnc_pyramid.png similarity index 100% rename from technic/textures/technic_cnc_pyramid.png rename to technic_cnc/textures/technic_cnc_pyramid.png diff --git a/technic/textures/technic_cnc_side.png b/technic_cnc/textures/technic_cnc_side.png similarity index 100% rename from technic/textures/technic_cnc_side.png rename to technic_cnc/textures/technic_cnc_side.png diff --git a/technic/textures/technic_cnc_slope.png b/technic_cnc/textures/technic_cnc_slope.png similarity index 100% rename from technic/textures/technic_cnc_slope.png rename to technic_cnc/textures/technic_cnc_slope.png diff --git a/technic/textures/technic_cnc_slope_edge.png b/technic_cnc/textures/technic_cnc_slope_edge.png similarity index 100% rename from technic/textures/technic_cnc_slope_edge.png rename to technic_cnc/textures/technic_cnc_slope_edge.png diff --git a/technic/textures/technic_cnc_slope_edge_upsdwn.png b/technic_cnc/textures/technic_cnc_slope_edge_upsdwn.png similarity index 100% rename from technic/textures/technic_cnc_slope_edge_upsdwn.png rename to technic_cnc/textures/technic_cnc_slope_edge_upsdwn.png diff --git a/technic/textures/technic_cnc_slope_inner_edge.png b/technic_cnc/textures/technic_cnc_slope_inner_edge.png similarity index 100% rename from technic/textures/technic_cnc_slope_inner_edge.png rename to technic_cnc/textures/technic_cnc_slope_inner_edge.png diff --git a/technic/textures/technic_cnc_slope_inner_edge_upsdwn.png b/technic_cnc/textures/technic_cnc_slope_inner_edge_upsdwn.png similarity index 100% rename from technic/textures/technic_cnc_slope_inner_edge_upsdwn.png rename to technic_cnc/textures/technic_cnc_slope_inner_edge_upsdwn.png diff --git a/technic/textures/technic_cnc_slope_lying.png b/technic_cnc/textures/technic_cnc_slope_lying.png similarity index 100% rename from technic/textures/technic_cnc_slope_lying.png rename to technic_cnc/textures/technic_cnc_slope_lying.png diff --git a/technic/textures/technic_cnc_slope_upsdwn.png b/technic_cnc/textures/technic_cnc_slope_upsdwn.png similarity index 100% rename from technic/textures/technic_cnc_slope_upsdwn.png rename to technic_cnc/textures/technic_cnc_slope_upsdwn.png diff --git a/technic/textures/technic_cnc_sphere.png b/technic_cnc/textures/technic_cnc_sphere.png similarity index 100% rename from technic/textures/technic_cnc_sphere.png rename to technic_cnc/textures/technic_cnc_sphere.png diff --git a/technic/textures/technic_cnc_spike.png b/technic_cnc/textures/technic_cnc_spike.png similarity index 100% rename from technic/textures/technic_cnc_spike.png rename to technic_cnc/textures/technic_cnc_spike.png diff --git a/technic/textures/technic_cnc_stick.png b/technic_cnc/textures/technic_cnc_stick.png similarity index 100% rename from technic/textures/technic_cnc_stick.png rename to technic_cnc/textures/technic_cnc_stick.png diff --git a/technic/textures/technic_cnc_top.png b/technic_cnc/textures/technic_cnc_top.png similarity index 100% rename from technic/textures/technic_cnc_top.png rename to technic_cnc/textures/technic_cnc_top.png diff --git a/technic/textures/technic_cnc_top_active.png b/technic_cnc/textures/technic_cnc_top_active.png similarity index 100% rename from technic/textures/technic_cnc_top_active.png rename to technic_cnc/textures/technic_cnc_top_active.png diff --git a/technic/textures/technic_cnc_twocurvededge.png b/technic_cnc/textures/technic_cnc_twocurvededge.png similarity index 100% rename from technic/textures/technic_cnc_twocurvededge.png rename to technic_cnc/textures/technic_cnc_twocurvededge.png From d40946fa3876d0fbef8c91cf2ba997339b7d1caa Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sun, 25 Nov 2018 08:13:56 -0500 Subject: [PATCH 08/13] allow CNC to work without technic minetest.conf technic_cnc_use_technic = false disables use of power, returns items instantly, uses only default stuff in craft recipe (defaults to enabled if technic is installed) --- technic_cnc/cnc.lua | 144 +++++++++++++++++++++++++--------- technic_cnc/cnc_api.lua | 78 +++++++++--------- technic_cnc/cnc_materials.lua | 78 +++++++++--------- technic_cnc/depends.txt | 2 +- technic_cnc/init.lua | 5 ++ 5 files changed, 193 insertions(+), 114 deletions(-) diff --git a/technic_cnc/cnc.lua b/technic_cnc/cnc.lua index 642560f..bc277d1 100644 --- a/technic_cnc/cnc.lua +++ b/technic_cnc/cnc.lua @@ -7,19 +7,71 @@ -- I could imagine some form of API allowing modders to come with their own node -- box definitions and easily stuff it in the this machine for production. -local technic_modpath = minetest.get_modpath("technic") +local S = technic_cnc.getter -local S = technic.getter +local allow_metadata_inventory_put +local allow_metadata_inventory_take +local allow_metadata_inventory_move +local can_dig +local voltage = "" -minetest.register_craft({ - output = 'technic:cnc', - recipe = { - {'default:glass', 'technic:diamond_drill_head', 'default:glass'}, - {'technic:control_logic_unit', 'technic:machine_casing', 'basic_materials:motor'}, - {'technic:carbon_steel_ingot', 'technic:lv_cable', 'technic:carbon_steel_ingot'}, - }, -}) +if technic_cnc.use_technic then + minetest.register_craft({ + output = 'technic:cnc', + recipe = { + {'default:glass', 'technic:diamond_drill_head', 'default:glass'}, + {'technic:control_logic_unit', 'technic:machine_casing', 'basic_materials:motor'}, + {'technic:carbon_steel_ingot', 'technic:lv_cable', 'technic:carbon_steel_ingot'}, + }, + }) + allow_metadata_inventory_put = technic.machine_inventory_put + allow_metadata_inventory_take = technic.machine_inventory_take + allow_metadata_inventory_move = technic.machine_inventory_move + can_dig = technic.machine_can_dig + voltage = "LV " + +else + minetest.register_craft({ + output = 'technic:cnc', + recipe = { + {'default:glass', 'default:diamond', 'default:glass'}, + {'basic_materials:ic', 'default:steelblock', 'basic_materials:motor'}, + {'default:steel_ingot', 'default:mese', 'default:steel_ingot'}, + }, + }) + + allow_metadata_inventory_put = function(pos, listname, index, stack, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + return stack:get_count() + end + + allow_metadata_inventory_take = function(pos, listname, index, stack, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + return stack:get_count() + end + + allow_metadata_inventory_move = function(pos, from_list, from_index, + to_list, to_index, count, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + return stack:get_count() + end + + can_dig = function(pos, player) + if player and minetest.is_protected(pos, player:get_player_name()) then return false end + local meta = minetest.get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("dst") + and inv:is_empty("src") + and default.can_interact_with_node(player, pos) + end +end local shape = {} local onesize_products = { @@ -140,7 +192,19 @@ local function form_handler(pos, formname, fields, sender) break end end - return + + if not technic_cnc.use_technic then + local result = meta:get_string("cnc_product") + + if not inv:is_empty("src") + and minetest.registered_nodes[result] + and inv:room_for_item("dst", result) then + local srcstack = inv:get_stack("src", 1) + srcstack:take_item() + inv:set_stack("src", 1, srcstack) + inv:add_item("dst", result.." "..meta:get_int("cnc_multiplier")) + end + end end -- Action code performing the transformation @@ -148,7 +212,7 @@ local run = function(pos, node) local meta = minetest.get_meta(pos) local inv = meta:get_inventory() local eu_input = meta:get_int("LV_EU_input") - local machine_name = S("%s CNC Machine"):format("LV") + local machine_name = S("%sCNC Machine"):format(voltage) local machine_node = "technic:cnc" local demand = 450 @@ -183,7 +247,7 @@ end -- The actual block inactive state minetest.register_node(":technic:cnc", { - description = S("%s CNC Machine"):format("LV"), + description = S("%sCNC Machine"):format(voltage), tiles = {"technic_cnc_top.png", "technic_cnc_bottom.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front.png"}, groups = {cracky=2, technic_machine=1, technic_lv=1}, @@ -192,40 +256,44 @@ minetest.register_node(":technic:cnc", { legacy_facedir_simple = true, on_construct = function(pos) local meta = minetest.get_meta(pos) - meta:set_string("infotext", S("%s CNC Machine"):format("LV")) + meta:set_string("infotext", S("%sCNC Machine"):format(voltage)) meta:set_float("technic_power_machine", 1) meta:set_string("formspec", cnc_formspec) local inv = meta:get_inventory() inv:set_size("src", 1) inv:set_size("dst", 4) end, - can_dig = technic.machine_can_dig, - allow_metadata_inventory_put = technic.machine_inventory_put, - allow_metadata_inventory_take = technic.machine_inventory_take, - allow_metadata_inventory_move = technic.machine_inventory_move, + can_dig = can_dig, + allow_metadata_inventory_put = allow_metadata_inventory_put, + allow_metadata_inventory_take = allow_metadata_inventory_take, + allow_metadata_inventory_move = allow_metadata_inventory_move, on_receive_fields = form_handler, - technic_run = run, + technic_run = technic_cnc.use_technic and run, }) -- Active state block -minetest.register_node(":technic:cnc_active", { - description = S("%s CNC Machine"):format("LV"), - tiles = {"technic_cnc_top_active.png", "technic_cnc_bottom.png", "technic_cnc_side.png", - "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front_active.png"}, - groups = {cracky=2, technic_machine=1, technic_lv=1, not_in_creative_inventory=1}, - connect_sides = {"bottom", "back", "left", "right"}, - paramtype2 = "facedir", - drop = "technic:cnc", - legacy_facedir_simple = true, - can_dig = technic.machine_can_dig, - allow_metadata_inventory_put = technic.machine_inventory_put, - allow_metadata_inventory_take = technic.machine_inventory_take, - allow_metadata_inventory_move = technic.machine_inventory_move, - on_receive_fields = form_handler, - technic_run = run, - technic_disabled_machine_name = "technic:cnc", -}) +if technic_cnc.use_technic then -technic.register_machine("LV", "technic:cnc", technic.receiver) -technic.register_machine("LV", "technic:cnc_active", technic.receiver) + minetest.register_node(":technic:cnc_active", { + description = S("%sCNC Machine"):format(voltage), + tiles = {"technic_cnc_top_active.png", "technic_cnc_bottom.png", "technic_cnc_side.png", + "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front_active.png"}, + groups = {cracky=2, technic_machine=1, technic_lv=1, not_in_creative_inventory=1}, + connect_sides = {"bottom", "back", "left", "right"}, + paramtype2 = "facedir", + drop = "technic:cnc", + legacy_facedir_simple = true, + can_dig = can_dig, + allow_metadata_inventory_put = allow_metadata_inventory_put, + allow_metadata_inventory_take = allow_metadata_inventory_take, + allow_metadata_inventory_move = allow_metadata_inventory_move, + on_receive_fields = form_handler, + technic_run = run, + technic_disabled_machine_name = "technic:cnc", + }) + technic.register_machine("LV", "technic:cnc", technic.receiver) + technic.register_machine("LV", "technic:cnc_active", technic.receiver) +else + minetest.register_alias("technic:cnc_active", "technic:cnc") +end diff --git a/technic_cnc/cnc_api.lua b/technic_cnc/cnc_api.lua index c801fbc..c33ef49 100644 --- a/technic_cnc/cnc_api.lua +++ b/technic_cnc/cnc_api.lua @@ -1,16 +1,14 @@ -- API for the technic CNC machine -- Again code is adapted from the NonCubic Blocks MOD v1.4 by yves_de_beck -local S = technic.getter - -technic.cnc = {} +local S = technic_cnc.getter -- REGISTER NONCUBIC FORMS, CREATE MODELS AND RECIPES: ------------------------------------------------------ -- Define slope boxes for the various nodes ------------------------------------------- -technic.cnc.programs = { +technic_cnc.programs = { { suffix = "technic_cnc_stick", model = {-0.15, -0.5, -0.15, 0.15, 0.5, 0.15}, desc = S("Stick") @@ -263,7 +261,7 @@ technic.cnc.programs = { } -- Allow disabling certain programs for some node. Default is allowing all types for all nodes -technic.cnc.programs_disable = { +technic_cnc.programs_disable = { -- ["default:brick"] = {"technic_cnc_stick"}, -- Example: Disallow the stick for brick -- ... ["default:dirt"] = {"technic_cnc_oblate_spheroid", "technic_cnc_slope_upsdown", "technic_cnc_edge", @@ -273,7 +271,7 @@ technic.cnc.programs_disable = { } -- Generic function for registering all the different node types -function technic.cnc.register_program(recipeitem, suffix, model, groups, images, description, cbox, sbox) +function technic_cnc.register_program(recipeitem, suffix, model, groups, images, description, cbox, sbox) local dtype local nodeboxdef @@ -308,12 +306,12 @@ function technic.cnc.register_program(recipeitem, suffix, model, groups, images, end -- function to iterate over all the programs the CNC machine knows -function technic.cnc.register_all(recipeitem, groups, images, description) - for _, data in ipairs(technic.cnc.programs) do +function technic_cnc.register_all(recipeitem, groups, images, description) + for _, data in ipairs(technic_cnc.programs) do -- Disable node creation for disabled node types for some material local do_register = true - if technic.cnc.programs_disable[recipeitem] ~= nil then - for __, disable in ipairs(technic.cnc.programs_disable[recipeitem]) do + if technic_cnc.programs_disable[recipeitem] ~= nil then + for __, disable in ipairs(technic_cnc.programs_disable[recipeitem]) do if disable == data.suffix then do_register = false end @@ -321,49 +319,49 @@ function technic.cnc.register_all(recipeitem, groups, images, description) end -- Create the node if it passes the test if do_register then - technic.cnc.register_program(recipeitem, data.suffix, data.model, + technic_cnc.register_program(recipeitem, data.suffix, data.model, groups, images, description.." "..data.desc, data.cbox, data.sbox) end end end --- REGISTER NEW TECHNIC_CNC_API's PART 2: technic.cnc..register_element_end(subname, recipeitem, groups, images, desc_element_xyz) +-- REGISTER NEW TECHNIC_CNC_API's PART 2: technic_cnc..register_element_end(subname, recipeitem, groups, images, desc_element_xyz) ----------------------------------------------------------------------------------------------------------------------- -function technic.cnc.register_slope_edge_etc(recipeitem, groups, images, desc_slope, desc_slope_lying, desc_slope_upsdown, desc_slope_edge, desc_slope_inner_edge, desc_slope_upsdwn_edge, desc_slope_upsdwn_inner_edge, desc_pyramid, desc_spike, desc_onecurvededge, desc_twocurvededge, desc_cylinder, desc_cylinder_horizontal, desc_spheroid, desc_element_straight, desc_element_edge, desc_element_t, desc_element_cross, desc_element_end) +function technic_cnc.register_slope_edge_etc(recipeitem, groups, images, desc_slope, desc_slope_lying, desc_slope_upsdown, desc_slope_edge, desc_slope_inner_edge, desc_slope_upsdwn_edge, desc_slope_upsdwn_inner_edge, desc_pyramid, desc_spike, desc_onecurvededge, desc_twocurvededge, desc_cylinder, desc_cylinder_horizontal, desc_spheroid, desc_element_straight, desc_element_edge, desc_element_t, desc_element_cross, desc_element_end) - technic.cnc.register_slope(recipeitem, groups, images, desc_slope) - technic.cnc.register_slope_lying(recipeitem, groups, images, desc_slope_lying) - technic.cnc.register_slope_upsdown(recipeitem, groups, images, desc_slope_upsdown) - technic.cnc.register_slope_edge(recipeitem, groups, images, desc_slope_edge) - technic.cnc.register_slope_inner_edge(recipeitem, groups, images, desc_slope_inner_edge) - technic.cnc.register_slope_edge_upsdown(recipeitem, groups, images, desc_slope_upsdwn_edge) - technic.cnc.register_slope_inner_edge_upsdown(recipeitem, groups, images, desc_slope_upsdwn_inner_edge) - technic.cnc.register_pyramid(recipeitem, groups, images, desc_pyramid) - technic.cnc.register_spike(recipeitem, groups, images, desc_spike) - technic.cnc.register_onecurvededge(recipeitem, groups, images, desc_onecurvededge) - technic.cnc.register_twocurvededge(recipeitem, groups, images, desc_twocurvededge) - technic.cnc.register_cylinder(recipeitem, groups, images, desc_cylinder) - technic.cnc.register_cylinder_horizontal(recipeitem, groups, images, desc_cylinder_horizontal) - technic.cnc.register_spheroid(recipeitem, groups, images, desc_spheroid) - technic.cnc.register_element_straight(recipeitem, groups, images, desc_element_straight) - technic.cnc.register_element_edge(recipeitem, groups, images, desc_element_edge) - technic.cnc.register_element_t(recipeitem, groups, images, desc_element_t) - technic.cnc.register_element_cross(recipeitem, groups, images, desc_element_cross) - technic.cnc.register_element_end(recipeitem, groups, images, desc_element_end) + technic_cnc.register_slope(recipeitem, groups, images, desc_slope) + technic_cnc.register_slope_lying(recipeitem, groups, images, desc_slope_lying) + technic_cnc.register_slope_upsdown(recipeitem, groups, images, desc_slope_upsdown) + technic_cnc.register_slope_edge(recipeitem, groups, images, desc_slope_edge) + technic_cnc.register_slope_inner_edge(recipeitem, groups, images, desc_slope_inner_edge) + technic_cnc.register_slope_edge_upsdown(recipeitem, groups, images, desc_slope_upsdwn_edge) + technic_cnc.register_slope_inner_edge_upsdown(recipeitem, groups, images, desc_slope_upsdwn_inner_edge) + technic_cnc.register_pyramid(recipeitem, groups, images, desc_pyramid) + technic_cnc.register_spike(recipeitem, groups, images, desc_spike) + technic_cnc.register_onecurvededge(recipeitem, groups, images, desc_onecurvededge) + technic_cnc.register_twocurvededge(recipeitem, groups, images, desc_twocurvededge) + technic_cnc.register_cylinder(recipeitem, groups, images, desc_cylinder) + technic_cnc.register_cylinder_horizontal(recipeitem, groups, images, desc_cylinder_horizontal) + technic_cnc.register_spheroid(recipeitem, groups, images, desc_spheroid) + technic_cnc.register_element_straight(recipeitem, groups, images, desc_element_straight) + technic_cnc.register_element_edge(recipeitem, groups, images, desc_element_edge) + technic_cnc.register_element_t(recipeitem, groups, images, desc_element_t) + technic_cnc.register_element_cross(recipeitem, groups, images, desc_element_cross) + technic_cnc.register_element_end(recipeitem, groups, images, desc_element_end) end -- REGISTER STICKS: noncubic.register_xyz(recipeitem, groups, images, desc_element_xyz) ------------------------------------------------------------------------------------------------------------ -function technic.cnc.register_stick_etc(recipeitem, groups, images, desc_stick) - technic.cnc.register_stick(recipeitem, groups, images, desc_stick) +function technic_cnc.register_stick_etc(recipeitem, groups, images, desc_stick) + technic_cnc.register_stick(recipeitem, groups, images, desc_stick) end -function technic.cnc.register_elements(recipeitem, groups, images, desc_element_straight_double, desc_element_edge_double, desc_element_t_double, desc_element_cross_double, desc_element_end_double) - technic.cnc.register_element_straight_double(recipeitem, groups, images, desc_element_straight_double) - technic.cnc.register_element_edge_double(recipeitem, groups, images, desc_element_edge_double) - technic.cnc.register_element_t_double(recipeitem, groups, images, desc_element_t_double) - technic.cnc.register_element_cross_double(recipeitem, groups, images, desc_element_cross_double) - technic.cnc.register_element_end_double(recipeitem, groups, images, desc_element_end_double) +function technic_cnc.register_elements(recipeitem, groups, images, desc_element_straight_double, desc_element_edge_double, desc_element_t_double, desc_element_cross_double, desc_element_end_double) + technic_cnc.register_element_straight_double(recipeitem, groups, images, desc_element_straight_double) + technic_cnc.register_element_edge_double(recipeitem, groups, images, desc_element_edge_double) + technic_cnc.register_element_t_double(recipeitem, groups, images, desc_element_t_double) + technic_cnc.register_element_cross_double(recipeitem, groups, images, desc_element_cross_double) + technic_cnc.register_element_end_double(recipeitem, groups, images, desc_element_end_double) end diff --git a/technic_cnc/cnc_materials.lua b/technic_cnc/cnc_materials.lua index 05be9af..b029659 100644 --- a/technic_cnc/cnc_materials.lua +++ b/technic_cnc/cnc_materials.lua @@ -1,91 +1,99 @@ -- REGISTER MATERIALS AND PROPERTIES FOR NONCUBIC ELEMENTS: ----------------------------------------------------------- -local S = technic.getter +local S = technic_cnc.getter -- DIRT ------- -technic.cnc.register_all("default:dirt", +technic_cnc.register_all("default:dirt", {snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, {"default_grass.png", "default_dirt.png", "default_grass.png"}, S("Dirt")) -- WOOD ------- -technic.cnc.register_all("default:wood", +technic_cnc.register_all("default:wood", {snappy=2, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1}, {"default_wood.png"}, S("Wooden")) -- STONE -------- -technic.cnc.register_all("default:stone", +technic_cnc.register_all("default:stone", {cracky=3, not_in_creative_inventory=1}, {"default_stone.png"}, S("Stone")) -- COBBLE --------- -technic.cnc.register_all("default:cobble", +technic_cnc.register_all("default:cobble", {cracky=3, not_in_creative_inventory=1}, {"default_cobble.png"}, S("Cobble")) -- BRICK -------- -technic.cnc.register_all("default:brick", +technic_cnc.register_all("default:brick", {cracky=3, not_in_creative_inventory=1}, {"default_brick.png"}, S("Brick")) -- SANDSTONE ------------ -technic.cnc.register_all("default:sandstone", +technic_cnc.register_all("default:sandstone", {crumbly=2, cracky=3, not_in_creative_inventory=1}, {"default_sandstone.png"}, S("Sandstone")) -- LEAVES --------- -technic.cnc.register_all("default:leaves", +technic_cnc.register_all("default:leaves", {snappy=2, choppy=2, oddly_breakable_by_hand=3, not_in_creative_inventory=1}, {"default_leaves.png"}, S("Leaves")) -- TREE ------- -technic.cnc.register_all("default:tree", +technic_cnc.register_all("default:tree", {snappy=1, choppy=2, oddly_breakable_by_hand=2, flammable=3, wood=1, not_in_creative_inventory=1}, {"default_tree.png"}, S("Tree")) --- WROUGHT IRON ---------------- -technic.cnc.register_all("default:steelblock", - {cracky=1, level=2, not_in_creative_inventory=1}, - {"technic_wrought_iron_block.png"}, - S("Wrought Iron")) - -- Bronze -------- -technic.cnc.register_all("default:bronzeblock", +technic_cnc.register_all("default:bronzeblock", {cracky=1, level=2, not_in_creative_inventory=1}, {"default_bronze_block.png"}, S("Bronze")) --- Stainless Steel --------- -technic.cnc.register_all("technic:stainless_steel_block", - {cracky=1, level=2, not_in_creative_inventory=1}, - {"technic_stainless_steel_block.png"}, - S("Stainless Steel")) --- Marble ------------- -technic.cnc.register_all("technic:marble", - {cracky=3, not_in_creative_inventory=1}, - {"technic_marble.png"}, - S("Marble")) +local steeltex = "default_steel_block.png" +local steelname = "Steel" --- Granite ------------- -technic.cnc.register_all("technic:granite", - {cracky=1, not_in_creative_inventory=1}, - {"technic_granite.png"}, - S("Granite")) +if technic_cnc.technic_modpath then + steeltex = "technic_wrought_iron_block.png" + steelname = "Wrought Iron" + -- Stainless Steel + -------- + technic_cnc.register_all("technic:stainless_steel_block", + {cracky=1, level=2, not_in_creative_inventory=1}, + {"technic_stainless_steel_block.png"}, + S("Stainless Steel")) + + -- Marble + ------------ + technic_cnc.register_all("technic:marble", + {cracky=3, not_in_creative_inventory=1}, + {"technic_marble.png"}, + S("Marble")) + + -- Granite + ------------ + technic_cnc.register_all("technic:granite", + {cracky=1, not_in_creative_inventory=1}, + {"technic_granite.png"}, + S("Granite")) +end + +-- STEEL +--------------- +technic_cnc.register_all("default:steelblock", + {cracky=1, level=2, not_in_creative_inventory=1}, + {steeltex}, + S(steelname)) diff --git a/technic_cnc/depends.txt b/technic_cnc/depends.txt index d684218..fa37cc0 100644 --- a/technic_cnc/depends.txt +++ b/technic_cnc/depends.txt @@ -1,2 +1,2 @@ default -technic +technic? diff --git a/technic_cnc/init.lua b/technic_cnc/init.lua index afdb0b8..3c4da3e 100644 --- a/technic_cnc/init.lua +++ b/technic_cnc/init.lua @@ -2,6 +2,11 @@ local modpath = minetest.get_modpath("technic_cnc") technic_cnc = {} +technic_cnc.technic_modpath = minetest.get_modpath("technic") + +technic_cnc.use_technic = technic_cnc.technic_modpath + and minetest.settings:get_bool("technic_cnc_use_technic") ~= false + if rawget(_G, "intllib") then technic_cnc.getter = intllib.Getter() else From 4ecb3d4334021a702c45ea8d8fb2e34203e62139 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sun, 25 Nov 2018 08:23:16 -0500 Subject: [PATCH 09/13] make "half"/"full" buttons work --- technic_cnc/cnc.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/technic_cnc/cnc.lua b/technic_cnc/cnc.lua index bc277d1..aa9cd21 100644 --- a/technic_cnc/cnc.lua +++ b/technic_cnc/cnc.lua @@ -143,30 +143,32 @@ local cnc_formspec = "listring[current_name;src]".. "listring[current_player;main]" -local size = 1; - -- The form handler is declared here because we need it in both the inactive and active modes -- in order to be able to change programs wile it is running. local function form_handler(pos, formname, fields, sender) + local meta = minetest.get_meta(pos) + -- REGISTER MILLING PROGRAMS AND OUTPUTS: ------------------------------------------ -- Program for half/full size if fields["full"] then - size = 1 + meta:set_int("size", 1) return end if fields["half"] then - size = 2 + meta:set_int("size", 2) return end -- Resolve the node name and the number of items to make - local meta = minetest.get_meta(pos) local inv = meta:get_inventory() local inputstack = inv:get_stack("src", 1) local inputname = inputstack:get_name() local multiplier = 0 + local size = meta:get_int("size") + if size < 1 then size = 1 end + for k, _ in pairs(fields) do -- Set a multipier for the half/full size capable blocks if twosize_products[k] ~= nil then From c068edec65ff243d124837293fc1ad03e2f55373 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sun, 25 Nov 2018 08:24:45 -0500 Subject: [PATCH 10/13] fix excessive "element straight" quantity --- technic_cnc/cnc.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/technic_cnc/cnc.lua b/technic_cnc/cnc.lua index aa9cd21..b5f062f 100644 --- a/technic_cnc/cnc.lua +++ b/technic_cnc/cnc.lua @@ -93,7 +93,7 @@ local onesize_products = { twocurvededge = 1, } local twosize_products = { - element_straight = 4, + element_straight = 2, element_end = 2, element_cross = 1, element_t = 1, From 83ec1b2476f28178cb366fac900e9c490556b7f9 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sun, 25 Nov 2018 08:33:04 -0500 Subject: [PATCH 11/13] fix dirt textures add grassy shapes cut from default:dirt_with_grass --- technic_cnc/cnc_materials.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/technic_cnc/cnc_materials.lua b/technic_cnc/cnc_materials.lua index b029659..f2bd734 100644 --- a/technic_cnc/cnc_materials.lua +++ b/technic_cnc/cnc_materials.lua @@ -7,8 +7,14 @@ local S = technic_cnc.getter ------- technic_cnc.register_all("default:dirt", {snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, - {"default_grass.png", "default_dirt.png", "default_grass.png"}, + {"default_dirt.png"}, S("Dirt")) +-- (DIRT WITH) GRASS +-------------------- +technic_cnc.register_all("default:dirt_with_grass", + {snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, + {"default_grass.png"}, + S("Grassy dirt")) -- WOOD ------- technic_cnc.register_all("default:wood", From bc26b047d235f2ac495d6ce60cbd6c4a8a40851a Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sun, 25 Nov 2018 09:18:37 -0500 Subject: [PATCH 12/13] add blast-resistant concrete and some basic_materials nodes --- technic_cnc/cnc_materials.lua | 26 ++++++++++++++++++++++++++ technic_cnc/depends.txt | 1 + 2 files changed, 27 insertions(+) diff --git a/technic_cnc/cnc_materials.lua b/technic_cnc/cnc_materials.lua index f2bd734..e63c792 100644 --- a/technic_cnc/cnc_materials.lua +++ b/technic_cnc/cnc_materials.lua @@ -95,6 +95,14 @@ if technic_cnc.technic_modpath then {cracky=1, not_in_creative_inventory=1}, {"technic_granite.png"}, S("Granite")) + + -- Blast-resistant concrete + --------------------------- + + technic_cnc.register_all("technic:blast_resistant_concrete", + {cracky=2, level=2, not_in_creative_inventory=1}, + {"technic_blast_resistant_concrete_block.png"}, + S("Blast-resistant concrete")) end -- STEEL @@ -103,3 +111,21 @@ technic_cnc.register_all("default:steelblock", {cracky=1, level=2, not_in_creative_inventory=1}, {steeltex}, S(steelname)) + +-- CONCRETE AND CEMENT +---------------------- + +technic_cnc.register_all("basic_materials:concrete_block", + {cracky=2, level=2, not_in_creative_inventory=1}, + {"basic_materials_concrete_block.png"}, + S("Concrete")) + +technic_cnc.register_all("basic_materials:cement_block", + {cracky=2, level=2, not_in_creative_inventory=1}, + {"basic_materials_cement_block.png"}, + S("Cement")) + +technic_cnc.register_all("basic_materials:brass_block", + {cracky=1, level=2, not_in_creative_inventory=1}, + {"basic_materials_brass_block.png"}, + S("Brass block")) diff --git a/technic_cnc/depends.txt b/technic_cnc/depends.txt index fa37cc0..bdaa161 100644 --- a/technic_cnc/depends.txt +++ b/technic_cnc/depends.txt @@ -1,2 +1,3 @@ default +basic_materials technic? From 3cafe7553a9d29a76a87370c5726e325dec3eb59 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sun, 25 Nov 2018 10:04:18 -0500 Subject: [PATCH 13/13] minor fix for "LV" translations --- technic_cnc/cnc.lua | 13 ++++++------- technic_cnc/locale/de.txt | 1 + technic_cnc/locale/es.txt | 1 + technic_cnc/locale/it.txt | 1 + technic_cnc/locale/template.txt | 1 + 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/technic_cnc/cnc.lua b/technic_cnc/cnc.lua index b5f062f..0e23f5a 100644 --- a/technic_cnc/cnc.lua +++ b/technic_cnc/cnc.lua @@ -13,7 +13,7 @@ local allow_metadata_inventory_put local allow_metadata_inventory_take local allow_metadata_inventory_move local can_dig -local voltage = "" +local desc_tr = S("CNC Machine") if technic_cnc.use_technic then minetest.register_craft({ @@ -29,8 +29,7 @@ if technic_cnc.use_technic then allow_metadata_inventory_take = technic.machine_inventory_take allow_metadata_inventory_move = technic.machine_inventory_move can_dig = technic.machine_can_dig - voltage = "LV " - + desc_tr = S("%s CNC Machine"):format("LV") else minetest.register_craft({ output = 'technic:cnc', @@ -214,7 +213,7 @@ local run = function(pos, node) local meta = minetest.get_meta(pos) local inv = meta:get_inventory() local eu_input = meta:get_int("LV_EU_input") - local machine_name = S("%sCNC Machine"):format(voltage) + local machine_name = desc_tr local machine_node = "technic:cnc" local demand = 450 @@ -249,7 +248,7 @@ end -- The actual block inactive state minetest.register_node(":technic:cnc", { - description = S("%sCNC Machine"):format(voltage), + description = desc_tr, tiles = {"technic_cnc_top.png", "technic_cnc_bottom.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front.png"}, groups = {cracky=2, technic_machine=1, technic_lv=1}, @@ -258,7 +257,7 @@ minetest.register_node(":technic:cnc", { legacy_facedir_simple = true, on_construct = function(pos) local meta = minetest.get_meta(pos) - meta:set_string("infotext", S("%sCNC Machine"):format(voltage)) + meta:set_string("infotext", desc_tr) meta:set_float("technic_power_machine", 1) meta:set_string("formspec", cnc_formspec) local inv = meta:get_inventory() @@ -277,7 +276,7 @@ minetest.register_node(":technic:cnc", { if technic_cnc.use_technic then minetest.register_node(":technic:cnc_active", { - description = S("%sCNC Machine"):format(voltage), + description = desc_tr, tiles = {"technic_cnc_top_active.png", "technic_cnc_bottom.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front_active.png"}, groups = {cracky=2, technic_machine=1, technic_lv=1, not_in_creative_inventory=1}, diff --git a/technic_cnc/locale/de.txt b/technic_cnc/locale/de.txt index a8a3962..8b4e5ff 100644 --- a/technic_cnc/locale/de.txt +++ b/technic_cnc/locale/de.txt @@ -1,4 +1,5 @@ ## CNC +CNC Machine = CNC-Maschine %s CNC Machine = %s CNC-Maschine Cylinder = Zylinder Element Cross = Halbes Kreuzelement diff --git a/technic_cnc/locale/es.txt b/technic_cnc/locale/es.txt index 036f987..f18fdfa 100644 --- a/technic_cnc/locale/es.txt +++ b/technic_cnc/locale/es.txt @@ -1,4 +1,5 @@ ## CNC +CNC Machine = Maquina CNC %s CNC Machine = Maquina CNC %s Element Edge = Elemento Borde Tree = Arbol diff --git a/technic_cnc/locale/it.txt b/technic_cnc/locale/it.txt index 1527f11..e50fd74 100644 --- a/technic_cnc/locale/it.txt +++ b/technic_cnc/locale/it.txt @@ -1,4 +1,5 @@ ## CNC +CNC Machine = Tornio CNC %s CNC Machine = Tornio CNC %s Cylinder = Cilindro Element Cross = Elemento a croce diff --git a/technic_cnc/locale/template.txt b/technic_cnc/locale/template.txt index 2b159ea..bf3cb08 100644 --- a/technic_cnc/locale/template.txt +++ b/technic_cnc/locale/template.txt @@ -1,4 +1,5 @@ ## CNC +CNC Machine = %s CNC Machine = Cylinder = Element Cross =