diff --git a/.luacheckrc b/.luacheckrc index 49fd267d..74ec5b9a 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -30,7 +30,7 @@ read_globals = { "craftguide", "i3", "mtt", "vizlib", "mcl_sounds", "mcl_vars", "mcl_worlds", "mcl_buckets", "mcl_formspec", - "mcl_craftguide", + "mcl_craftguide", "xcompat", -- Only used in technic/machines/MV/lighting.lua (disabled) "isprotect", "homedecor_expect_infinite_stacks", diff --git a/technic/crafts.lua b/technic/crafts.lua index e49ec7b4..74e8e2f0 100644 --- a/technic/crafts.lua +++ b/technic/crafts.lua @@ -1,6 +1,6 @@ -- check if we have the necessary dependencies to allow actually using these materials in the crafts -local mat = technic.materials +local mat = xcompat.materials local has_mcl = minetest.get_modpath("mcl_core") -- Remove some recipes @@ -180,11 +180,11 @@ minetest.register_craft({ minetest.register_craft({ output = mat.dirt.." 2", type = "shapeless", - replacements = {{mat.bucket_water,mat.bucket_empty}}, + replacements = {{mat.water_bucket,mat.empty_bucket}}, recipe = { "technic:stone_dust", "group:leaves", - mat.bucket_water, + mat.water_bucket, "group:sand", }, }) diff --git a/technic/init.lua b/technic/init.lua index 2d440445..8cca710b 100644 --- a/technic/init.lua +++ b/technic/init.lua @@ -18,9 +18,6 @@ technic.modpath = modpath local S = minetest.get_translator("technic") technic.getter = S --- Read materials file -dofile(modpath.."/materials.lua") - -- Read configuration file dofile(modpath.."/config.lua") diff --git a/technic/machines/HV/forcefield.lua b/technic/machines/HV/forcefield.lua index e82db488..780b06bf 100644 --- a/technic/machines/HV/forcefield.lua +++ b/technic/machines/HV/forcefield.lua @@ -14,7 +14,7 @@ local S = technic.getter local cable_entry = "^technic_cable_connection_overlay.png" -local mat = technic.materials +local mat = xcompat.materials minetest.register_craft({ output = "technic:forcefield_emitter_off", diff --git a/technic/machines/HV/nuclear_reactor.lua b/technic/machines/HV/nuclear_reactor.lua index d78abec9..09b0100d 100644 --- a/technic/machines/HV/nuclear_reactor.lua +++ b/technic/machines/HV/nuclear_reactor.lua @@ -15,7 +15,7 @@ local fuel_type = "technic:uranium_fuel" -- The reactor burns this local digiline_meltdown = technic.config:get_bool("enable_nuclear_reactor_digiline_selfdestruct") local has_digilines = minetest.get_modpath("digilines") local has_mcl = minetest.get_modpath("mcl_core") -local mat = technic.materials +local mat = xcompat.materials local S = technic.getter diff --git a/technic/machines/LV/alloy_furnace.lua b/technic/machines/LV/alloy_furnace.lua index a7e07ef7..3444319f 100644 --- a/technic/machines/LV/alloy_furnace.lua +++ b/technic/machines/LV/alloy_furnace.lua @@ -1,6 +1,6 @@ -- LV Alloy furnace local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials -- FIXME: kpoppel: I'd like to introduce an induction heating element here... minetest.register_craft({ diff --git a/technic/machines/LV/cables.lua b/technic/machines/LV/cables.lua index f6c2e6e2..49963bdf 100644 --- a/technic/machines/LV/cables.lua +++ b/technic/machines/LV/cables.lua @@ -1,5 +1,5 @@ local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials minetest.register_alias("lv_cable", "technic:lv_cable") diff --git a/technic/machines/LV/compressor.lua b/technic/machines/LV/compressor.lua index 9c040f1a..3a23176c 100644 --- a/technic/machines/LV/compressor.lua +++ b/technic/machines/LV/compressor.lua @@ -1,6 +1,6 @@ local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials minetest.register_alias("compressor", "technic:lv_compressor") diff --git a/technic/machines/LV/electric_furnace.lua b/technic/machines/LV/electric_furnace.lua index 368d1073..2164f05f 100644 --- a/technic/machines/LV/electric_furnace.lua +++ b/technic/machines/LV/electric_furnace.lua @@ -1,7 +1,7 @@ -- LV Electric Furnace -- This is a faster version of the stone furnace which runs on EUs local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials -- FIXME: kpoppel I'd like to introduce an induction heating element here also minetest.register_craft({ diff --git a/technic/machines/LV/generator.lua b/technic/machines/LV/generator.lua index f212591b..984c6d13 100644 --- a/technic/machines/LV/generator.lua +++ b/technic/machines/LV/generator.lua @@ -3,7 +3,7 @@ -- Inefficient and expensive in fuel (200EU per tick) -- Also only allows for LV machinery to run. -local mat = technic.materials +local mat = xcompat.materials minetest.register_alias("lv_generator", "technic:lv_generator") diff --git a/technic/machines/LV/geothermal.lua b/technic/machines/LV/geothermal.lua index 52c2ebd2..44e2ab69 100644 --- a/technic/machines/LV/geothermal.lua +++ b/technic/machines/LV/geothermal.lua @@ -6,7 +6,7 @@ minetest.register_alias("geothermal", "technic:geothermal") local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials minetest.register_craft({ output = 'technic:geothermal', diff --git a/technic/machines/LV/grinder.lua b/technic/machines/LV/grinder.lua index 678c7570..fdbe5a37 100644 --- a/technic/machines/LV/grinder.lua +++ b/technic/machines/LV/grinder.lua @@ -1,5 +1,5 @@ local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials minetest.register_alias("grinder", "technic:lv_grinder") minetest.register_craft({ diff --git a/technic/machines/LV/lamp.lua b/technic/machines/LV/lamp.lua index 4cffb420..ed0586a0 100644 --- a/technic/machines/LV/lamp.lua +++ b/technic/machines/LV/lamp.lua @@ -3,7 +3,7 @@ -- Illuminates a 7x7x3(H) volume below itself with light bright as the sun. local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials local demand = 50 local desc = S("@1 Lamp", S("LV")) diff --git a/technic/machines/LV/music_player.lua b/technic/machines/LV/music_player.lua index e2e5b912..f5782f62 100644 --- a/technic/machines/LV/music_player.lua +++ b/technic/machines/LV/music_player.lua @@ -2,7 +2,7 @@ -- The player can play music. But it is high ampage! local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials minetest.register_alias("music_player", "technic:music_player") minetest.register_craft({ diff --git a/technic/machines/LV/water_mill.lua b/technic/machines/LV/water_mill.lua index 5c795b8e..258022a3 100644 --- a/technic/machines/LV/water_mill.lua +++ b/technic/machines/LV/water_mill.lua @@ -3,7 +3,7 @@ -- It is a little over half as good as the thermal generator. local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials local cable_entry = "^technic_cable_connection_overlay.png" diff --git a/technic/machines/MV/tool_workshop.lua b/technic/machines/MV/tool_workshop.lua index 04963060..6b10a9fd 100644 --- a/technic/machines/MV/tool_workshop.lua +++ b/technic/machines/MV/tool_workshop.lua @@ -4,7 +4,7 @@ minetest.register_alias("tool_workshop", "technic:tool_workshop") local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials local tube_entry = "^pipeworks_tube_connection_wooden.png" diff --git a/technic/machines/other/coal_alloy_furnace.lua b/technic/machines/other/coal_alloy_furnace.lua index 89ce4f82..67313dc1 100644 --- a/technic/machines/other/coal_alloy_furnace.lua +++ b/technic/machines/other/coal_alloy_furnace.lua @@ -2,7 +2,7 @@ -- Fuel driven alloy furnace. This uses no EUs: local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials minetest.register_craft({ output = 'technic:coal_alloy_furnace', diff --git a/technic/machines/other/injector.lua b/technic/machines/other/injector.lua index d91e4eca..f837790d 100644 --- a/technic/machines/other/injector.lua +++ b/technic/machines/other/injector.lua @@ -5,7 +5,7 @@ local fs_helpers = pipeworks.fs_helpers local tube_entry = "^pipeworks_tube_connection_metallic.png" -local mat = technic.materials +local mat = xcompat.materials local param2_to_under = { [0] = {x= 0,y=-1,z= 0}, [1] = {x= 0,y= 0,z=-1}, diff --git a/technic/machines/power_monitor.lua b/technic/machines/power_monitor.lua index ea1b6837..df20d1cb 100644 --- a/technic/machines/power_monitor.lua +++ b/technic/machines/power_monitor.lua @@ -3,7 +3,7 @@ -- similarly to the old "slave" switching stations. local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials local cable_entry = "^technic_cable_connection_overlay.png" diff --git a/technic/machines/register/alloy_recipes.lua b/technic/machines/register/alloy_recipes.lua index 1748726c..57cc535f 100644 --- a/technic/machines/register/alloy_recipes.lua +++ b/technic/machines/register/alloy_recipes.lua @@ -1,6 +1,6 @@ local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials technic.register_recipe_type("alloy", { description = S("Alloying"), @@ -30,8 +30,8 @@ local recipes = { -- improves its tensile strength and wear resistance …" {"technic:raw_latex 4", "technic:coal_dust 2", "technic:rubber 6", 2}, {"technic:raw_latex 2", mat.coal_lump, "technic:rubber 2", 2}, - {mat.ice, mat.bucket_empty, mat.bucket_water, 1 }, - {mat.obsidian, mat.bucket_empty, mat.bucket_lava, 1 }, + {mat.ice, mat.empty_bucket, mat.water_bucket, 1 }, + {mat.obsidian, mat.empty_bucket, mat.lava_bucket, 1 }, } if minetest.get_modpath("ethereal") then diff --git a/technic/machines/register/battery_box.lua b/technic/machines/register/battery_box.lua index f9396f78..377d8003 100644 --- a/technic/machines/register/battery_box.lua +++ b/technic/machines/register/battery_box.lua @@ -4,7 +4,7 @@ local digilines_path = minetest.get_modpath("digilines") local S = technic.getter local tube_entry = "^pipeworks_tube_connection_metallic.png" local cable_entry = "^technic_cable_connection_overlay.png" -local mat = technic.materials +local mat = xcompat.materials -- Battery recipes: -- Tin-copper recipe: @@ -23,11 +23,11 @@ minetest.register_craft({ output = "technic:battery", recipe = { {"group:wood", "technic:sulfur_lump", "group:wood"}, - {"technic:lead_ingot", mat.bucket_water, "technic:lead_ingot"}, + {"technic:lead_ingot", mat.water_bucket, "technic:lead_ingot"}, {"group:wood", "technic:sulfur_lump", "group:wood"}, }, replacements = { - {mat.bucket_water, mat.bucket_empty} + {mat.water_bucket, mat.empty_bucket} } }) -- With oil extract: @@ -45,11 +45,11 @@ minetest.register_craft({ output = "technic:battery", recipe = { {"group:wood", "technic:sulfur_dust", "group:wood"}, - {"technic:lead_ingot", mat.bucket_water, "technic:lead_ingot"}, + {"technic:lead_ingot", mat.water_bucket, "technic:lead_ingot"}, {"group:wood", "technic:sulfur_dust", "group:wood"}, }, replacements = { - {mat.bucket_water, mat.bucket_empty} + {mat.empty_bucket, mat.empty_bucket} } }) -- With oil extract: diff --git a/technic/machines/register/centrifuge_recipes.lua b/technic/machines/register/centrifuge_recipes.lua index 5c76ff8a..db2e0437 100644 --- a/technic/machines/register/centrifuge_recipes.lua +++ b/technic/machines/register/centrifuge_recipes.lua @@ -1,5 +1,5 @@ local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials technic.register_recipe_type("separating", { description = S("Separating"), @@ -40,7 +40,7 @@ if minetest.get_modpath("farming") or minetest.get_modpath("mcl_farming") then table.insert(recipes, { "farming:barley", "farming:seed_barley", "cottages:straw_mat" }) else -- work in a less fancy and less efficient manner - table.insert(recipes, { mat.wheat.." 4", mat.seed_wheat.." 3", mat.dry_shrub }) + table.insert(recipes, { mat.wheat.." 4", mat.wheat_seed.." 3", mat.dry_shrub }) table.insert(recipes, { "farming:barley 4", "farming:seed_barley 3", mat.dry_shrub }) end end diff --git a/technic/machines/register/common.lua b/technic/machines/register/common.lua index 9d874cc2..e9d9e9e1 100644 --- a/technic/machines/register/common.lua +++ b/technic/machines/register/common.lua @@ -1,6 +1,6 @@ local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials -- handles the machine upgrades every tick function technic.handle_machine_upgrades(meta) diff --git a/technic/machines/register/compressor_recipes.lua b/technic/machines/register/compressor_recipes.lua index 2e6bfd0e..e1f32670 100644 --- a/technic/machines/register/compressor_recipes.lua +++ b/technic/machines/register/compressor_recipes.lua @@ -1,6 +1,6 @@ local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials local has_mcl = minetest.get_modpath("mcl_core") technic.register_recipe_type("compressing", { diff --git a/technic/machines/register/freezer_recipes.lua b/technic/machines/register/freezer_recipes.lua index 153722ca..39bffcad 100644 --- a/technic/machines/register/freezer_recipes.lua +++ b/technic/machines/register/freezer_recipes.lua @@ -1,6 +1,6 @@ local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials technic.register_recipe_type("freezing", { description = S("Freezing"), @@ -13,10 +13,10 @@ function technic.register_freezer_recipe(data) end local recipes = { - {mat.bucket_water, { mat.ice, mat.bucket_empty } }, - {mat.bucket_river_water, { mat.ice, mat.bucket_empty } }, + {mat.water_bucket, { mat.ice, mat.empty_bucket } }, + {mat.river_water_bucket, { mat.ice, mat.empty_bucket } }, {mat.dirt, mat.dirt_with_snow }, - {mat.bucket_lava, { mat.obsidian, mat.bucket_empty } } + {mat.lava_bucket, { mat.obsidian, mat.empty_bucket } } } for _, data in pairs(recipes) do diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index df38d81e..710c2d54 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -1,6 +1,6 @@ local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials technic.register_recipe_type("grinding", { description = S("Grinding"), @@ -63,7 +63,7 @@ minetest.clear_craft({ }) if minetest.get_modpath("farming") then - table.insert(recipes, {mat.seed_wheat, "farming:flour 1"}) + table.insert(recipes, {mat.wheat_seed, "farming:flour 1"}) end if minetest.get_modpath("moreores") then diff --git a/technic/machines/register/grindings.lua b/technic/machines/register/grindings.lua index 4c622947..2147764c 100644 --- a/technic/machines/register/grindings.lua +++ b/technic/machines/register/grindings.lua @@ -1,7 +1,7 @@ local S = technic.getter local moretrees = minetest.get_modpath("moretrees") local dye = minetest.get_modpath("dye") -local mat = technic.materials +local mat = xcompat.materials -- sawdust, the finest wood/tree grinding local sawdust = "technic:sawdust" diff --git a/technic/machines/switching_station.lua b/technic/machines/switching_station.lua index b230d85b..ea313d8e 100644 --- a/technic/machines/switching_station.lua +++ b/technic/machines/switching_station.lua @@ -4,7 +4,7 @@ local mesecons_path = minetest.get_modpath("mesecons") local digilines_path = minetest.get_modpath("digilines") local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials local cable_entry = "^technic_cable_connection_overlay.png" diff --git a/technic/materials.lua b/technic/materials.lua deleted file mode 100644 index 4baf6a8f..00000000 --- a/technic/materials.lua +++ /dev/null @@ -1,78 +0,0 @@ - -local mesecons_materials = minetest.get_modpath("mesecons_materials") -local has_mcl = minetest.get_modpath("mcl_core") -local has_mcl_dye = minetest.get_modpath("mcl_dye") -local has_moreores = minetest.get_modpath("moreores") - -technic.materials = { - stone = has_mcl and "mcl_core:stone" or "default:stone", - cobble = has_mcl and "mcl_core:cobble" or "default:cobble", - mossycobble = has_mcl and "mcl_core:mossycobble" or "default:mossycobble", - gold_ingot = has_mcl and "mcl_core:gold_ingot" or "default:gold_ingot", - gold_lump = has_mcl and "mcl_raw_ores:raw_gold" or "default:gold_lump", - steel_ingot = has_mcl and "mcl_core:iron_ingot" or "default:steel_ingot", - iron_lump = has_mcl and "mcl_raw_ores:raw_iron" or "default:iron_lump", - diamond = has_mcl and "mcl_core:diamond" or "default:diamond", - dirt = has_mcl and "mcl_core:dirt" or "default:dirt", - tin_ingot = has_mcl and "mcl_core:iron_ingot" or "default:tin_ingot", - tin_lump = has_mcl and "mcl_raw_ores:raw_iron" or "default:tin_lump", - bronze_ingot = has_mcl and "mcl_copper:copper_ingot" or "default:bronze_ingot", - copper_ingot = has_mcl and "mcl_copper:copper_ingot" or "default:copper_ingot", - copper_lump = has_mcl and "mcl_copper:raw_copper" or "default:copper_lump", - mese = has_mcl and "mesecons_torch:redstoneblock" or "default:mese", - mese_crystal = has_mcl and "mesecons:redstone" or "default:mese_crystal", - dye_green = has_mcl_dye and "mcl_dye:green" or "dye:green", - dye_red = has_mcl_dye and "mcl_dye:red" or "dye:red", - dye_blue = has_mcl_dye and "mcl_dye:blue" or "dye:blue", - dye_orange = has_mcl and "mcl_dye:orange" or "dye:orange", - dye_grey = has_mcl and "mcl_dye:grey" or "dye:grey", - insulation = mesecons_materials and "mesecons_materials:fiber" or "technic:rubber", - obsidian = has_mcl and "mcl_core:obsidian" or "default:obsidian", - obsidian_glass = has_mcl and "mcl_core:glass" or "default:obsidian_glass", - brick = has_mcl and "mcl_core:brick" or "default:brick", - paper = has_mcl and "mcl_core:paper" or "default:paper", - furnace = has_mcl and "mcl_furnaces:furnace" or "default:furnace", - chest = has_mcl and "mcl_chests:chest" or "default:chest", - sand = has_mcl and "mcl_core:sand" or "default:sand", - ice = has_mcl and "mcl_core:ice" or "default:ice", - clay = has_mcl and "mcl_core:clay" or "default:clay", - clay_lump = has_mcl and "mcl_core:clay_lump" or "default:clay_lump", - stick = has_mcl and "mcl_core:stick" or "default:stick", - dry_shrub = has_mcl and "mcl_core:deadbush" or "default:dry_shrub", - wheat = has_mcl and "mcl_farming:wheat_item" or "farming:wheat", - seed_wheat = has_mcl and "mcl_farming:wheat_seeds" or "farming:seed_wheat", - snowblock = has_mcl and "mcl_core:snowblock" or "default:snowblock", - sandstone = has_mcl and "mcl_core:sandstone" or "default:sandstone", - desert_stone = has_mcl and "mcl_core:redsandstone" or "default:desert_stone", - desert_sand = has_mcl and "mcl_core:redsand" or "default:desert_sand", - desert_sandstone = has_mcl and "mcl_core:redsandstone" or "default:desert_sandstone", - silver_sand = has_mcl and "mcl_core:sand" or "default:silver_sand", - silver_sandstone = has_mcl and "mcl_core:sandstone" or "default:silver_sandstone", - glass = has_mcl and "mcl_core:glass" or "default:glass", - coal_lump = has_mcl and "mcl_core:coal_lump" or "default:coal_lump", - bucket_empty = has_mcl and "mcl_buckets:bucket_empty" or "bucket:bucket_empty", - bucket_water = has_mcl and "mcl_buckets:bucket_water" or "bucket:bucket_water", - bucket_river_water = has_mcl and "mcl_buckets:bucket_river_water" or "bucket:bucket_river_water", - bucket_lava = has_mcl and "mcl_buckets:bucket_lava" or "bucket:bucket_lava", - dirt_with_snow = has_mcl and "mcl_core:snowblock" or "default:dirt_with_snow", - gravel = has_mcl and "mcl_core:gravel" or "default:gravel", - tree = has_mcl and "mcl_core:tree" or "default:tree", - wood = has_mcl and "mcl_core:wood" or "default:wood", - acacia_tree = has_mcl and "mcl_core:acaciatree" or "default:acacia_tree", - acacia_wood = has_mcl and "mcl_core:acaciawood" or "default:acacia_wood", - water_source = has_mcl and "mcl_core:water_source" or "default:water_source", - water_flowing = has_mcl and "mcl_core:water_flowing" or "default:water_flowing", - river_water_source = has_mcl and "mclx_core:river_water_source" or "default:river_water_source", - river_water_flowing = has_mcl and "mclx_core:river_water_flowing" or "default:river_water_flowing", - lava_source = has_mcl and "mcl_core:lava_source" or "default:lava_source", - lava_flowing = has_mcl and "mcl_core:lava_flowing" or "default:lava_flowing", - mithril_ingot = has_moreores and "moreores:mithril_ingot" or has_mcl and "mcl_core:lapis" or "default:steel_ingot", - silver_ingot = has_moreores and "moreores:silver_ingot" or has_mcl and "mcl_core:gold_ingot" or "default:gold_ingot", - pick_silver = has_moreores and "moreores:pick_silver" or has_mcl and "mcl_tools:pick_gold" or "default:gold_pickaxe", - mithril_block = has_moreores and "moreores:mithril_block" or has_mcl and "mcl_core:lapisblock" or "default:goldblock", -} - -if has_mcl and has_moreores then - technic.materials.tin_ingot = "moreores:tin_ingot" - technic.materials.tin_lump = "moreores:tin_lump" -end diff --git a/technic/mod.conf b/technic/mod.conf index 6e8b33d3..2d93c2d9 100644 --- a/technic/mod.conf +++ b/technic/mod.conf @@ -1,3 +1,3 @@ name = technic -depends = pipeworks, technic_worldgen, basic_materials +depends = pipeworks, technic_worldgen, basic_materials, xcompat optional_depends = mcl_core, mcl_sounds, default, bucket, mesecons, mesecons_mvps, digilines, digiline_remote, unified_inventory, dye, craftguide, i3, mtt, vizlib, moreores, mcl_buckets, mcl_explosions, mcl_craftguide diff --git a/technic/tools/cans.lua b/technic/tools/cans.lua index 843077a6..82bd0eb6 100644 --- a/technic/tools/cans.lua +++ b/technic/tools/cans.lua @@ -1,5 +1,5 @@ local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials local function set_can_wear(itemstack, level, max_level) local temp diff --git a/technic/tools/flashlight.lua b/technic/tools/flashlight.lua index 23d0f137..6a625110 100644 --- a/technic/tools/flashlight.lua +++ b/technic/tools/flashlight.lua @@ -4,7 +4,7 @@ local flashlight_max_charge = 30000 local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials minetest.register_alias("technic:light_off", "air") diff --git a/technic/tools/mining_drill.lua b/technic/tools/mining_drill.lua index f0d78f85..0f8f5f04 100644 --- a/technic/tools/mining_drill.lua +++ b/technic/tools/mining_drill.lua @@ -2,7 +2,7 @@ local max_charge = {50000, 200000, 300000} local power_usage_per_node = {200, 500, 600} local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials minetest.register_craft({ output = 'technic:mining_drill', diff --git a/technic/tools/mining_lasers.lua b/technic/tools/mining_lasers.lua index f9998ed2..e535b925 100644 --- a/technic/tools/mining_lasers.lua +++ b/technic/tools/mining_lasers.lua @@ -1,5 +1,5 @@ -local mat = technic.materials +local mat = xcompat.materials local mining_lasers_list = { -- {, , , }, diff --git a/technic/tools/prospector.lua b/technic/tools/prospector.lua index 0d96de07..d7611b7a 100644 --- a/technic/tools/prospector.lua +++ b/technic/tools/prospector.lua @@ -1,5 +1,5 @@ local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials local function migrate_meta(meta) local data = meta:get("") diff --git a/technic/tools/sonic_screwdriver.lua b/technic/tools/sonic_screwdriver.lua index 856f784c..4432b642 100644 --- a/technic/tools/sonic_screwdriver.lua +++ b/technic/tools/sonic_screwdriver.lua @@ -1,7 +1,7 @@ local sonic_screwdriver_max_charge = 15000 local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials -- screwdriver handler code reused from minetest/minetest_game screwdriver @a9ac480 local ROTATE_FACE = 1 diff --git a/technic/tools/tree_tap.lua b/technic/tools/tree_tap.lua index a37401f4..9d3344c7 100644 --- a/technic/tools/tree_tap.lua +++ b/technic/tools/tree_tap.lua @@ -1,6 +1,6 @@ local S = technic.getter -local mat = technic.materials +local mat = xcompat.materials local mesecons_materials = minetest.get_modpath("mesecons_materials") local function drop_raw_latex(pointed_thing, user)