From 680f259468f9a47c0bc8ea5890ea37c5758a8c30 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sat, 3 Nov 2018 13:48:04 -0400 Subject: update basic materials, simple streetlights, technic --- basic_materials/depends.txt | 1 + simple_streetlights/COPYING.minedot | 24 ++++ simple_streetlights/depends.txt | 1 + simple_streetlights/init.lua | 121 +------------------ simple_streetlights/minedot.lua | 84 ++++++++++++++ simple_streetlights/schems/streetlight-double.mts | Bin 0 -> 159 bytes simple_streetlights/schems/streetlight-single.mts | Bin 0 -> 125 bytes simple_streetlights/simple.lua | 129 +++++++++++++++++++++ .../textures/minedot_streetlights_double.png | Bin 0 -> 210 bytes .../textures/minedot_streetlights_single.png | Bin 0 -> 199 bytes technic/crafts.lua | 17 ++- technic/items.lua | 5 - technic/machines/HV/forcefield.lua | 2 +- technic/machines/HV/quarry.lua | 2 +- technic/machines/LV/cnc.lua | 2 +- technic/machines/LV/compressor.lua | 8 +- technic/machines/LV/extractor.lua | 2 +- technic/machines/LV/geothermal.lua | 6 +- technic/machines/MV/centrifuge.lua | 2 +- technic/machines/MV/wind_mill.lua | 2 +- technic/machines/other/frames.lua | 4 +- technic/machines/supply_converter.lua | 3 +- technic/textures/technic_motor.png | Bin 2517 -> 0 bytes technic/tools/chainsaw.lua | 6 +- technic/tools/mining_drill.lua | 2 +- technic/tools/vacuum.lua | 2 +- 26 files changed, 278 insertions(+), 147 deletions(-) create mode 100644 simple_streetlights/COPYING.minedot create mode 100644 simple_streetlights/minedot.lua create mode 100644 simple_streetlights/schems/streetlight-double.mts create mode 100644 simple_streetlights/schems/streetlight-single.mts create mode 100644 simple_streetlights/simple.lua create mode 100644 simple_streetlights/textures/minedot_streetlights_double.png create mode 100644 simple_streetlights/textures/minedot_streetlights_single.png delete mode 100644 technic/textures/technic_motor.png diff --git a/basic_materials/depends.txt b/basic_materials/depends.txt index 4ad96d5..87ab2ff 100644 --- a/basic_materials/depends.txt +++ b/basic_materials/depends.txt @@ -1 +1,2 @@ default +moreores diff --git a/simple_streetlights/COPYING.minedot b/simple_streetlights/COPYING.minedot new file mode 100644 index 0000000..68a49da --- /dev/null +++ b/simple_streetlights/COPYING.minedot @@ -0,0 +1,24 @@ +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to diff --git a/simple_streetlights/depends.txt b/simple_streetlights/depends.txt index e1cc6bc..191f064 100644 --- a/simple_streetlights/depends.txt +++ b/simple_streetlights/depends.txt @@ -3,3 +3,4 @@ creative? ilights? gloopblocks? homedecor? +streetspoles? diff --git a/simple_streetlights/init.lua b/simple_streetlights/init.lua index c4fca68..50310b6 100644 --- a/simple_streetlights/init.lua +++ b/simple_streetlights/init.lua @@ -1,119 +1,8 @@ -local fdir_to_right = { - { 1, 0 }, - { 0, -1 }, - { -1, 0 }, - { 0, 1 } -} +-- simple streetlight spawner mod -local function check_and_place(itemstack, placer, pointed_thing, pole, light) - if not placer then return end - local player_name = placer:get_player_name() - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) +local modpath = minetest.get_modpath("simple_streetlights") - local pos1 = minetest.get_pointed_thing_position(pointed_thing) - local node1 = minetest.get_node(pos1) - if not node1 or node1.name == "ignore" then return end - local def1 = minetest.registered_items[node1.name] - - print(dump(pos1)) - print(node1.name) - print(dump(def1)) - - - if (def1 and def1.buildable_to) then - pos1.y = pos1.y-1 - end - local node1 = minetest.get_node(pos1) - - local node2, node3, node4 - local def1 = minetest.registered_items[node1.name] - local def2, def3, def4 - - local pos2, pos3, pos4 - for i = 1, 5 do - pos2 = { x=pos1.x, y = pos1.y+i, z=pos1.z } - node2 = minetest.get_node(pos2) - def2 = minetest.registered_items[node2.name] - if minetest.is_protected(pos2, player_name) or not (def2 and def2.buildable_to) then return end - end - - pos3 = { x = pos1.x+fdir_to_right[fdir+1][1], y = pos1.y+5, z = pos1.z+fdir_to_right[fdir+1][2] } - node3 = minetest.get_node(pos3) - def3 = minetest.registered_items[node3.name] - if minetest.is_protected(pos3, player_name) or not (def3 and def3.buildable_to) then return end - - pos4 = { x = pos1.x+fdir_to_right[fdir+1][1], y = pos1.y+4, z = pos1.z+fdir_to_right[fdir+1][2] } - node4 = minetest.get_node(pos4) - def4 = minetest.registered_items[node4.name] - if minetest.is_protected(pos4, player_name) or not (def3 and def4.buildable_to) then return end - - if not creative or not creative.is_enabled_for(player_name) then - local inv = placer:get_inventory() - if not inv:contains_item("main", pole.." 5") or not inv:contains_item("main", light) then return end - inv:remove_item("main", pole.." 5") - inv:remove_item("main", light) - end - - for i = 1, 5 do - pos2 = {x=pos1.x, y = pos1.y+i, z=pos1.z} - minetest.set_node(pos2, {name = pole }) - end - minetest.set_node(pos3, { name = pole }) - minetest.set_node(pos4, { name = light, param2 = 0 }) -end - -minetest.register_tool("simple_streetlights:spawner_wood_meselamp", { - description = "Streetlight spawner (wooden pole, Mese lamp cube)", - inventory_image = "simple_streetlights_spawner_wood_meselamp.png", - use_texture_alpha = true, - tool_capabilities = { full_punch_interval=0.1 }, - on_place = function(itemstack, placer, pointed_thing) - check_and_place(itemstack, placer, pointed_thing, "default:fence_wood", "default:meselamp") - end -}) - -if minetest.get_modpath("ilights") then - minetest.register_tool("simple_streetlights:spawner_wood_white", { - description = "Streetlight spawner (wooden pole, white light)", - inventory_image = "simple_streetlights_spawner_wood_white.png", - use_texture_alpha = true, - tool_capabilities = { full_punch_interval=0.1 }, - on_place = function(itemstack, placer, pointed_thing) - check_and_place(itemstack, placer, pointed_thing, "default:fence_wood", "ilights:light") - end - }) - - if minetest.get_modpath("gloopblocks") then - minetest.register_tool("simple_streetlights:spawner_steel_white", { - description = "Streetlight spawner (steel pole, white light)", - inventory_image = "simple_streetlights_spawner_steel_white.png", - use_texture_alpha = true, - tool_capabilities = { full_punch_interval=0.1 }, - on_place = function(itemstack, placer, pointed_thing) - check_and_place(itemstack, placer, pointed_thing, "gloopblocks:fence_steel", "ilights:light") - end - }) - end - - if minetest.get_modpath("homedecor") then - minetest.register_tool("simple_streetlights:spawner_wrought_iron_white", { - description = "Streetlight spawner (wrought iron pole, white light)", - inventory_image = "simple_streetlights_spawner_wrought_iron_white.png", - use_texture_alpha = true, - tool_capabilities = { full_punch_interval=0.1 }, - on_place = function(itemstack, placer, pointed_thing) - check_and_place(itemstack, placer, pointed_thing, "homedecor:fence_wrought_iron", "ilights:light") - end - }) - - minetest.register_tool("simple_streetlights:spawner_brass_white", { - description = "Streetlight spawner (brass pole, white light)", - inventory_image = "simple_streetlights_spawner_brass_white.png", - use_texture_alpha = true, - tool_capabilities = { full_punch_interval=0.1 }, - on_place = function(itemstack, placer, pointed_thing) - check_and_place(itemstack, placer, pointed_thing, "homedecor:fence_brass", "ilights:light") - end - }) - end +dofile(modpath.."/simple.lua") +if minetest.get_modpath("homedecor") and minetest.get_modpath("streetspoles") then + dofile(modpath.."/minedot.lua") end diff --git a/simple_streetlights/minedot.lua b/simple_streetlights/minedot.lua new file mode 100644 index 0000000..7521deb --- /dev/null +++ b/simple_streetlights/minedot.lua @@ -0,0 +1,84 @@ +local schems = { + single = minetest.register_schematic(string.format("schems%sstreetlight-single.mts",DIR_DELIM)), + double = minetest.register_schematic(string.format("schems%sstreetlight-double.mts",DIR_DELIM)), +} + +local singleMaterials = { + ItemStack("streets:bigpole 6"), + ItemStack("streets:bigpole_edge 2"), + ItemStack("homedecor:glowlight_quarter 1"), +} + +local doubleMaterials = { + ItemStack("streets:bigpole 7"), + ItemStack("streets:bigpole_edge 2"), + ItemStack("streets:bigpole_tjunction 1"), + ItemStack("homedecor:glowlight_quarter 2"), +} + +local offsets = { + single = { + [0] = {x = 0,y = 0,z = 0}, + [90] = {x = 0,y = 0,z = 0}, + [180] = {x = 0,y = 0,z = -2}, + [270] = {x = -2,y = 0,z = 0}, + }, + double = { + [0] = {x = 0,y = 0,z = -2}, + [90] = {x = -2,y = 0,z = 0}, + [180] = {x = 0,y = 0,z = -2}, + [270] = {x = -2,y = 0,z = 0}, + }, +} + +local function takeMaterials(player,materials) + local name = player:get_player_name() + if creative and creative.is_enabled_for(name) then return true end + local inv = minetest.get_inventory({type = "player",name = name}) + local hasMaterials = true + for _,i in ipairs(materials) do + if not inv:contains_item("main",i) then hasMaterials = false end + end + if hasMaterials then + for _,i in ipairs(materials) do inv:remove_item("main",i) end + return true + else + minetest.chat_send_player(name,"You don't have the necessary materials to do that!") + return false + end +end + +local function place(itemstack,player,pointed) + if not player then return end + local name = player:get_player_name() + if not minetest.check_player_privs(name,{streetlight = true}) then + minetest.chat_send_player(name,"*** You don't have permission to use a streetlight spawner.") + return + end + local pos = pointed.above + if minetest.is_protected(pos,name) and not minetest.check_player_privs(name,{protection_bypass = true}) then + minetest.record_protection_violation(pos,name) + end + local isDouble = string.sub(itemstack:get_name(),-6,-1) == "double" + if not takeMaterials(player,isDouble and doubleMaterials or singleMaterials) then return end + local facedir = minetest.facedir_to_dir(minetest.dir_to_facedir(player:get_look_dir())) + local schemDir = 0 + if facedir.x == 1 then schemDir = 180 + elseif facedir.z == 1 then schemDir = 90 + elseif facedir.z == -1 then schemDir = 270 end + local offset = offsets[isDouble and "double" or "single"][schemDir] + local pos = vector.add(pos,offset) + minetest.place_schematic(pos,isDouble and schems.double or schems.single,schemDir,nil,false) +end + +minetest.register_tool(":minedot_streetlights:spawner_single",{ + description = "MineDOT-style Street Light Spawner (single-sided)", + inventory_image = "minedot_streetlights_single.png", + on_place = place, +}) + +minetest.register_tool(":minedot_streetlights:spawner_double",{ + description = "MineDOT-style Street Light Spawner (double-sided)", + inventory_image = "minedot_streetlights_double.png", + on_place = place, +}) diff --git a/simple_streetlights/schems/streetlight-double.mts b/simple_streetlights/schems/streetlight-double.mts new file mode 100644 index 0000000..80ba16f Binary files /dev/null and b/simple_streetlights/schems/streetlight-double.mts differ diff --git a/simple_streetlights/schems/streetlight-single.mts b/simple_streetlights/schems/streetlight-single.mts new file mode 100644 index 0000000..73439f3 Binary files /dev/null and b/simple_streetlights/schems/streetlight-single.mts differ diff --git a/simple_streetlights/simple.lua b/simple_streetlights/simple.lua new file mode 100644 index 0000000..5d2518e --- /dev/null +++ b/simple_streetlights/simple.lua @@ -0,0 +1,129 @@ + +local fdir_to_right = { + { 1, 0 }, + { 0, -1 }, + { -1, 0 }, + { 0, 1 } +} + +minetest.register_privilege("streetlight", { + description = "Allows using streetlight spawners", + give_to_singleplayer = true +}) + +local function check_and_place(itemstack, placer, pointed_thing, pole, light) + if not placer then return end + if not minetest.check_player_privs(placer, "streetlight") then + minetest.chat_send_player(placer:get_player_name(), "*** You don't have permission to use a streetlight spawner.") + return + end + local player_name = placer:get_player_name() + local fdir = minetest.dir_to_facedir(placer:get_look_dir()) + + local pos1 = minetest.get_pointed_thing_position(pointed_thing) + local node1 = minetest.get_node(pos1) + if not node1 or node1.name == "ignore" then return end + local def1 = minetest.registered_items[node1.name] + + print(dump(pos1)) + print(node1.name) + print(dump(def1)) + + + if (def1 and def1.buildable_to) then + pos1.y = pos1.y-1 + end + local node1 = minetest.get_node(pos1) + + local node2, node3, node4 + local def1 = minetest.registered_items[node1.name] + local def2, def3, def4 + + local pos2, pos3, pos4 + for i = 1, 5 do + pos2 = { x=pos1.x, y = pos1.y+i, z=pos1.z } + node2 = minetest.get_node(pos2) + def2 = minetest.registered_items[node2.name] + if minetest.is_protected(pos2, player_name) or not (def2 and def2.buildable_to) then return end + end + + pos3 = { x = pos1.x+fdir_to_right[fdir+1][1], y = pos1.y+5, z = pos1.z+fdir_to_right[fdir+1][2] } + node3 = minetest.get_node(pos3) + def3 = minetest.registered_items[node3.name] + if minetest.is_protected(pos3, player_name) or not (def3 and def3.buildable_to) then return end + + pos4 = { x = pos1.x+fdir_to_right[fdir+1][1], y = pos1.y+4, z = pos1.z+fdir_to_right[fdir+1][2] } + node4 = minetest.get_node(pos4) + def4 = minetest.registered_items[node4.name] + if minetest.is_protected(pos4, player_name) or not (def3 and def4.buildable_to) then return end + + if not creative or not creative.is_enabled_for(player_name) then + local inv = placer:get_inventory() + if not inv:contains_item("main", pole.." 5") or not inv:contains_item("main", light) then return end + inv:remove_item("main", pole.." 5") + inv:remove_item("main", light) + end + + for i = 1, 5 do + pos2 = {x=pos1.x, y = pos1.y+i, z=pos1.z} + minetest.set_node(pos2, {name = pole }) + end + minetest.set_node(pos3, { name = pole }) + minetest.set_node(pos4, { name = light, param2 = 0 }) +end + +minetest.register_tool("simple_streetlights:spawner_wood_meselamp", { + description = "Streetlight spawner (wooden pole, Mese lamp cube)", + inventory_image = "simple_streetlights_spawner_wood_meselamp.png", + use_texture_alpha = true, + tool_capabilities = { full_punch_interval=0.1 }, + on_place = function(itemstack, placer, pointed_thing) + check_and_place(itemstack, placer, pointed_thing, "default:fence_wood", "default:meselamp") + end +}) + +if minetest.get_modpath("ilights") then + minetest.register_tool("simple_streetlights:spawner_wood_white", { + description = "Streetlight spawner (wooden pole, white light)", + inventory_image = "simple_streetlights_spawner_wood_white.png", + use_texture_alpha = true, + tool_capabilities = { full_punch_interval=0.1 }, + on_place = function(itemstack, placer, pointed_thing) + check_and_place(itemstack, placer, pointed_thing, "default:fence_wood", "ilights:light") + end + }) + + if minetest.get_modpath("gloopblocks") then + minetest.register_tool("simple_streetlights:spawner_steel_white", { + description = "Streetlight spawner (steel pole, white light)", + inventory_image = "simple_streetlights_spawner_steel_white.png", + use_texture_alpha = true, + tool_capabilities = { full_punch_interval=0.1 }, + on_place = function(itemstack, placer, pointed_thing) + check_and_place(itemstack, placer, pointed_thing, "gloopblocks:fence_steel", "ilights:light") + end + }) + end + + if minetest.get_modpath("homedecor") then + minetest.register_tool("simple_streetlights:spawner_wrought_iron_white", { + description = "Streetlight spawner (wrought iron pole, white light)", + inventory_image = "simple_streetlights_spawner_wrought_iron_white.png", + use_texture_alpha = true, + tool_capabilities = { full_punch_interval=0.1 }, + on_place = function(itemstack, placer, pointed_thing) + check_and_place(itemstack, placer, pointed_thing, "homedecor:fence_wrought_iron", "ilights:light") + end + }) + + minetest.register_tool("simple_streetlights:spawner_brass_white", { + description = "Streetlight spawner (brass pole, white light)", + inventory_image = "simple_streetlights_spawner_brass_white.png", + use_texture_alpha = true, + tool_capabilities = { full_punch_interval=0.1 }, + on_place = function(itemstack, placer, pointed_thing) + check_and_place(itemstack, placer, pointed_thing, "homedecor:fence_brass", "ilights:light") + end + }) + end +end diff --git a/simple_streetlights/textures/minedot_streetlights_double.png b/simple_streetlights/textures/minedot_streetlights_double.png new file mode 100644 index 0000000..0a6f3fc Binary files /dev/null and b/simple_streetlights/textures/minedot_streetlights_double.png differ diff --git a/simple_streetlights/textures/minedot_streetlights_single.png b/simple_streetlights/textures/minedot_streetlights_single.png new file mode 100644 index 0000000..be0556c Binary files /dev/null and b/simple_streetlights/textures/minedot_streetlights_single.png differ diff --git a/technic/crafts.lua b/technic/crafts.lua index 7d51f29..90bd2dd 100644 --- a/technic/crafts.lua +++ b/technic/crafts.lua @@ -88,16 +88,13 @@ minetest.register_craft({ {'basic_materials:copper_wire', 'technic:wrought_iron_ingot', 'basic_materials:copper_wire'}, {'technic:wrought_iron_ingot', '', 'technic:wrought_iron_ingot'}, {'basic_materials:copper_wire', 'technic:wrought_iron_ingot', 'basic_materials: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'}, - } + }, + 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" diff --git a/technic/items.lua b/technic/items.lua index d527c8b..d89ed46 100644 --- a/technic/items.lua +++ b/technic/items.lua @@ -74,11 +74,6 @@ minetest.register_craftitem("technic: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 c1a1d73..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'}, {'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 1699a52..d828f6d 100644 --- a/technic/machines/LV/geothermal.lua +++ b/technic/machines/LV/geothermal.lua @@ -13,7 +13,11 @@ minetest.register_craft({ {'technic:granite', 'default:diamond', 'technic:granite'}, {'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/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 ab07d58..f991ba7 100644 --- a/technic/machines/other/frames.lua +++ b/technic/machines/other/frames.lua @@ -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', '' }, } }) @@ -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/supply_converter.lua b/technic/machines/supply_converter.lua index 6c520ca..24601c6 100644 --- a/technic/machines/supply_converter.lua +++ b/technic/machines/supply_converter.lua @@ -204,7 +204,8 @@ minetest.register_craft({ {'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/textures/technic_motor.png b/technic/textures/technic_motor.png deleted file mode 100644 index 77d4b91..0000000 Binary files a/technic/textures/technic_motor.png and /dev/null differ diff --git a/technic/tools/chainsaw.lua b/technic/tools/chainsaw.lua index 75e028c..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"}, - {"basic_materials: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/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', '', ''}, } }) -- cgit v1.2.3