diff --git a/concrete/mod.conf b/concrete/mod.conf index 5a17f88..cd02408 100644 --- a/concrete/mod.conf +++ b/concrete/mod.conf @@ -1,3 +1,4 @@ name = concrete +depends = technic_compat optional_depends = basic_materials, intllib, moreblocks, default supported_games = minetest_game,mineclone2,mineclonia,mineclone5 \ No newline at end of file diff --git a/extranodes/mod.conf b/extranodes/mod.conf index 5963baf..e7b5e5e 100644 --- a/extranodes/mod.conf +++ b/extranodes/mod.conf @@ -1,4 +1,4 @@ name = extranodes -depends = technic_worldgen, basic_materials, concrete +depends = technic_worldgen, basic_materials, concrete, technic_compat optional_depends = unifieddyes, intllib, moreblocks, steel, streetsmod, default, mcl_core, mcl_sounds supported_games = minetest_game,mineclone2,mineclonia,mineclone5 \ No newline at end of file diff --git a/technic/crafts.lua b/technic/crafts.lua index 530ab1d..7cc0add 100644 --- a/technic/crafts.lua +++ b/technic/crafts.lua @@ -38,9 +38,9 @@ if pipeworks.enable_teleport_tube then minetest.register_craft({ output = 'pipeworks:teleport_tube_1', recipe = { - {technic.compat.mese_crystal_ingredient, 'technic:copper_coil', technic.compat.mese_crystal_ingredient}, + {technic_compat.mese_crystal_ingredient, 'technic:copper_coil', technic_compat.mese_crystal_ingredient}, {'pipeworks:tube_1', 'technic:control_logic_unit', 'pipeworks:tube_1'}, - {technic.compat.mese_crystal_ingredient, 'technic:copper_coil', technic.compat.mese_crystal_ingredient}, + {technic_compat.mese_crystal_ingredient, 'technic:copper_coil', technic_compat.mese_crystal_ingredient}, } }) end @@ -62,36 +62,36 @@ minetest.register_craft( { minetest.register_craft({ output = 'technic:diamond_drill_head', recipe = { - {'technic:stainless_steel_ingot', technic.compat.diamond_ingredient, 'technic:stainless_steel_ingot'}, - {technic.compat.diamond_ingredient, '', technic.compat.diamond_ingredient}, - {'technic:stainless_steel_ingot', technic.compat.diamond_ingredient, 'technic:stainless_steel_ingot'}, + {'technic:stainless_steel_ingot', technic_compat.diamond_ingredient, 'technic:stainless_steel_ingot'}, + {technic_compat.diamond_ingredient, '', technic_compat.diamond_ingredient}, + {'technic:stainless_steel_ingot', technic_compat.diamond_ingredient, 'technic:stainless_steel_ingot'}, } }) minetest.register_craft({ output = 'technic:green_energy_crystal', recipe = { - {technic.compat.gold_ingot_ingredient, 'technic:battery', technic.compat.green_dye_ingredient}, + {technic_compat.gold_ingot_ingredient, 'technic:battery', technic_compat.green_dye_ingredient}, {'technic:battery', 'technic:red_energy_crystal', 'technic:battery'}, - {technic.compat.green_dye_ingredient, 'technic:battery', technic.compat.gold_ingot_ingredient}, + {technic_compat.green_dye_ingredient, 'technic:battery', technic_compat.gold_ingot_ingredient}, } }) minetest.register_craft({ output = 'technic:blue_energy_crystal', recipe = { - {'moreores:mithril_ingot', 'technic:battery', technic.compat.blue_dye_ingredient}, + {'moreores:mithril_ingot', 'technic:battery', technic_compat.blue_dye_ingredient}, {'technic:battery', 'technic:green_energy_crystal', 'technic:battery'}, - {technic.compat.blue_dye_ingredient, 'technic:battery', 'moreores:mithril_ingot'}, + {technic_compat.blue_dye_ingredient, 'technic:battery', 'moreores:mithril_ingot'}, } }) minetest.register_craft({ output = 'technic:red_energy_crystal', recipe = { - {'moreores:silver_ingot', 'technic:battery', technic.compat.red_dye_ingredient}, + {'moreores:silver_ingot', 'technic:battery', technic_compat.red_dye_ingredient}, {'technic:battery', 'basic_materials:energy_crystal_simple', 'technic:battery'}, - {technic.compat.red_dye_ingredient, 'technic:battery', 'moreores:silver_ingot'}, + {technic_compat.red_dye_ingredient, 'technic:battery', 'moreores:silver_ingot'}, } }) @@ -143,7 +143,7 @@ minetest.register_craft({ output = 'technic:control_logic_unit', recipe = { {'', 'basic_materials:gold_wire', ''}, - {technic.compat.copper_ingredient, 'technic:silicon_wafer', technic.compat.copper_ingredient}, + {technic_compat.copper_ingredient, 'technic:silicon_wafer', technic_compat.copper_ingredient}, {'', 'technic:chromium_ingot', ''}, }, replacements = { {"basic_materials:gold_wire", "basic_materials:empty_spool"}, }, @@ -153,8 +153,8 @@ minetest.register_craft({ output = 'technic:mixed_metal_ingot 9', recipe = { {'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot'}, - {technic.compat.bronze_ingredient, technic.compat.bronze_ingredient, technic.compat.bronze_ingredient}, - {technic.compat.tin_ingredient, technic.compat.tin_ingredient, technic.compat.tin_ingredient}, + {technic_compat.bronze_ingredient, technic_compat.bronze_ingredient, technic_compat.bronze_ingredient}, + {technic_compat.tin_ingredient, technic_compat.tin_ingredient, technic_compat.tin_ingredient}, } }) @@ -175,7 +175,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = technic.compat.dirt_ingredient.." 2", + output = technic_compat.dirt_ingredient.." 2", type = "shapeless", replacements = {{"bucket:bucket_water","bucket:bucket_empty"}}, recipe = { @@ -191,14 +191,14 @@ minetest.register_craft({ type = "shapeless", recipe = { "technic:raw_latex", - technic.compat.coal_ingredient, - technic.compat.coal_ingredient, - technic.compat.coal_ingredient, - technic.compat.coal_ingredient, - technic.compat.coal_ingredient, - technic.compat.coal_ingredient, - technic.compat.coal_ingredient, - technic.compat.coal_ingredient, + technic_compat.coal_ingredient, + technic_compat.coal_ingredient, + technic_compat.coal_ingredient, + technic_compat.coal_ingredient, + technic_compat.coal_ingredient, + technic_compat.coal_ingredient, + technic_compat.coal_ingredient, + technic_compat.coal_ingredient, }, }) diff --git a/technic/init.lua b/technic/init.lua index 3f469bc..e25dd82 100644 --- a/technic/init.lua +++ b/technic/init.lua @@ -48,12 +48,6 @@ end -- Read configuration file dofile(modpath.."/config.lua") - --- MineClone2 Support -dofile(modpath.."/mcl_support.lua") - -dofile(modpath.."/mcl_craftguide.lua") - -- Helper functions dofile(modpath.."/helpers.lua") diff --git a/technic/items.lua b/technic/items.lua index ab2bed7..26847cf 100644 --- a/technic/items.lua +++ b/technic/items.lua @@ -131,7 +131,7 @@ minetest.register_node("technic:machine_casing", { paramtype = "light", drawtype = "allfaces", tiles = {"technic_machine_casing.png"}, - sounds = technic.compat.stone_sounds, + sounds = technic_compat.stone_sounds, }) minetest.register_craftitem("technic:rubber_goo", { @@ -188,7 +188,7 @@ for p = 0, 35 do is_ground_content = true, groups = {uranium_block=1, not_in_creative_inventory=nici, cracky=1, level=2, radioactive=radioactivity}, - sounds = technic.compat.stone_sounds, + sounds = technic_compat.stone_sounds, }); if not ov then minetest.register_craft({ diff --git a/technic/machines/HV/forcefield.lua b/technic/machines/HV/forcefield.lua index 72ada04..1613a49 100644 --- a/technic/machines/HV/forcefield.lua +++ b/technic/machines/HV/forcefield.lua @@ -17,9 +17,9 @@ local cable_entry = "^technic_cable_connection_overlay.png" minetest.register_craft({ output = "technic:forcefield_emitter_off", recipe = { - {technic.compat.mese_block_ingredient, "basic_materials:motor", technic.compat.mese_block_ingredient}, + {technic_compat.mese_block_ingredient, "basic_materials:motor", technic_compat.mese_block_ingredient}, {"technic:deployer_off", "technic:machine_casing", "technic:deployer_off"}, - {technic.compat.mese_block_ingredient, "technic:hv_cable", technic.compat.mese_block_ingredient}, + {technic_compat.mese_block_ingredient, "technic:hv_cable", technic_compat.mese_block_ingredient}, } }) @@ -362,7 +362,7 @@ minetest.register_node("technic:forcefield", { drawtype = "glasslike", groups = {not_in_creative_inventory=1}, paramtype = "light", - light_source = technic.compat.mt_light_max, + light_source = technic_compat.mt_light_max, diggable = false, drop = '', tiles = {{ diff --git a/technic/machines/HV/nuclear_reactor.lua b/technic/machines/HV/nuclear_reactor.lua index 43ac769..78d15cc 100644 --- a/technic/machines/HV/nuclear_reactor.lua +++ b/technic/machines/HV/nuclear_reactor.lua @@ -24,7 +24,7 @@ local cable_entry = "^technic_cable_connection_overlay.png" minetest.register_craft({ output = 'technic:hv_nuclear_reactor_core', recipe = { - {'technic:carbon_plate', technic.compat.obsidian_glass_ingredient, 'technic:carbon_plate'}, + {'technic:carbon_plate', technic_compat.obsidian_glass_ingredient, 'technic:carbon_plate'}, {'technic:composite_plate', 'technic:machine_casing', 'technic:composite_plate'}, {'technic:stainless_steel_ingot', 'technic:hv_cable', 'technic:stainless_steel_ingot'}, } @@ -414,7 +414,7 @@ minetest.register_node("technic:hv_nuclear_reactor_core", { mesh = "technic_reactor.obj", groups = {cracky = 1, technic_machine = 1, technic_hv = 1, digiline_remote_receive = 1,pickaxey=3}, legacy_facedir_simple = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, paramtype = "light", paramtype2 = "facedir", stack_max = 1, @@ -453,7 +453,7 @@ minetest.register_node("technic:hv_nuclear_reactor_core_active", { groups = {cracky = 1, technic_machine = 1, technic_hv = 1, radioactive = 4, not_in_creative_inventory = 1, digiline_remote_receive = 1,pickaxey=3}, legacy_facedir_simple = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, drop = "technic:hv_nuclear_reactor_core", light_source = 14, paramtype = "light", diff --git a/technic/machines/LV/alloy_furnace.lua b/technic/machines/LV/alloy_furnace.lua index a16972a..379fd15 100644 --- a/technic/machines/LV/alloy_furnace.lua +++ b/technic/machines/LV/alloy_furnace.lua @@ -4,9 +4,9 @@ minetest.register_craft({ output = 'technic:lv_alloy_furnace', recipe = { - {technic.compat.brick_block_ingredient, technic.compat.brick_block_ingredient, technic.compat.brick_block_ingredient}, - {technic.compat.brick_block_ingredient, 'technic:machine_casing', technic.compat.brick_block_ingredient}, - {technic.compat.brick_block_ingredient, 'technic:lv_cable', technic.compat.brick_block_ingredient}, + {technic_compat.brick_block_ingredient, technic_compat.brick_block_ingredient, technic_compat.brick_block_ingredient}, + {technic_compat.brick_block_ingredient, 'technic:machine_casing', technic_compat.brick_block_ingredient}, + {technic_compat.brick_block_ingredient, 'technic:lv_cable', technic_compat.brick_block_ingredient}, } }) diff --git a/technic/machines/LV/cables.lua b/technic/machines/LV/cables.lua index 8fcc0e7..74c55fe 100644 --- a/technic/machines/LV/cables.lua +++ b/technic/machines/LV/cables.lua @@ -4,9 +4,9 @@ minetest.register_alias("lv_cable", "technic:lv_cable") minetest.register_craft({ output = 'technic:lv_cable 6', recipe = { - {technic.compat.paper_ingredient, technic.compat.paper_ingredient, technic.compat.paper_ingredient}, - {technic.compat.copper_ingredient, technic.compat.copper_ingredient, technic.compat.copper_ingredient}, - {technic.compat.paper_ingredient, technic.compat.paper_ingredient, technic.compat.paper_ingredient}, + {technic_compat.paper_ingredient, technic_compat.paper_ingredient, technic_compat.paper_ingredient}, + {technic_compat.copper_ingredient, technic_compat.copper_ingredient, technic_compat.copper_ingredient}, + {technic_compat.paper_ingredient, technic_compat.paper_ingredient, technic_compat.paper_ingredient}, } }) diff --git a/technic/machines/LV/compressor.lua b/technic/machines/LV/compressor.lua index 5c1d089..0a24ed2 100644 --- a/technic/machines/LV/compressor.lua +++ b/technic/machines/LV/compressor.lua @@ -4,7 +4,7 @@ minetest.register_alias("compressor", "technic:lv_compressor") minetest.register_craft({ output = 'technic:lv_compressor', recipe = { - {technic.compat.stone_ingredient, 'basic_materials:motor', technic.compat.stone_ingredient}, + {technic_compat.stone_ingredient, 'basic_materials:motor', technic_compat.stone_ingredient}, {'mesecons:piston', 'technic:machine_casing', 'mesecons:piston'}, {'basic_materials:silver_wire', 'technic:lv_cable', 'basic_materials:silver_wire'}, }, diff --git a/technic/machines/LV/electric_furnace.lua b/technic/machines/LV/electric_furnace.lua index efb0cfe..cd5f38e 100644 --- a/technic/machines/LV/electric_furnace.lua +++ b/technic/machines/LV/electric_furnace.lua @@ -5,9 +5,9 @@ minetest.register_craft({ output = 'technic:electric_furnace', recipe = { - {technic.compat.cobble_ingredient, technic.compat.cobble_ingredient, technic.compat.cobble_ingredient}, - {technic.compat.cobble_ingredient, 'technic:machine_casing', technic.compat.cobble_ingredient}, - {technic.compat.cobble_ingredient, 'technic:lv_cable', technic.compat.cobble_ingredient}, + {technic_compat.cobble_ingredient, technic_compat.cobble_ingredient, technic_compat.cobble_ingredient}, + {technic_compat.cobble_ingredient, 'technic:machine_casing', technic_compat.cobble_ingredient}, + {technic_compat.cobble_ingredient, 'technic:lv_cable', technic_compat.cobble_ingredient}, } }) diff --git a/technic/machines/LV/generator.lua b/technic/machines/LV/generator.lua index 66a9db4..31f78ea 100644 --- a/technic/machines/LV/generator.lua +++ b/technic/machines/LV/generator.lua @@ -8,9 +8,9 @@ minetest.register_alias("lv_generator", "technic:lv_generator") minetest.register_craft({ output = 'technic:lv_generator', recipe = { - {technic.compat.stone_ingredient, technic.compat.furnace_ingredient, technic.compat.stone_ingredient}, - {technic.compat.stone_ingredient, 'technic:machine_casing', technic.compat.stone_ingredient}, - {technic.compat.stone_ingredient, 'technic:lv_cable', technic.compat.stone_ingredient}, + {technic_compat.stone_ingredient, technic_compat.furnace_ingredient, technic_compat.stone_ingredient}, + {technic_compat.stone_ingredient, 'technic:machine_casing', technic_compat.stone_ingredient}, + {technic_compat.stone_ingredient, 'technic:lv_cable', technic_compat.stone_ingredient}, } }) diff --git a/technic/machines/LV/geothermal.lua b/technic/machines/LV/geothermal.lua index 823d250..e6ae085 100644 --- a/technic/machines/LV/geothermal.lua +++ b/technic/machines/LV/geothermal.lua @@ -10,9 +10,9 @@ local S = technic.getter minetest.register_craft({ output = 'technic:geothermal', recipe = { - {technic.compat.granite_ingredient, technic.compat.diamond_ingredient, technic.compat.granite_ingredient}, + {technic_compat.granite_ingredient, technic_compat.diamond_ingredient, technic_compat.granite_ingredient}, {'basic_materials:copper_wire', 'technic:machine_casing', 'basic_materials:copper_wire'}, - {technic.compat.granite_ingredient, 'technic:lv_cable', technic.compat.granite_ingredient}, + {technic_compat.granite_ingredient, 'technic:lv_cable', technic_compat.granite_ingredient}, }, replacements = { {"basic_materials:copper_wire", "basic_materials:empty_spool"}, @@ -90,7 +90,7 @@ minetest.register_node("technic:geothermal", { technic_machine=1, technic_lv=1, pickaxey=3}, paramtype2 = "facedir", legacy_facedir_simple = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("infotext", S("Geothermal %s Generator"):format("LV")) @@ -111,7 +111,7 @@ minetest.register_node("technic:geothermal_active", { groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1, technic_lv=1, not_in_creative_inventory=1, pickaxey=3}, legacy_facedir_simple = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, drop = "technic:geothermal", technic_run = run, _mcl_hardness = 3, diff --git a/technic/machines/LV/grinder.lua b/technic/machines/LV/grinder.lua index ff42911..454f169 100644 --- a/technic/machines/LV/grinder.lua +++ b/technic/machines/LV/grinder.lua @@ -3,9 +3,9 @@ minetest.register_alias("grinder", "technic:lv_grinder") minetest.register_craft({ output = 'technic:lv_grinder', recipe = { - {technic.compat.desert_stone_ingredient, technic.compat.diamond_ingredient, technic.compat.desert_stone_ingredient}, - {technic.compat.desert_stone_ingredient, 'technic:machine_casing', technic.compat.desert_stone_ingredient}, - {technic.compat.granite_ingredient, 'technic:lv_cable', technic.compat.granite_ingredient}, + {technic_compat.desert_stone_ingredient, technic_compat.diamond_ingredient, technic_compat.desert_stone_ingredient}, + {technic_compat.desert_stone_ingredient, 'technic:machine_casing', technic_compat.desert_stone_ingredient}, + {technic_compat.granite_ingredient, 'technic:lv_cable', technic_compat.granite_ingredient}, } }) diff --git a/technic/machines/LV/lamp.lua b/technic/machines/LV/lamp.lua index 1ef2bf4..cefaec7 100644 --- a/technic/machines/LV/lamp.lua +++ b/technic/machines/LV/lamp.lua @@ -161,7 +161,7 @@ technic.register_machine("LV", "technic:lv_lamp_active", technic.receiver) minetest.register_craft({ output = "technic:lv_lamp", recipe = { - {technic.compat.glass_ingredient, technic.compat.glass_ingredient, technic.compat.glass_ingredient}, + {technic_compat.glass_ingredient, technic_compat.glass_ingredient, technic_compat.glass_ingredient}, {"technic:lv_led", "technic:lv_led", "technic:lv_led"}, {"mesecons_materials:glue", "technic:lv_cable", "mesecons_materials:glue"}, } diff --git a/technic/machines/LV/music_player.lua b/technic/machines/LV/music_player.lua index a46687c..e2d2761 100644 --- a/technic/machines/LV/music_player.lua +++ b/technic/machines/LV/music_player.lua @@ -7,9 +7,9 @@ minetest.register_alias("music_player", "technic:music_player") minetest.register_craft({ output = 'technic:music_player', recipe = { - {'technic:chromium_ingot', technic.compat.diamond_ingredient, 'technic:chromium_ingot'}, - {technic.compat.diamond_ingredient, 'technic:machine_casing', technic.compat.diamond_ingredient}, - {technic.compat.mossy_cobble_ingredient, 'technic:lv_cable', technic.compat.mossy_cobble_ingredient}, + {'technic:chromium_ingot', technic_compat.diamond_ingredient, 'technic:chromium_ingot'}, + {technic_compat.diamond_ingredient, 'technic:machine_casing', technic_compat.diamond_ingredient}, + {technic_compat.mossy_cobble_ingredient, 'technic:lv_cable', technic_compat.mossy_cobble_ingredient}, } }) @@ -96,7 +96,7 @@ minetest.register_node("technic:music_player", { groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1, technic_lv=1, pickaxey=3}, connect_sides = {"bottom"}, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("infotext", S("%s Music Player"):format("LV")) diff --git a/technic/machines/LV/solar_panel.lua b/technic/machines/LV/solar_panel.lua index 161ee8f..f7684bf 100644 --- a/technic/machines/LV/solar_panel.lua +++ b/technic/machines/LV/solar_panel.lua @@ -50,7 +50,7 @@ minetest.register_node("technic:solar_panel", { groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1, technic_lv=1, pickaxey=3}, connect_sides = {"bottom"}, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, description = S("Small Solar %s Generator"):format("LV"), active = false, drawtype = "nodebox", diff --git a/technic/machines/LV/water_mill.lua b/technic/machines/LV/water_mill.lua index b59d133..4250108 100644 --- a/technic/machines/LV/water_mill.lua +++ b/technic/machines/LV/water_mill.lua @@ -11,7 +11,7 @@ minetest.register_alias("water_mill", "technic:water_mill") minetest.register_craft({ output = 'technic:water_mill', recipe = { - {'technic:marble', technic.compat.diamond_ingredient, 'technic:marble'}, + {'technic:marble', technic_compat.diamond_ingredient, 'technic:marble'}, {'group:wood', 'technic:machine_casing', 'group:wood'}, {'technic:marble', 'technic:lv_cable', 'technic:marble'}, } @@ -80,7 +80,7 @@ minetest.register_node("technic:water_mill", { groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1, technic_lv=1, pickaxey=3}, legacy_facedir_simple = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("infotext", S("Hydro %s Generator"):format("LV")) @@ -102,7 +102,7 @@ minetest.register_node("technic:water_mill_active", { groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1, technic_lv=1, not_in_creative_inventory=1, pickaxey=3}, legacy_facedir_simple = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, drop = "technic:water_mill", technic_run = run, technic_disabled_machine_name = "technic:water_mill", diff --git a/technic/machines/MV/hydro_turbine.lua b/technic/machines/MV/hydro_turbine.lua index 6b05edf..d006b29 100644 --- a/technic/machines/MV/hydro_turbine.lua +++ b/technic/machines/MV/hydro_turbine.lua @@ -77,7 +77,7 @@ minetest.register_node("technic:hydro_turbine", { groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1, technic_mv=1, pickaxey=3}, legacy_facedir_simple = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("infotext", S("Hydro %s Generator"):format("MV")) @@ -99,7 +99,7 @@ minetest.register_node("technic:hydro_turbine_active", { groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1, technic_mv=1, not_in_creative_inventory=1, pickaxey=3}, legacy_facedir_simple = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, drop = "technic:hydro_turbine", technic_run = run, technic_disabled_machine_name = "technic:hydro_turbine", diff --git a/technic/machines/MV/lighting.lua b/technic/machines/MV/lighting.lua index c4913af..9372c67 100644 --- a/technic/machines/MV/lighting.lua +++ b/technic/machines/MV/lighting.lua @@ -105,7 +105,7 @@ minetest.register_node('technic:homedecor_glowlight_half_yellow', { paramtype = "light", paramtype2 = "facedir", walkable = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, groups = { snappy = 3 }, on_place = function(itemstack, placer, pointed_thing) @@ -145,7 +145,7 @@ minetest.register_node('technic:homedecor_glowlight_half_yellow_active', { paramtype2 = "facedir", walkable = true, light_source = minetest.LIGHT_MAX, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, groups = { snappy = 3, not_in_creative_inventory=1}, drop="technic:homedecor_glowlight_half_yellow", @@ -186,7 +186,7 @@ minetest.register_node('technic:homedecor_glowlight_quarter_yellow', { paramtype = "light", paramtype2 = "facedir", walkable = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, groups = { snappy = 3 }, on_place = function(itemstack, placer, pointed_thing) @@ -226,7 +226,7 @@ minetest.register_node('technic:homedecor_glowlight_quarter_yellow_active', { paramtype2 = "facedir", walkable = true, light_source = minetest.LIGHT_MAX-1, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, groups = { snappy = 3, not_in_creative_inventory=1}, drop="technic:homedecor_glowlight_quarter_yellow", @@ -268,7 +268,7 @@ minetest.register_node('technic:homedecor_glowlight_half_white', { paramtype = "light", paramtype2 = "facedir", walkable = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, groups = { snappy = 3 }, on_place = function(itemstack, placer, pointed_thing) @@ -308,7 +308,7 @@ minetest.register_node('technic:homedecor_glowlight_half_white_active', { paramtype2 = "facedir", walkable = true, light_source = minetest.LIGHT_MAX, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, groups = { snappy = 3, not_in_creative_inventory=1}, drop="technic:homedecor_glowlight_half_white", @@ -349,7 +349,7 @@ minetest.register_node('technic:homedecor_glowlight_quarter_white', { paramtype = "light", paramtype2 = "facedir", walkable = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, groups = { snappy = 3 }, on_place = function(itemstack, placer, pointed_thing) @@ -389,7 +389,7 @@ minetest.register_node('technic:homedecor_glowlight_quarter_white_active', { paramtype2 = "facedir", walkable = true, light_source = minetest.LIGHT_MAX-1, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, groups = { snappy = 3, not_in_creative_inventory=1}, drop="technic:homedecor_glowlight_quarter_white", @@ -430,7 +430,7 @@ minetest.register_node('technic:homedecor_glowlight_small_cube_yellow', { paramtype = "light", paramtype2 = "facedir", walkable = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, groups = { snappy = 3 }, on_place = function(itemstack, placer, pointed_thing) @@ -470,7 +470,7 @@ minetest.register_node('technic:homedecor_glowlight_small_cube_yellow_active', { paramtype2 = "facedir", walkable = true, light_source = minetest.LIGHT_MAX-1, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, groups = { snappy = 3, not_in_creative_inventory=1}, drop="technic:homedecor_glowlight_small_cube_yellow", @@ -511,7 +511,7 @@ minetest.register_node('technic:homedecor_glowlight_small_cube_white', { paramtype = "light", paramtype2 = "facedir", walkable = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, groups = { snappy = 3 }, on_place = function(itemstack, placer, pointed_thing) @@ -551,7 +551,7 @@ minetest.register_node('technic:homedecor_glowlight_small_cube_white_active', { paramtype2 = "facedir", walkable = true, light_source = minetest.LIGHT_MAX-1, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, groups = { snappy = 3, not_in_creative_inventory=1}, drop="technic:homedecor_glowlight_small_cube_white", diff --git a/technic/machines/MV/power_radiator.lua b/technic/machines/MV/power_radiator.lua index 993f8b2..b9d6a25 100644 --- a/technic/machines/MV/power_radiator.lua +++ b/technic/machines/MV/power_radiator.lua @@ -123,7 +123,7 @@ minetest.register_node("technic:power_radiator", { tiles = {"technic_lv_cable.png", "technic_lv_cable.png", "technic_lv_cable.png", "technic_lv_cable.png", "technic_lv_cable.png", "technic_lv_cable.png"}, groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, pickaxey=3}, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, drawtype = "nodebox", paramtype = "light", is_ground_content = true, diff --git a/technic/machines/MV/tool_workshop.lua b/technic/machines/MV/tool_workshop.lua index ad44a45..afd0822 100644 --- a/technic/machines/MV/tool_workshop.lua +++ b/technic/machines/MV/tool_workshop.lua @@ -10,9 +10,9 @@ local tube_entry = "^pipeworks_tube_connection_wooden.png" minetest.register_craft({ output = 'technic:tool_workshop', recipe = { - {'group:wood', technic.compat.diamond_ingredient, 'group:wood'}, + {'group:wood', technic_compat.diamond_ingredient, 'group:wood'}, {'mesecons_pistons:piston_sticky_off', 'technic:machine_casing', 'technic:carbon_cloth'}, - {technic.compat.obsidian_ingredient, 'technic:mv_cable', technic.compat.obsidian_ingredient}, + {technic_compat.obsidian_ingredient, 'technic:mv_cable', technic_compat.obsidian_ingredient}, } }) @@ -95,7 +95,7 @@ minetest.register_node("technic:tool_workshop", { groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1, technic_mv=1, tubedevice=1, tubedevice_receiver=1, pickaxey=3}, connect_sides = {"bottom", "back", "left", "right"}, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("infotext", S("%s Tool Workshop"):format("MV")) diff --git a/technic/machines/MV/wind_mill.lua b/technic/machines/MV/wind_mill.lua index 7b80024..3a82574 100644 --- a/technic/machines/MV/wind_mill.lua +++ b/technic/machines/MV/wind_mill.lua @@ -25,7 +25,7 @@ minetest.register_node("technic:wind_mill_frame", { tiles = {"technic_carbon_steel_block.png", "default_glass.png"}, sunlight_propagates = true, groups = {cracky=3, pickaxey=3}, - sounds = technic.compat.stone_sounds, + sounds = technic_compat.stone_sounds, paramtype = "light", _mcl_hardness = 3, _mcl_blast_resistance = 3, @@ -76,7 +76,7 @@ minetest.register_node("technic:wind_mill", { paramtype2 = "facedir", groups = {cracky=1, technic_machine=1, technic_mv=1, pickaxey=3}, connect_sides = {"top", "bottom", "back", "left", "right"}, - sounds = technic.compat.stone_sounds, + sounds = technic_compat.stone_sounds, drawtype = "nodebox", paramtype = "light", node_box = { diff --git a/technic/machines/other/anchor.lua b/technic/machines/other/anchor.lua index c5496cc..4ed5a96 100644 --- a/technic/machines/other/anchor.lua +++ b/technic/machines/other/anchor.lua @@ -73,7 +73,7 @@ minetest.register_node("technic:admin_anchor", { tiles = {"technic_admin_anchor.png"}, is_ground_content = true, groups = {cracky=3, not_in_creative_inventory=1, pickaxey=3}, - sounds = technic.compat.stone_sounds, + sounds = technic_compat.stone_sounds, after_place_node = function (pos, placer) local meta = minetest.get_meta(pos) if placer and placer:is_player() then diff --git a/technic/machines/other/coal_alloy_furnace.lua b/technic/machines/other/coal_alloy_furnace.lua index 15e328a..4e2524b 100644 --- a/technic/machines/other/coal_alloy_furnace.lua +++ b/technic/machines/other/coal_alloy_furnace.lua @@ -6,9 +6,9 @@ local S = technic.getter minetest.register_craft({ output = 'technic:coal_alloy_furnace', recipe = { - {technic.compat.brick_block_ingredient, technic.compat.brick_block_ingredient, technic.compat.brick_block_ingredient}, - {technic.compat.brick_block_ingredient, '', technic.compat.brick_block_ingredient}, - {technic.compat.brick_block_ingredient, technic.compat.brick_block_ingredient, technic.compat.brick_block_ingredient}, + {technic_compat.brick_block_ingredient, technic_compat.brick_block_ingredient, technic_compat.brick_block_ingredient}, + {technic_compat.brick_block_ingredient, '', technic_compat.brick_block_ingredient}, + {technic_compat.brick_block_ingredient, technic_compat.brick_block_ingredient, technic_compat.brick_block_ingredient}, } }) @@ -36,7 +36,7 @@ minetest.register_node("technic:coal_alloy_furnace", { paramtype2 = "facedir", groups = {cracky=2, pickaxey=3}, legacy_facedir_simple = true, - sounds = technic.compat.stone_sounds, + sounds = technic_compat.stone_sounds, on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", formspec) @@ -66,7 +66,7 @@ minetest.register_node("technic:coal_alloy_furnace_active", { drop = "technic:coal_alloy_furnace", groups = {cracky=2, not_in_creative_inventory=1, pickaxey=3}, legacy_facedir_simple = true, - sounds = technic.compat.stone_sounds, + sounds = technic_compat.stone_sounds, can_dig = technic.machine_can_dig, allow_metadata_inventory_put = technic.machine_inventory_put, allow_metadata_inventory_take = technic.machine_inventory_take, diff --git a/technic/machines/other/constructor.lua b/technic/machines/other/constructor.lua index 2b26fc0..6549838 100644 --- a/technic/machines/other/constructor.lua +++ b/technic/machines/other/constructor.lua @@ -142,7 +142,7 @@ local function make_constructor(mark, length) groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, mesecon = 2, technic_constructor = 1, pickaxey=3}, mesecons = {effector = {action_on = make_on(mark, length)}}, - sounds = technic.compat.stone_sounds, + sounds = technic_compat.stone_sounds, on_construct = function(pos) local meta = minetest.get_meta(pos) local formspec = "size[8,9;]".. @@ -198,7 +198,7 @@ local function make_constructor(mark, length) groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, mesecon=2, not_in_creative_inventory=1, technic_constructor=1, pickaxey = 3}, mesecons= {effector = {action_off = make_off(mark)}}, - sounds = technic.compat.stone_sounds, + sounds = technic_compat.stone_sounds, allow_metadata_inventory_put = allow_inventory_put, allow_metadata_inventory_take = technic.machine_inventory_take, allow_metadata_inventory_move = technic.machine_inventory_move, diff --git a/technic/machines/other/frames.lua b/technic/machines/other/frames.lua index cd0d224..200aa58 100644 --- a/technic/machines/other/frames.lua +++ b/technic/machines/other/frames.lua @@ -1000,7 +1000,7 @@ minetest.register_craft({ output = 'technic:template 10', recipe = { { '', 'basic_materials:brass_ingot', '' }, - { 'basic_materials:brass_ingot', technic.compat.mese_crystal_ingredient, 'basic_materials:brass_ingot' }, + { 'basic_materials:brass_ingot', technic_compat.mese_crystal_ingredient, 'basic_materials:brass_ingot' }, { '', 'basic_materials:brass_ingot', '' }, } }) @@ -1028,7 +1028,7 @@ minetest.register_craft({ output = 'technic:template_tool', recipe = { { '', 'technic:template', '' }, - { technic.compat.mese_crystal_ingredient, 'default:stick', technic.compat.mese_crystal_ingredient }, + { technic_compat.mese_crystal_ingredient, 'default:stick', technic_compat.mese_crystal_ingredient }, { '', 'default:stick', '' }, } }) diff --git a/technic/machines/other/injector.lua b/technic/machines/other/injector.lua index bd53c50..c1e7a06 100644 --- a/technic/machines/other/injector.lua +++ b/technic/machines/other/injector.lua @@ -47,7 +47,7 @@ minetest.register_craft({ output = 'technic:injector 1', recipe = { {'', 'technic:control_logic_unit',''}, - {'', technic.compat.chest_ingredient,''}, + {'', technic_compat.chest_ingredient,''}, {'', 'pipeworks:tube_1',''}, } }) @@ -105,7 +105,7 @@ minetest.register_node("technic:injector", { end, connect_sides = {left=1, right=1, back=1, top=1, bottom=1}, }, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("infotext", S("Self-Contained Injector")) diff --git a/technic/machines/power_monitor.lua b/technic/machines/power_monitor.lua index 0baefa7..e207be6 100644 --- a/technic/machines/power_monitor.lua +++ b/technic/machines/power_monitor.lua @@ -10,7 +10,7 @@ minetest.register_craft({ output = "technic:power_monitor", recipe = { {"", "", ""}, - {"", "technic:machine_casing", technic.compat.copper_ingredient}, + {"", "technic:machine_casing", technic_compat.copper_ingredient}, {"technic:lv_cable", "technic:lv_cable", "technic:lv_cable"} } }) @@ -28,7 +28,7 @@ minetest.register_node("technic:power_monitor",{ paramtype2 = "facedir", groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_all_tiers=1, technic_machine=1,pickaxey=3}, connect_sides = {"bottom", "back"}, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("infotext", S("Power Monitor")) diff --git a/technic/machines/register/battery_box.lua b/technic/machines/register/battery_box.lua index a427e06..822a88d 100644 --- a/technic/machines/register/battery_box.lua +++ b/technic/machines/register/battery_box.lua @@ -17,9 +17,9 @@ technic.register_power_tool("technic:blue_energy_crystal", 450000) minetest.register_craft({ output = "technic:battery", recipe = { - {"group:wood", technic.compat.copper_ingredient, "group:wood"}, + {"group:wood", technic_compat.copper_ingredient, "group:wood"}, {"group:wood", "default:tin_ingot", "group:wood"}, - {"group:wood", technic.compat.copper_ingredient, "group:wood"}, + {"group:wood", technic_compat.copper_ingredient, "group:wood"}, } }) -- Sulfur-lead-water recipes: @@ -300,7 +300,7 @@ function technic.register_battery_box(data) connect_sides = {"bottom"}, tube = data.tube and tube or nil, paramtype2 = "facedir", - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, drop = "technic:"..ltier.."_battery_box0", on_construct = function(pos) local meta = minetest.get_meta(pos) diff --git a/technic/machines/register/cables.lua b/technic/machines/register/cables.lua index a35b001..51af47d 100644 --- a/technic/machines/register/cables.lua +++ b/technic/machines/register/cables.lua @@ -161,7 +161,7 @@ function technic.register_cable(tier, size) inventory_image = "technic_"..ltier.."_cable_wield.png", wield_image = "technic_"..ltier.."_cable_wield.png", groups = groups, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, drop = "technic:"..ltier.."_cable", paramtype = "light", sunlight_propagates = true, @@ -203,7 +203,7 @@ function technic.register_cable(tier, size) description = S("%s Cable Plate"):format(tier), tiles = {"technic_"..ltier.."_cable.png"}, groups = table.copy(groups), - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, drop = "technic:"..ltier.."_cable_plate_1", paramtype = "light", sunlight_propagates = true, diff --git a/technic/machines/register/common.lua b/technic/machines/register/common.lua index 4bb5178..c09a8c6 100644 --- a/technic/machines/register/common.lua +++ b/technic/machines/register/common.lua @@ -35,7 +35,7 @@ end -- handles the machine upgrades when set or removed local function on_machine_upgrade(meta, stack) local stack_name = stack:get_name() - if stack_name == technic.compat.chest_ingredient then + if stack_name == technic_compat.chest_ingredient then meta:set_int("public", 1) return 1 elseif stack_name ~= "technic:control_logic_unit" @@ -47,7 +47,7 @@ end -- something is about to be removed local function on_machine_downgrade(meta, stack, list) - if stack:get_name() == technic.compat.chest_ingredient then + if stack:get_name() == technic_compat.chest_ingredient then local inv = meta:get_inventory() local upg1, upg2 = inv:get_stack("upgrade1", 1), inv:get_stack("upgrade2", 1) diff --git a/technic/machines/register/generator.lua b/technic/machines/register/generator.lua index 88e78d8..846a1a5 100644 --- a/technic/machines/register/generator.lua +++ b/technic/machines/register/generator.lua @@ -125,7 +125,7 @@ function technic.register_generator(data) groups = groups, connect_sides = {"bottom", "back", "left", "right"}, legacy_facedir_simple = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, tube = data.tube and tube or nil, on_construct = function(pos) local meta = minetest.get_meta(pos) @@ -195,7 +195,7 @@ function technic.register_generator(data) groups = active_groups, connect_sides = {"bottom"}, legacy_facedir_simple = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, tube = data.tube and tube or nil, drop = "technic:"..ltier.."_generator", can_dig = technic.machine_can_dig, diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index 2017aef..22ead6f 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -82,15 +82,15 @@ register_dust("Cast Iron", "technic:cast_iron_ingot") register_dust("Chernobylite", "technic:chernobylite_block") register_dust("Chromium", "technic:chromium_ingot") register_dust("Coal", nil) -register_dust("Copper", technic.compat.copper_ingredient) +register_dust("Copper", technic_compat.copper_ingredient) register_dust("Lead", "technic:lead_ingot") -register_dust("Gold", technic.compat.gold_ingot_ingredient) +register_dust("Gold", technic_compat.gold_ingot_ingredient) register_dust("Mithril", "moreores:mithril_ingot") register_dust("Silver", "moreores:silver_ingot") register_dust("Stainless Steel", "technic:stainless_steel_ingot") register_dust("Stone", "default:stone") register_dust("Sulfur", nil) -register_dust("Tin", technic.compat.tin_ingredient) +register_dust("Tin", technic_compat.tin_ingredient) register_dust("Wrought Iron", "technic:wrought_iron_ingot") register_dust("Zinc", "technic:zinc_ingot") if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then diff --git a/technic/machines/register/machine_base.lua b/technic/machines/register/machine_base.lua index 5227955..c69ab6c 100644 --- a/technic/machines/register/machine_base.lua +++ b/technic/machines/register/machine_base.lua @@ -174,7 +174,7 @@ function technic.register_base_machine(data) tube = data.tube and tube or nil, connect_sides = data.connect_sides or connect_default, legacy_facedir_simple = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, on_construct = function(pos) local node = minetest.get_node(pos) local meta = minetest.get_meta(pos) @@ -248,7 +248,7 @@ function technic.register_base_machine(data) groups = active_groups, connect_sides = data.connect_sides or connect_default, legacy_facedir_simple = true, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, tube = data.tube and tube or nil, can_dig = technic.machine_can_dig, allow_metadata_inventory_put = technic.machine_inventory_put, diff --git a/technic/machines/register/solar_array.lua b/technic/machines/register/solar_array.lua index ca60ca8..1469467 100644 --- a/technic/machines/register/solar_array.lua +++ b/technic/machines/register/solar_array.lua @@ -45,7 +45,7 @@ function technic.register_solar_array(data) "technic_"..ltier.."_solar_array_side.png", "technic_"..ltier.."_solar_array_side.png"}, groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1, ["technic_"..ltier]=1, pickaxey=3}, connect_sides = {"bottom"}, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, description = S("Arrayed Solar %s Generator"):format(tier), active = false, drawtype = "nodebox", diff --git a/technic/machines/supply_converter.lua b/technic/machines/supply_converter.lua index bb3c380..f42e23d 100644 --- a/technic/machines/supply_converter.lua +++ b/technic/machines/supply_converter.lua @@ -200,7 +200,7 @@ minetest.register_node("technic:supply_converter", { groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1, technic_all_tiers=1, pickaxey=3}, connect_sides = {"top", "bottom"}, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, on_receive_fields = supply_converter_receive_fields, on_construct = function(pos) local meta = minetest.get_meta(pos) diff --git a/technic/machines/switching_station.lua b/technic/machines/switching_station.lua index 75140ea..0f3e7a6 100644 --- a/technic/machines/switching_station.lua +++ b/technic/machines/switching_station.lua @@ -15,7 +15,7 @@ minetest.register_craft({ output = "technic:switching_station", recipe = { {"", "technic:lv_transformer", ""}, - {technic.compat.copper_ingredient, "technic:machine_casing", technic.compat.copper_ingredient}, + {technic_compat.copper_ingredient, "technic:machine_casing", technic_compat.copper_ingredient}, {"technic:lv_cable", "technic:lv_cable", "technic:lv_cable"} } }) @@ -38,7 +38,7 @@ minetest.register_node("technic:switching_station",{ "technic_water_mill_top_active.png"}, groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_all_tiers=1,pickaxey=3}, connect_sides = {"bottom"}, - sounds = technic.compat.wood_sounds, + sounds = technic_compat.wood_sounds, on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("infotext", S("Switching Station")) diff --git a/technic/mcl_craftguide.lua b/technic/mcl_craftguide.lua deleted file mode 100644 index d9da5d4..0000000 --- a/technic/mcl_craftguide.lua +++ /dev/null @@ -1,188 +0,0 @@ --- Register craft types for each machine -mcl_craftguide.register_craft_type("centrifuge", { - description = "Centrifuge", - icon = "technic_mv_centrifuge_front_active.png", -}) - -mcl_craftguide.register_craft_type("compressor", { - description = "Compressor", - icon = "technic_lv_compressor_front_active.png", -}) - -mcl_craftguide.register_craft_type("extractor", { - description = "Extractor", - icon = "technic_lv_extractor_front_active.png", -}) - -mcl_craftguide.register_craft_type("freezer", { - description = "Freezer", - icon = "technic_mv_freezer_front_active.png", -}) - -mcl_craftguide.register_craft_type("grinder", { - description = "Grinder", - icon = "technic_lv_grinder_front_active.png", -}) - -mcl_craftguide.register_craft_type("alloy_furnace", { - description = "Alloy Furnace", - icon = "technic_coal_alloy_furnace_front_active.png", -}) - - -centrifuge_recipes = { - { "technic:bronze_dust 8", "technic:copper_dust 7", "technic:tin_dust" }, - { "technic:stainless_steel_dust 5", "technic:wrought_iron_dust 4", "technic:chromium_dust" }, - { "technic:brass_dust 3", "technic:copper_dust 2", "technic:zinc_dust" }, - { "technic:chernobylite_dust", technic.compat.sand_ingredient, "technic:uranium3_dust" }, - { technic.compat.dirt_ingredient.." 4", technic.compat.sand_ingredient, technic.compat.gravel_ingredient, "default:clay_lump 2" }, -} - -compressor_recipes = { - {technic.compat.snow_block_ingredient, technic.compat.ice_block_ingredient}, - {technic.compat.sand_ingredient.." 2", technic.compat.sandstone_ingredient}, - {technic.compat.desert_sand_ingredient.." 2", technic.compat.desert_stone_ingredient}, - {technic.compat.desert_sand_ingredient, technic.compat.desert_stone_ingredient}, - {"technic:mixed_metal_ingot", "technic:composite_plate"}, - {technic.compat.copper_ingredient.." 5", "technic:copper_plate"}, - {"technic:coal_dust 4", "technic:graphite"}, - {"technic:carbon_cloth", "technic:carbon_plate"}, - {"technic:uranium35_ingot 5", "technic:uranium_fuel"}, -} - -extractor_recipes = { - {"technic:coal_dust", technic.compat.dye_black .. " 2"}, - {technic.compat.blueberries_ingredient, technic.compat.dye_violet .. " 2"}, - {technic.compat.grass_ingredient, technic.compat.dye_green .. " 1"}, - {technic.compat.dry_shrub_ingredient, technic.compat.dye_brown .. " 1"}, - {technic.compat.junglegrass_ingredient, technic.compat.dye_green .. " 2"}, - {technic.compat.cactus_ingredient, technic.compat.dye_green .. " 4"}, - {technic.compat.geranium_ingredient, technic.compat.dye_blue .. " 4"}, - {technic.compat.dandelion_white_ingredient, technic.compat.dye_white .. " 4"}, - {technic.compat.dandelion_yellow_ingredient, technic.compat.dye_yellow .. " 4"}, - {technic.compat.tulip_ingredient, technic.compat.dye_orange .. " 4"}, - {technic.compat.rose_ingredient, technic.compat.dye_red .. " 4"}, - {technic.compat.viola_ingredient, technic.compat.dye_violet .. " 4"}, - {technic.compat.blackberry_ingredient, unifieddyes and "unifieddyes:magenta_s50 4" or technic.compat.dye_violet .. " 4"}, - {technic.compat.blueberry_ingredient, unifieddyes and "unifieddyes:magenta_s50 4" or ""}, -} - -freezer_recipes = { - {technic.compat.water_bucket_ingredient, { technic.compat.ice_block_ingredient, technic.compat.emtpy_bucket_ingredient } }, - {technic.compat.bucket_river_water_ingredient, { technic.compat.ice_block_ingredient, technic.compat.emtpy_bucket_ingredient } }, - {technic.compat.dirt_ingredient , technic.compat.dirt_with_snow_ingredient }, - {technic.compat.bucket_lava_ingredient, { technic.compat.obsidian_ingredient, technic.compat.emtpy_bucket_ingredient } } -} - -grinder_recipes = { - -- Dusts - {technic.compat.coal_ingredient, "technic:coal_dust 2"}, - {technic.compat.copper_lump_ingredient, "technic:copper_dust 2"}, - {technic.compat.desert_stone_ingredient, technic.compat.desert_sand_ingredient}, - {technic.compat.gold_lump_ingredient, "technic:gold_dust 2"}, - {technic.compat.iron_lump_ingredient, "technic:wrought_iron_dust 2"}, - {"moreores:tin_lump", "technic:tin_dust 2"}, - {"technic:chromium_lump", "technic:chromium_dust 2"}, - {"technic:uranium_lump", "technic:uranium_dust 2"}, - {"technic:zinc_lump", "technic:zinc_dust 2"}, - {"technic:lead_lump", "technic:lead_dust 2"}, - {"technic:sulfur_lump", "technic:sulfur_dust 2"}, - {technic.compat.stone_ingredient, "technic:stone_dust"}, - {technic.compat.sand_ingredient, "technic:stone_dust"}, - {technic.compat.desert_sand_ingredient, "technic:stone_dust"}, - - -- Other - {technic.compat.cobble_ingredient, technic.compat.gravel_ingredient}, - {technic.compat.gravel_ingredient, technic.compat.sand_ingredient}, - {technic.compat.sandstone_ingredient, technic.compat.sand_ingredient.." 2"}, -- reverse recipe can be found in the compressor - {technic.compat.desert_stone_ingredient, technic.compat.desert_sand_ingredient.." 2"}, -- reverse recipe can be found in the compressor - {technic.compat.ice_block_ingredient, technic.compat.snow_block_ingredient}, -} - -alloy_recipes = { - {"technic:copper_dust 7", "technic:tin_dust", "technic:bronze_dust 8", 12}, - {technic.compat.copper_ingredient.." 7", technic.compat.tin_ingredient, technic.compat.bronze_ingredient.." 8", 12}, - {"technic:wrought_iron_dust 2", "technic:coal_dust", "technic:carbon_steel_dust 2", 6}, - {"technic:wrought_iron_ingot 2", "technic:coal_dust", "technic:carbon_steel_ingot 2", 6}, - {"technic:carbon_steel_dust 2", "technic:coal_dust", "technic:cast_iron_dust 2", 6}, - {"technic:carbon_steel_ingot 2", "technic:coal_dust", "technic:cast_iron_ingot 2", 6}, - {"technic:carbon_steel_dust 4", "technic:chromium_dust", "technic:stainless_steel_dust 5", 7.5}, - {"technic:carbon_steel_ingot 4", "technic:chromium_ingot", "technic:stainless_steel_ingot 5", 7.5}, - {"technic:copper_dust 2", "technic:zinc_dust", "technic:brass_dust 3"}, - {technic.compat.copper_ingredient.." 2", "technic:zinc_ingot", "basic_materials:brass_ingot 3"}, - {technic.compat.sand_ingredient.." 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 - -- The highest volume use of carbon black is as a reinforcing filler in rubber products, especially tires. - -- "[Compounding a] pure gum vulcanizate … with 50% of its weight of carbon black improves its tensile strength and wear resistance …" - {"technic:raw_latex 4", "technic:coal_dust 2", "technic:rubber 6", 2}, - {technic.compat.ice_block_ingredient, technic.compat.emtpy_bucket_ingredient, technic.compat.water_bucket_ingredient, 1 }, -} - -for _, data in pairs(alloy_recipes) do - mcl_craftguide.register_craft({ - type = "alloy_furnace", - width = 1, - output = data[3], - items = {data[1], data[2]}, - }) -end - --- Register Centrifuge Recipes -for _, data in pairs(centrifuge_recipes) do - mcl_craftguide.register_craft({ - type = "centrifuge", - width = 1, - output = table.concat({data[2], data[3], data[4]}, " "), - items = {data[1]}, - }) -end - --- Register Compressor Recipes -for _, data in pairs(compressor_recipes) do - mcl_craftguide.register_craft({ - type = "compressor", - width = 1, - output = data[2], - items = {data[1]}, - }) -end - --- Register Extractor Recipes -for _, data in ipairs(extractor_recipes) do - mcl_craftguide.register_craft({ - type = "extractor", - width = 1, - output = data[2], - items = {data[1]}, - }) -end - --- Register Freezer Recipes -for _, data in pairs(freezer_recipes) do - local output_string - if type(data[2]) == "table" then - output_string = table.concat(data[2], ", ") - else - output_string = data[2] - end - - mcl_craftguide.register_craft({ - type = "freezer", - width = 1, - output = output_string, - items = {data[1]}, - }) -end - - --- Register Grinder Recipes -for _, data in pairs(grinder_recipes) do - mcl_craftguide.register_craft({ - type = "grinder", - width = 1, - output = data[2], - items = {data[1]}, - }) -end - diff --git a/technic/mcl_support.lua b/technic/mcl_support.lua deleted file mode 100644 index 274176e..0000000 --- a/technic/mcl_support.lua +++ /dev/null @@ -1,110 +0,0 @@ -local default = minetest.get_modpath("default") and default or {} -local mcl = minetest.get_modpath("mcl_core") - --- Compatibility table -technic.compat = {} - --- Helper function to set compatibility variables -local function set_compat(mcl_value, default_value) - return mcl and mcl_value or default_value -end - --- Mineclone2 Support -technic.compat.stone_sounds = mcl and mcl_sounds.node_sound_stone_defaults() or default.node_sound_stone_defaults() -technic.compat.mt_light_max = mcl and mcl_core.LIGHT_MAX or default.LIGHT_MAX -technic.compat.copper_ingredient = mcl and "mcl_copper:copper_ingot" or 'default:copper_ingot' -technic.compat.iron_ingredient = mcl and "mcl_core:iron_ingot" or 'default:steel_ingot' -technic.compat.iron_lump_ingredient = mcl and "mcl_raw_ores:raw_iron" or 'default:iron_lump' -technic.compat.gold_lump_ingredient = mcl and "mcl_raw_ores:raw_gold" or 'default:gold_lump' -technic.compat.copper_lump_ingredient = mcl and "mcl_copper:raw_copper" or 'default:copper_lump' -technic.compat.mese_crystal_ingredient = mcl and "mesecons:wire_00000000_off" or 'default:mese_crystal' -technic.compat.diamond_ingredient = mcl and "mcl_core:diamond" or 'default:diamond' -technic.compat.glass_ingredient = mcl and "mcl_core:glass" or 'default:glass' -technic.compat.brick_block_ingredient = mcl and "mcl_core:brick_block" or 'default:brick' -technic.compat.mese_block_ingredient = mcl and "mesecons_torch:redstoneblock" or "default:mese" -technic.compat.paper_ingredient = mcl and "mcl_core:paper" or 'default:paper' -technic.compat.obsidian_glass_ingredient = mcl and "mcl_core:obsidian" or 'default:obsidian_glass' -technic.compat.obsidian_ingredient = mcl and "mcl_core:obsidian" or 'default:obsidian' -technic.compat.green_dye_ingredient = mcl and "mcl_dye:green" or 'dye:green' -technic.compat.blue_dye_ingredient = mcl and "mcl_dye:blue" or 'dye:blue' -technic.compat.red_dye_ingredient = mcl and "mcl_dye:red" or 'dye:red' -technic.compat.white_dye_ingredient = mcl and "mcl_dye:white" or 'dye:white' -technic.compat.gold_ingot_ingredient = mcl and "mcl_core:gold_ingot" or 'default:gold_ingot' -technic.compat.chest_ingredient = mcl and "mcl_chests:chest" or "default:chest" -technic.compat.stone_ingredient = mcl and "mcl_core:stone" or "default:stone" -technic.compat.wood_fence_ingredient = mcl and "group:fence_wood" or "default:fence_wood" -technic.compat.diamond_ingredient = mcl and "mcl_core:diamond" or "default:diamond" -technic.compat.bronze_ingredient = mcl and "mcl_copper:copper_ingot" or 'default:bronze_ingot' -technic.compat.tin_ingredient = mcl and "moreores:tin_ingot" or 'default:tin_ingot' -technic.compat.sandstone_ingredient = mcl and "mcl_core:sandstone" or 'default:desert_stone' -technic.compat.sand_ingredient = mcl and "mcl_core:sand" or 'default:sand' -technic.compat.gravel_ingredient = mcl and "mcl_core:gravel" or 'default:gravel' -technic.compat.desert_stone_ingredient = mcl and "mcl_core:redsandstone" or 'default:desert_stone' -technic.compat.desert_sand_ingredient = mcl and "mcl_core:redsand" or 'default:desert_sand' -technic.compat.furnace_ingredient = mcl and "mcl_furnaces:furnace" or 'default:furnace' -technic.compat.mossy_cobble_ingredient = mcl and "mcl_core:mossycobble" or 'default:mossycobble' -technic.compat.cobble_ingredient = mcl and "mcl_core:cobble" or 'default:cobble' -technic.compat.snow_block_ingredient = mcl and "mcl_core:snowblock" or 'default:snowblock' -technic.compat.ice_block_ingredient = mcl and "mcl_core:ice" or 'default:ice' -technic.compat.granite_ingredient = mcl and "mcl_core:granite" or 'technic:granite' -technic.compat.granite_bricks_ingredient = mcl and "mcl_core:granite_smooth" or 'technic:granite_bricks' -technic.compat.coal_ingredient = mcl and "group:coal" or "default:coal_lump" -technic.compat.dirt_ingredient = mcl and "mcl_core:dirt" or "default:dirt" -technic.compat.mesecons_fiber_ingredient = mcl and "mesecons:wire_00000000_off" or "mesecons_materials:fiber" -technic.compat.stick_ingredient = mcl and "mcl_core:stick" or "default:stick" -technic.compat.emtpy_bucket_ingredient = mcl and "mcl_buckets:bucket_empty" or "bucket:bucket_empty" -technic.compat.water_bucket_ingredient = mcl and "mcl_buckets:bucket_water" or "bucket:bucket_water" - --- Ingredient Variables -if mcl then - technic.compat.blueberries_ingredient = "mcl_farming:blueberries" - technic.compat.grass_ingredient = "mcl_core:grass" - technic.compat.dry_shrub_ingredient = "mcl_core:deadbush" - technic.compat.junglegrass_ingredient = "mcl_core:tallgrass" - technic.compat.cactus_ingredient = "mcl_core:cactus" - technic.compat.geranium_ingredient = "mcl_flowers:blue_orchid" - technic.compat.dandelion_white_ingredient = "mcl_flowers:oxeye_daisy" - technic.compat.dandelion_yellow_ingredient = "mcl_flowers:dandelion" - technic.compat.tulip_ingredient = "mcl_flowers:orange_tulip" - technic.compat.rose_ingredient = "mcl_flowers:poppy" - technic.compat.viola_ingredient = "mcl_flowers:allium" -else - technic.compat.blueberries_ingredient = "default:blueberries" - technic.compat.grass_ingredient = "default:grass_1" - technic.compat.dry_shrub_ingredient = "default:dry_shrub" - technic.compat.junglegrass_ingredient = "default:junglegrass" - technic.compat.cactus_ingredient = "default:cactus" - technic.compat.geranium_ingredient = "flowers:geranium" - technic.compat.dandelion_white_ingredient = "flowers:dandelion_white" - technic.compat.dandelion_yellow_ingredient = "flowers:dandelion_yellow" - technic.compat.tulip_ingredient = "flowers:tulip" - technic.compat.rose_ingredient = "flowers:rose" - technic.compat.viola_ingredient = "flowers:viola" -end - --- Dye Output Variables -if mcl then - technic.compat.dye_black = "mcl_dye:black" - technic.compat.dye_violet = "mcl_dye:violet" - technic.compat.dye_green = "mcl_dye:green" - technic.compat.dye_brown = "mcl_dye:brown" - technic.compat.dye_blue = "mcl_dye:blue" - technic.compat.dye_white = "mcl_dye:white" - technic.compat.dye_yellow = "mcl_dye:yellow" - technic.compat.dye_orange = "mcl_dye:orange" - technic.compat.dye_red = "mcl_dye:red" -else - technic.compat.dye_black = "dye:black" - technic.compat.dye_violet = "dye:violet" - technic.compat.dye_green = "dye:green" - technic.compat.dye_brown = "dye:brown" - technic.compat.dye_blue = "dye:blue" - technic.compat.dye_white = "dye:white" - technic.compat.dye_yellow = "dye:yellow" - technic.compat.dye_orange = "dye:orange" - technic.compat.dye_red = "dye:red" -end - -technic.compat.dirt_with_snow_ingredient = mcl and "mcl_core:dirt_with_grass_snow" or "default:dirt_with_snow" -technic.compat.bucket_lava_ingredient = mcl and "mcl_buckets:bucket_lava" or "bucket:bucket_lava" -technic.compat.bucket_river_water_ingredient = mcl and "mcl_buckets:bucket_river_water" or "bucket:bucket_river_water" diff --git a/technic/mod.conf b/technic/mod.conf index 448cf74..70c92cb 100644 --- a/technic/mod.conf +++ b/technic/mod.conf @@ -1,4 +1,4 @@ name = technic -depends = pipeworks, technic_worldgen, basic_materials +depends = pipeworks, technic_worldgen, basic_materials, technic_compat optional_depends = bucket, default, screwdriver, mesecons,mesecons_torch, mesecons_mvps, digilines, digiline_remote, intllib, unified_inventory, vector_extras, dye, craftguide,i3, mcl_core, mcl_craftguide supported_games = minetest_game,mineclone2,mineclonia,mineclone5 \ No newline at end of file diff --git a/technic/radiation.lua b/technic/radiation.lua index 814be14..bd19570 100644 --- a/technic/radiation.lua +++ b/technic/radiation.lua @@ -52,7 +52,7 @@ local rad_resistance_node = { ["default:ice"] = 5.6, ["default:lava_flowing"] = 8.5, ["default:lava_source"] = 17, - [technic.compat.mese_block_ingredient] = 21, + [technic_compat.mese_block_ingredient] = 21, ["default:mossycobble"] = 15, ["default:tinblock"] = 37, ["pbj_pup:pbj_pup"] = 10000, @@ -64,7 +64,7 @@ local rad_resistance_node = { ["nyancat:nyancat"] = 10000, ["nyancat:nyancat_rainbow"] = 10000, ["default:obsidian"] = 18, - [technic.compat.obsidian_glass_ingredient] = 18, + [technic_compat.obsidian_glass_ingredient] = 18, ["default:sand"] = 10, ["default:sandstone"] = 15, ["default:sandstonebrick"] = 15, @@ -153,7 +153,7 @@ local rad_resistance_node = { ["technic:chromium_block"] = 37, ["technic:corium_flowing"] = 40, ["technic:corium_source"] = 80, - [technic.compat.granite_ingredient] = 18, + [technic_compat.granite_ingredient] = 18, ["technic:lead_block"] = 80, ["technic:marble"] = 18, ["technic:marble_bricks"] = 18, @@ -457,7 +457,7 @@ minetest.register_node("technic:chernobylite_block", { tiles = {"technic_chernobylite_block.png"}, is_ground_content = true, groups = {cracky=1, radioactive=4, level=2}, - sounds = technic.compat.stone_sounds, + sounds = technic_compat.stone_sounds, light_source = 2, }) diff --git a/technic/tools/cans.lua b/technic/tools/cans.lua index ef7f029..caeaebc 100644 --- a/technic/tools/cans.lua +++ b/technic/tools/cans.lua @@ -135,7 +135,7 @@ minetest.register_craft({ output = 'technic:river_water_can 1', recipe = { {'technic:zinc_ingot', 'technic:rubber', 'technic:zinc_ingot'}, - {technic.compat.iron_ingredient, '', technic.compat.iron_ingredient}, - {'technic:zinc_ingot', technic.compat.iron_ingredient, 'technic:zinc_ingot'}, + {technic_compat.iron_ingredient, '', technic_compat.iron_ingredient}, + {'technic:zinc_ingot', technic_compat.iron_ingredient, 'technic:zinc_ingot'}, } }) diff --git a/technic/tools/mining_drill.lua b/technic/tools/mining_drill.lua index e102e8f..f0543d1 100644 --- a/technic/tools/mining_drill.lua +++ b/technic/tools/mining_drill.lua @@ -6,9 +6,9 @@ local S = technic.getter minetest.register_craft({ output = 'technic:mining_drill', recipe = { - {technic.compat.tin_ingredient, 'technic:diamond_drill_head', technic.compat.tin_ingredient}, + {technic_compat.tin_ingredient, 'technic:diamond_drill_head', technic_compat.tin_ingredient}, {'technic:stainless_steel_ingot', 'basic_materials:motor', 'technic:stainless_steel_ingot'}, - {'', 'technic:red_energy_crystal', technic.compat.copper_ingredient}, + {'', 'technic:red_energy_crystal', technic_compat.copper_ingredient}, } }) minetest.register_craft({ diff --git a/technic/tools/mining_lasers.lua b/technic/tools/mining_lasers.lua index 596c8b6..3e38b4c 100644 --- a/technic/tools/mining_lasers.lua +++ b/technic/tools/mining_lasers.lua @@ -11,25 +11,25 @@ local S = technic.getter minetest.register_craft({ output = "technic:laser_mk1", recipe = { - {technic.compat.diamond_ingredient, "basic_materials:brass_ingot", technic.compat.obsidian_glass_ingredient}, + {technic_compat.diamond_ingredient, "basic_materials:brass_ingot", technic_compat.obsidian_glass_ingredient}, {"","basic_materials:brass_ingot", "technic:red_energy_crystal"}, - {"", "", technic.compat.copper_ingredient}, + {"", "", technic_compat.copper_ingredient}, } }) minetest.register_craft({ output = "technic:laser_mk2", recipe = { - {technic.compat.diamond_ingredient, "technic:carbon_steel_ingot", "technic:laser_mk1"}, + {technic_compat.diamond_ingredient, "technic:carbon_steel_ingot", "technic:laser_mk1"}, {"", "technic:carbon_steel_ingot", "technic:green_energy_crystal"}, - {"", "", technic.compat.copper_ingredient}, + {"", "", technic_compat.copper_ingredient}, } }) minetest.register_craft({ output = "technic:laser_mk3", recipe = { - {technic.compat.diamond_ingredient, "technic:carbon_steel_ingot", "technic:laser_mk2"}, + {technic_compat.diamond_ingredient, "technic:carbon_steel_ingot", "technic:laser_mk2"}, {"", "technic:carbon_steel_ingot", "technic:blue_energy_crystal"}, - {"", "", technic.compat.copper_ingredient}, + {"", "", technic_compat.copper_ingredient}, } }) diff --git a/technic/tools/sonic_screwdriver.lua b/technic/tools/sonic_screwdriver.lua index 024f78a..31d1d5c 100644 --- a/technic/tools/sonic_screwdriver.lua +++ b/technic/tools/sonic_screwdriver.lua @@ -90,9 +90,9 @@ minetest.register_tool("technic:sonic_screwdriver", { minetest.register_craft({ output = "technic:sonic_screwdriver", recipe = { - {"", technic.compat.diamond_ingredient, ""}, - {technic.compat.mesecons_fiber_ingredient, "technic:battery", technic.compat.mesecons_fiber_ingredient}, - {technic.compat.mesecons_fiber_ingredient, "moreores:mithril_ingot", technic.compat.mesecons_fiber_ingredient} + {"", technic_compat.diamond_ingredient, ""}, + {technic_compat.mesecons_fiber_ingredient, "technic:battery", technic_compat.mesecons_fiber_ingredient}, + {technic_compat.mesecons_fiber_ingredient, "moreores:mithril_ingot", technic_compat.mesecons_fiber_ingredient} } }) diff --git a/technic/tools/tree_tap.lua b/technic/tools/tree_tap.lua index 82e7872..d36190a 100644 --- a/technic/tools/tree_tap.lua +++ b/technic/tools/tree_tap.lua @@ -38,8 +38,8 @@ minetest.register_tool("technic:treetap", { minetest.register_craft({ output = "technic:treetap", recipe = { - {"pipeworks:tube_1", "group:wood", technic.compat.stick_ingredient}, - {"", technic.compat.stick_ingredient, technic.compat.stick_ingredient} + {"pipeworks:tube_1", "group:wood", technic_compat.stick_ingredient}, + {"", technic_compat.stick_ingredient, technic_compat.stick_ingredient} }, }) diff --git a/technic_chests/mod.conf b/technic_chests/mod.conf index 626a825..95a5877 100644 --- a/technic_chests/mod.conf +++ b/technic_chests/mod.conf @@ -1,4 +1,4 @@ name = technic_chests -depends = basic_materials +depends = basic_materials, technic_compat optional_depends = moreblocks, moreores, pipeworks, intllib, tubelib, default, mcl_core supported_games = minetest_game,mineclone2,mineclonia,mineclone5 \ No newline at end of file diff --git a/technic_cnc/mod.conf b/technic_cnc/mod.conf index b58bf3d..770d2ae 100644 --- a/technic_cnc/mod.conf +++ b/technic_cnc/mod.conf @@ -1,4 +1,4 @@ name = technic_cnc -depends = basic_materials +depends = basic_materials, technic_compat optional_depends = technic, default, mcl_core supported_games = minetest_game,mineclone2,mineclonia,mineclone5 \ No newline at end of file diff --git a/technic_compat/init.lua b/technic_compat/init.lua new file mode 100644 index 0000000..75122f3 --- /dev/null +++ b/technic_compat/init.lua @@ -0,0 +1,16 @@ +local modpath = minetest.get_modpath("technic_compat") + +-- Compatibility table +technic_compat = {} + +technic_compat.mcl = minetest.get_modpath("mcl_core") +technic_compat.default = minetest.get_modpath("default") and default or {} + +local mcl_path = modpath .. "/mcl/" + +-- Load files +dofile(mcl_path .. "sounds.lua") +dofile(mcl_path .. "textures.lua") +dofile(mcl_path .. "miscellaneous.lua") +dofile(mcl_path .. "crafting.lua") +dofile(mcl_path .. "craftguide.lua") diff --git a/technic_compat/mcl/craftguide.lua b/technic_compat/mcl/craftguide.lua new file mode 100644 index 0000000..9e64ed9 --- /dev/null +++ b/technic_compat/mcl/craftguide.lua @@ -0,0 +1,189 @@ +-- Register craft types for each machine +if technic_compat.mcl then + mcl_craftguide.register_craft_type("centrifuge", { + description = "Centrifuge", + icon = "technic_mv_centrifuge_front_active.png", + }) + + mcl_craftguide.register_craft_type("compressor", { + description = "Compressor", + icon = "technic_lv_compressor_front_active.png", + }) + + mcl_craftguide.register_craft_type("extractor", { + description = "Extractor", + icon = "technic_lv_extractor_front_active.png", + }) + + mcl_craftguide.register_craft_type("freezer", { + description = "Freezer", + icon = "technic_mv_freezer_front_active.png", + }) + + mcl_craftguide.register_craft_type("grinder", { + description = "Grinder", + icon = "technic_lv_grinder_front_active.png", + }) + + mcl_craftguide.register_craft_type("alloy_furnace", { + description = "Alloy Furnace", + icon = "technic_coal_alloy_furnace_front_active.png", + }) + + + centrifuge_recipes = { + { "technic:bronze_dust 8", "technic:copper_dust 7", "technic:tin_dust" }, + { "technic:stainless_steel_dust 5", "technic:wrought_iron_dust 4", "technic:chromium_dust" }, + { "technic:brass_dust 3", "technic:copper_dust 2", "technic:zinc_dust" }, + { "technic:chernobylite_dust", technic_compat.sand_ingredient, "technic:uranium3_dust" }, + { technic_compat.dirt_ingredient.." 4", technic_compat.sand_ingredient, technic_compat.gravel_ingredient, "default:clay_lump 2" }, + } + + compressor_recipes = { + {technic_compat.snow_block_ingredient, technic_compat.ice_block_ingredient}, + {technic_compat.sand_ingredient.." 2", technic_compat.sandstone_ingredient}, + {technic_compat.desert_sand_ingredient.." 2", technic_compat.desert_stone_ingredient}, + {technic_compat.desert_sand_ingredient, technic_compat.desert_stone_ingredient}, + {"technic:mixed_metal_ingot", "technic:composite_plate"}, + {technic_compat.copper_ingredient.." 5", "technic:copper_plate"}, + {"technic:coal_dust 4", "technic:graphite"}, + {"technic:carbon_cloth", "technic:carbon_plate"}, + {"technic:uranium35_ingot 5", "technic:uranium_fuel"}, + } + + extractor_recipes = { + {"technic:coal_dust", technic_compat.dye_black .. " 2"}, + {technic_compat.blueberries_ingredient, technic_compat.dye_violet .. " 2"}, + {technic_compat.grass_ingredient, technic_compat.dye_green .. " 1"}, + {technic_compat.dry_shrub_ingredient, technic_compat.dye_brown .. " 1"}, + {technic_compat.junglegrass_ingredient, technic_compat.dye_green .. " 2"}, + {technic_compat.cactus_ingredient, technic_compat.dye_green .. " 4"}, + {technic_compat.geranium_ingredient, technic_compat.dye_blue .. " 4"}, + {technic_compat.dandelion_white_ingredient, technic_compat.dye_white .. " 4"}, + {technic_compat.dandelion_yellow_ingredient, technic_compat.dye_yellow .. " 4"}, + {technic_compat.tulip_ingredient, technic_compat.dye_orange .. " 4"}, + {technic_compat.rose_ingredient, technic_compat.dye_red .. " 4"}, + {technic_compat.viola_ingredient, technic_compat.dye_violet .. " 4"}, + {technic_compat.blackberry_ingredient, unifieddyes and "unifieddyes:magenta_s50 4" or technic_compat.dye_violet .. " 4"}, + {technic_compat.blueberry_ingredient, unifieddyes and "unifieddyes:magenta_s50 4" or ""}, + } + + freezer_recipes = { + {technic_compat.water_bucket_ingredient, { technic_compat.ice_block_ingredient, technic_compat.emtpy_bucket_ingredient } }, + {technic_compat.bucket_river_water_ingredient, { technic_compat.ice_block_ingredient, technic_compat.emtpy_bucket_ingredient } }, + {technic_compat.dirt_ingredient , technic_compat.dirt_with_snow_ingredient }, + {technic_compat.bucket_lava_ingredient, { technic_compat.obsidian_ingredient, technic_compat.emtpy_bucket_ingredient } } + } + + grinder_recipes = { + -- Dusts + {technic_compat.coal_ingredient, "technic:coal_dust 2"}, + {technic_compat.copper_lump_ingredient, "technic:copper_dust 2"}, + {technic_compat.desert_stone_ingredient, technic_compat.desert_sand_ingredient}, + {technic_compat.gold_lump_ingredient, "technic:gold_dust 2"}, + {technic_compat.iron_lump_ingredient, "technic:wrought_iron_dust 2"}, + {"moreores:tin_lump", "technic:tin_dust 2"}, + {"technic:chromium_lump", "technic:chromium_dust 2"}, + {"technic:uranium_lump", "technic:uranium_dust 2"}, + {"technic:zinc_lump", "technic:zinc_dust 2"}, + {"technic:lead_lump", "technic:lead_dust 2"}, + {"technic:sulfur_lump", "technic:sulfur_dust 2"}, + {technic_compat.stone_ingredient, "technic:stone_dust"}, + {technic_compat.sand_ingredient, "technic:stone_dust"}, + {technic_compat.desert_sand_ingredient, "technic:stone_dust"}, + + -- Other + {technic_compat.cobble_ingredient, technic_compat.gravel_ingredient}, + {technic_compat.gravel_ingredient, technic_compat.sand_ingredient}, + {technic_compat.sandstone_ingredient, technic_compat.sand_ingredient.." 2"}, -- reverse recipe can be found in the compressor + {technic_compat.desert_stone_ingredient, technic_compat.desert_sand_ingredient.." 2"}, -- reverse recipe can be found in the compressor + {technic_compat.ice_block_ingredient, technic_compat.snow_block_ingredient}, + } + + alloy_recipes = { + {"technic:copper_dust 7", "technic:tin_dust", "technic:bronze_dust 8", 12}, + {technic_compat.copper_ingredient.." 7", technic_compat.tin_ingredient, technic_compat.bronze_ingredient.." 8", 12}, + {"technic:wrought_iron_dust 2", "technic:coal_dust", "technic:carbon_steel_dust 2", 6}, + {"technic:wrought_iron_ingot 2", "technic:coal_dust", "technic:carbon_steel_ingot 2", 6}, + {"technic:carbon_steel_dust 2", "technic:coal_dust", "technic:cast_iron_dust 2", 6}, + {"technic:carbon_steel_ingot 2", "technic:coal_dust", "technic:cast_iron_ingot 2", 6}, + {"technic:carbon_steel_dust 4", "technic:chromium_dust", "technic:stainless_steel_dust 5", 7.5}, + {"technic:carbon_steel_ingot 4", "technic:chromium_ingot", "technic:stainless_steel_ingot 5", 7.5}, + {"technic:copper_dust 2", "technic:zinc_dust", "technic:brass_dust 3"}, + {technic_compat.copper_ingredient.." 2", "technic:zinc_ingot", "basic_materials:brass_ingot 3"}, + {technic_compat.sand_ingredient.." 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 + -- The highest volume use of carbon black is as a reinforcing filler in rubber products, especially tires. + -- "[Compounding a] pure gum vulcanizate … with 50% of its weight of carbon black improves its tensile strength and wear resistance …" + {"technic:raw_latex 4", "technic:coal_dust 2", "technic:rubber 6", 2}, + {technic_compat.ice_block_ingredient, technic_compat.emtpy_bucket_ingredient, technic_compat.water_bucket_ingredient, 1 }, + } + + for _, data in pairs(alloy_recipes) do + mcl_craftguide.register_craft({ + type = "alloy_furnace", + width = 1, + output = data[3], + items = {data[1], data[2]}, + }) + end + + -- Register Centrifuge Recipes + for _, data in pairs(centrifuge_recipes) do + mcl_craftguide.register_craft({ + type = "centrifuge", + width = 1, + output = table.concat({data[2], data[3], data[4]}, " "), + items = {data[1]}, + }) + end + + -- Register Compressor Recipes + for _, data in pairs(compressor_recipes) do + mcl_craftguide.register_craft({ + type = "compressor", + width = 1, + output = data[2], + items = {data[1]}, + }) + end + + -- Register Extractor Recipes + for _, data in ipairs(extractor_recipes) do + mcl_craftguide.register_craft({ + type = "extractor", + width = 1, + output = data[2], + items = {data[1]}, + }) + end + + -- Register Freezer Recipes + for _, data in pairs(freezer_recipes) do + local output_string + if type(data[2]) == "table" then + output_string = table.concat(data[2], ", ") + else + output_string = data[2] + end + + mcl_craftguide.register_craft({ + type = "freezer", + width = 1, + output = output_string, + items = {data[1]}, + }) + end + + + -- Register Grinder Recipes + for _, data in pairs(grinder_recipes) do + mcl_craftguide.register_craft({ + type = "grinder", + width = 1, + output = data[2], + items = {data[1]}, + }) + end +end \ No newline at end of file diff --git a/technic_compat/mcl/crafting.lua b/technic_compat/mcl/crafting.lua new file mode 100644 index 0000000..6b34d3e --- /dev/null +++ b/technic_compat/mcl/crafting.lua @@ -0,0 +1,102 @@ +-- Helper function to set compatibility variables +local function set_compat(mcl_value, default_value) + return technic_compat.mcl and mcl_value or default_value +end + +-- Mineclone2 Support +technic_compat.copper_ingredient = technic_compat.mcl and "mcl_copper:copper_ingot" or 'default:copper_ingot' +technic_compat.iron_ingredient = technic_compat.mcl and "mcl_core:iron_ingot" or 'default:steel_ingot' +technic_compat.iron_lump_ingredient = technic_compat.mcl and "mcl_raw_ores:raw_iron" or 'default:iron_lump' +technic_compat.gold_lump_ingredient = technic_compat.mcl and "mcl_raw_ores:raw_gold" or 'default:gold_lump' +technic_compat.copper_lump_ingredient = technic_compat.mcl and "mcl_copper:raw_copper" or 'default:copper_lump' +technic_compat.mese_crystal_ingredient = technic_compat.mcl and "mesecons:wire_00000000_off" or 'default:mese_crystal' +technic_compat.diamond_ingredient = technic_compat.mcl and "mcl_core:diamond" or 'default:diamond' +technic_compat.glass_ingredient = technic_compat.mcl and "mcl_core:glass" or 'default:glass' +technic_compat.brick_block_ingredient = technic_compat.mcl and "mcl_core:brick_block" or 'default:brick' +technic_compat.mese_block_ingredient = technic_compat.mcl and "mesecons_torch:redstoneblock" or "default:mese" +technic_compat.paper_ingredient = technic_compat.mcl and "mcl_core:paper" or 'default:paper' +technic_compat.obsidian_glass_ingredient = technic_compat.mcl and "mcl_core:obsidian" or 'default:obsidian_glass' +technic_compat.obsidian_ingredient = technic_compat.mcl and "mcl_core:obsidian" or 'default:obsidian' +technic_compat.green_dye_ingredient = technic_compat.mcl and "mcl_dye:green" or 'dye:green' +technic_compat.blue_dye_ingredient = technic_compat.mcl and "mcl_dye:blue" or 'dye:blue' +technic_compat.red_dye_ingredient = technic_compat.mcl and "mcl_dye:red" or 'dye:red' +technic_compat.white_dye_ingredient = technic_compat.mcl and "mcl_dye:white" or 'dye:white' +technic_compat.gold_ingot_ingredient = technic_compat.mcl and "mcl_core:gold_ingot" or 'default:gold_ingot' +technic_compat.chest_ingredient = technic_compat.mcl and "mcl_chests:chest" or "default:chest" +technic_compat.stone_ingredient = technic_compat.mcl and "mcl_core:stone" or "default:stone" +technic_compat.wood_fence_ingredient = technic_compat.mcl and "group:fence_wood" or "default:fence_wood" +technic_compat.diamond_ingredient = technic_compat.mcl and "mcl_core:diamond" or "default:diamond" +technic_compat.bronze_ingredient = technic_compat.mcl and "mcl_copper:copper_ingot" or 'default:bronze_ingot' +technic_compat.tin_ingredient = technic_compat.mcl and "moreores:tin_ingot" or 'default:tin_ingot' +technic_compat.sandstone_ingredient = technic_compat.mcl and "mcl_core:sandstone" or 'default:desert_stone' +technic_compat.sand_ingredient = technic_compat.mcl and "mcl_core:sand" or 'default:sand' +technic_compat.gravel_ingredient = technic_compat.mcl and "mcl_core:gravel" or 'default:gravel' +technic_compat.desert_stone_ingredient = technic_compat.mcl and "mcl_core:redsandstone" or 'default:desert_stone' +technic_compat.desert_sand_ingredient = technic_compat.mcl and "mcl_core:redsand" or 'default:desert_sand' +technic_compat.furnace_ingredient = technic_compat.mcl and "mcl_furnaces:furnace" or 'default:furnace' +technic_compat.mossy_cobble_ingredient = technic_compat.mcl and "mcl_core:mossycobble" or 'default:mossycobble' +technic_compat.cobble_ingredient = technic_compat.mcl and "mcl_core:cobble" or 'default:cobble' +technic_compat.snow_block_ingredient = technic_compat.mcl and "mcl_core:snowblock" or 'default:snowblock' +technic_compat.ice_block_ingredient = technic_compat.mcl and "mcl_core:ice" or 'default:ice' +technic_compat.granite_ingredient = technic_compat.mcl and "mcl_core:granite" or 'technic:granite' +technic_compat.granite_bricks_ingredient = technic_compat.mcl and "mcl_core:granite_smooth" or 'technic:granite_bricks' +technic_compat.coal_ingredient = technic_compat.mcl and "group:coal" or "default:coal_lump" +technic_compat.dirt_ingredient = technic_compat.mcl and "mcl_core:dirt" or "default:dirt" +technic_compat.mesecons_fiber_ingredient = technic_compat.mcl and "mesecons:wire_00000000_off" or "mesecons_materials:fiber" +technic_compat.stick_ingredient = technic_compat.mcl and "mcl_core:stick" or "default:stick" +technic_compat.emtpy_bucket_ingredient = technic_compat.mcl and "mcl_buckets:bucket_empty" or "bucket:bucket_empty" +technic_compat.water_bucket_ingredient = technic_compat.mcl and "mcl_buckets:bucket_water" or "bucket:bucket_water" + +-- Ingredient Variables +if technic_compat.mcl then + technic_compat.blueberries_ingredient = "mcl_farming:blueberries" + technic_compat.grass_ingredient = "mcl_core:grass" + technic_compat.dry_shrub_ingredient = "mcl_core:deadbush" + technic_compat.junglegrass_ingredient = "mcl_core:tallgrass" + technic_compat.cactus_ingredient = "mcl_core:cactus" + technic_compat.geranium_ingredient = "mcl_flowers:blue_orchid" + technic_compat.dandelion_white_ingredient = "mcl_flowers:oxeye_daisy" + technic_compat.dandelion_yellow_ingredient = "mcl_flowers:dandelion" + technic_compat.tulip_ingredient = "mcl_flowers:orange_tulip" + technic_compat.rose_ingredient = "mcl_flowers:poppy" + technic_compat.viola_ingredient = "mcl_flowers:allium" +else + technic_compat.blueberries_ingredient = "default:blueberries" + technic_compat.grass_ingredient = "default:grass_1" + technic_compat.dry_shrub_ingredient = "default:dry_shrub" + technic_compat.junglegrass_ingredient = "default:junglegrass" + technic_compat.cactus_ingredient = "default:cactus" + technic_compat.geranium_ingredient = "flowers:geranium" + technic_compat.dandelion_white_ingredient = "flowers:dandelion_white" + technic_compat.dandelion_yellow_ingredient = "flowers:dandelion_yellow" + technic_compat.tulip_ingredient = "flowers:tulip" + technic_compat.rose_ingredient = "flowers:rose" + technic_compat.viola_ingredient = "flowers:viola" +end + +-- Dye Output Variables +if technic_compat.mcl then + technic_compat.dye_black = "mcl_dye:black" + technic_compat.dye_violet = "mcl_dye:violet" + technic_compat.dye_green = "mcl_dye:green" + technic_compat.dye_brown = "mcl_dye:brown" + technic_compat.dye_blue = "mcl_dye:blue" + technic_compat.dye_white = "mcl_dye:white" + technic_compat.dye_yellow = "mcl_dye:yellow" + technic_compat.dye_orange = "mcl_dye:orange" + technic_compat.dye_red = "mcl_dye:red" +else + technic_compat.dye_black = "dye:black" + technic_compat.dye_violet = "dye:violet" + technic_compat.dye_green = "dye:green" + technic_compat.dye_brown = "dye:brown" + technic_compat.dye_blue = "dye:blue" + technic_compat.dye_white = "dye:white" + technic_compat.dye_yellow = "dye:yellow" + technic_compat.dye_orange = "dye:orange" + technic_compat.dye_red = "dye:red" +end + +technic_compat.dirt_with_snow_ingredient = technic_compat.mcl and "mcl_core:dirt_with_grass_snow" or "default:dirt_with_snow" +technic_compat.bucket_lava_ingredient = technic_compat.mcl and "mcl_buckets:bucket_lava" or "bucket:bucket_lava" +technic_compat.bucket_river_water_ingredient = technic_compat.mcl and "mcl_buckets:bucket_river_water" or "bucket:bucket_river_water" diff --git a/technic_compat/mcl/miscellaneous.lua b/technic_compat/mcl/miscellaneous.lua new file mode 100644 index 0000000..d794a29 --- /dev/null +++ b/technic_compat/mcl/miscellaneous.lua @@ -0,0 +1 @@ +technic_compat.mt_light_max = technic_compat.mcl and mcl_core.LIGHT_MAX or (default and default.LIGHT_MAX) diff --git a/technic_compat/mcl/sounds.lua b/technic_compat/mcl/sounds.lua new file mode 100644 index 0000000..afa31db --- /dev/null +++ b/technic_compat/mcl/sounds.lua @@ -0,0 +1 @@ +technic_compat.stone_sounds = technic_compat.mcl and mcl_sounds.node_sound_stone_defaults() or default.node_sound_stone_defaults() \ No newline at end of file diff --git a/technic_compat/mcl/textures.lua b/technic_compat/mcl/textures.lua new file mode 100644 index 0000000..87055a4 --- /dev/null +++ b/technic_compat/mcl/textures.lua @@ -0,0 +1,10 @@ +local dirt_texture = technic_compat.mcl and "default_dirt.png" or "default_dirt.png" +local grass_texture = technic_compat.mcl and "mcl_core_palette_grass.png" or "default_grass.png" +local wood_texture = technic_compat.mcl and "default_wood.png" or "default_wood.png" +local stone_texture = technic_compat.mcl and "default_stone.png" or "default_stone.png" +local cobble_texture = technic_compat.mcl and "default_cobble.png" or "default_cobble.png" +local brick_texture = technic_compat.mcl and "default_brick.png" or "default_brick.png" +local sandstone_texture = technic_compat.mcl and "mcl_core_sandstone_top.png" or "default_sandstone.png" +local leaves_texture = technic_compat.mcl and "default_leaves.png" or "default_leaves.png" +local tree_texture = technic_compat.mcl and "default_tree.png" or "default_tree.png" +local bronzeblock_texture = technic_compat.mcl and "mcl_core_bronze_block.png" or "default_bronze_block.png" \ No newline at end of file diff --git a/technic_compat/mod.conf b/technic_compat/mod.conf new file mode 100644 index 0000000..ee252ab --- /dev/null +++ b/technic_compat/mod.conf @@ -0,0 +1,4 @@ +name = technic_compat +description = Makes Technic compatible with other games and mods +optional_depends = mcl_core, mcl_sounds, default, mcl_craftguide +supported_games = minetest_game,mineclone2,mineclonia,mineclone5 \ No newline at end of file diff --git a/technic_worldgen/mod.conf b/technic_worldgen/mod.conf index 94fb64d..833980b 100644 --- a/technic_worldgen/mod.conf +++ b/technic_worldgen/mod.conf @@ -1,4 +1,4 @@ name = technic_worldgen -depends = basic_materials +depends = basic_materials, technic_compat optional_depends = intllib, mg, doors, farming, glooptest, mesecons_doors, vessels, default, mcl_core, mcl_sounds supported_games = minetest_game,mineclone2,mineclonia,mineclone5