add first class support for repixture

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "sound_api_core"]
+	path = sound_api_core
+	url = https://github.com/mt-mods/sound_api_core.git

.luacheckrc

@@ -3,5 +3,5 @@ globals = {
 }
 
 read_globals = {
-    "default", "xcompat",
+    "default",
 }

README.md

@@ -20,4 +20,11 @@ mod that adds basic material nodes and items
 ### Option 3: use git
 
 * `git clone https://github.com/mt-mods/basic_materials.git`
-* `cd basic_materials`
+* `cd basic_materials`
+* `git submodule init`
+* `git submodule update`
+
+to update please use the following commands starting inside the mod directory
+
+* `git submodule sync`
+* `git submodule update`

crafts.lua

@@ -1,4 +1,132 @@
-local materials = xcompat.materials
+local materials = {
+	dirt = "default:dirt",
+	sand = "default:sand",
+	gravel = "default:gravel",
+	copper_ingot = "default:copper_ingot",
+	steel_ingot = "default:steel_ingot",
+	gold_ingot = "default:gold_ingot",
+	tin_ingot = "default:tin_ingot",
+	mese_crystal_fragment = "default:mese_crystal_fragment",
+	torch = "default:torch",
+	diamond = "default:diamond",
+	clay_lump = "default:clay_lump",
+	water_bucket = "bucket:bucket_water",
+	empty_bucket = "bucket:bucket_empty",
+	dye_dark_grey = "dye:dark_grey",
+	silicon = "mesecons_materials:silicon",
+}
+
+if minetest.get_modpath("moreores") then
+	materials.silver_ingot = "moreores:silver_ingot"
+end
+
+if minetest.get_modpath("technic") then
+	materials.lead_ingot = "technic:lead_ingot"
+	materials.carbon_steel_ingot = "technic:carbon_steel_ingot"
+	materials.stainless_steel_ingot = "technic:stainless_steel_ingot"
+end
+
+if minetest.get_modpath("aloz") then
+	materials["aluminum_ingot"] = "aloz:aluminum_ingot"
+end
+
+if minetest.get_modpath("mcl_core") then
+	materials = {
+		dirt = "mcl_core:dirt",
+		sand = "mcl_core:sand",
+		gravel = "mcl_core:gravel",
+		steel_ingot = "mcl_core:iron_ingot",
+		gold_ingot = "mcl_core:gold_ingot",
+		mese_crystal_fragment = "mesecons:redstone",
+		torch = "mcl_torches:torch",
+		diamond = "mcl_core:diamond",
+		clay_lump = "mcl_core:clay_lump",
+		water_bucket = "mcl_buckets:bucket_water",
+		empty_bucket = "mcl_buckets:bucket_empty",
+		dye_dark_grey = "mcl_dye:dark_grey",
+		-- Use iron where no equivalent
+		copper_ingot = "mcl_core:iron_ingot",
+		tin_ingot = "mcl_core:iron_ingot",
+		silver_ingot = "mcl_core:iron_ingot",
+		silicon = "mesecons_materials:silicon",
+	}
+elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then
+	materials = {
+		dirt = "fl_topsoil:dirt",
+		sand = "fl_stone:sand",
+		gravel = "fl_topsoil:gravel",
+		steel_ingot = "fl_ores:iron_ingot",
+		gold_ingot = "fl_ores:gold_ingot",
+		mese_crystal_fragment = "fl_ores:iron_ingot",
+		torch = "fl_light_sources:torch",
+		diamond = "fl_ores:diamond",
+		clay_lump = "fl_bricks:clay_lump",
+		water_bucket = "fl_bucket:bucket_water",
+		empty_bucket = "fl_bucket:bucket",
+		dye_dark_grey = "fl_dyes:dark_grey_dye",
+		copper_ingot = "fl_ores:copper_ingot",
+		tin_ingot = "fl_ores:tin_ingot",
+		silver_ingot = "fl_ores:iron_ingot",
+		silicon = "mesecons_materials:silicon",
+	}
+elseif minetest.get_modpath("rp_default") then
+	materials = {
+		dirt = "rp_default:dirt",
+		sand = "rp_default:sand",
+		gravel = "rp_default:gravel",
+		steel_ingot = "rp_default:ingot_steel",
+		gold_ingot = "rp_default:ingot_gold",
+		mese_crystal_fragment = "rp_default:ingot_steel",
+		torch = "rp_default:torch",
+		diamond = "rp_default:pearl",
+		clay_lump = "rp_default:ingot_steel",
+		water_bucket = "rp_default:swamp_dirt",
+		empty_bucket = "rp_default:dirt",
+		dye_dark_grey = "rp_default:ingot_steel",
+		copper_ingot = "rp_default:ingot_copper",
+		tin_ingot = "rp_default:ingot_tin",
+		silver_ingot = "rp_default:ingot_steel",
+		silicon = "rp_default:ingot_steel",
+	}
+elseif minetest.get_modpath("hades_core") then
+	materials = {
+		dirt = "hades_core:dirt",
+		sand = "hades_core:fertile_sand",
+		gravel = "hades_core:gravel",
+		steel_ingot = "hades_core:steel_ingot",
+		gold_ingot = "hades_core:gold_ingot",
+		mese_crystal_fragment = "hades_core:mese_crystal_fragment",
+		torch = "hades_torches:torch",
+		diamond = "hades_core:diamond",
+		clay_lump = "hades_core:clay_lump",
+		dye_dark_grey = "hades_dye:dark_grey",
+		copper_ingot = "hades_core:copper_ingot",
+		tin_ingot = "hades_core:tin_ingot",
+		--[[
+			Since hades doesnt have buckets or water for the user,
+			using dirt from near water to pull the water out
+		]]
+		water_bucket = "hades_core:dirt",
+		empty_bucket = "hades_core:fertile_sand",
+		-- Set this to steel unless hadesextraores is present
+		silver_ingot = "hades_core:steel_ingot",
+		silicon = "hades_materials:silicon",
+	}
+
+	if minetest.get_modpath("hades_bucket") then
+		materials["water_bucket"] = "hades_bucket:bucket_water"
+		materials["empty_bucket"] = "hades_bucket:bucket_empty"
+	end
+	if minetest.get_modpath("hades_extraores") then
+		materials["silver_ingot"] = "hades_extraores:silver_ingot"
+		materials["aluminum_ingot"] = "hades_extraores:aluminum_ingot"
+	end
+	if minetest.get_modpath("hades_technic") then
+		materials.lead_ingot = "hades_technic:lead_ingot"
+		materials.carbon_steel_ingot = "hades_technic:carbon_steel_ingot"
+		materials.stainless_steel_ingot = "hades_technic:stainless_steel_ingot"
+	end
+end
 
 local have_hades_materials = minetest.get_modpath("hades_materials")
 
@@ -392,7 +520,7 @@ register_craft({
 
 if not have_hades_materials then
 	register_craft( {
-		output = "basic_materials:silicon 4",
+		output = materials.silicon.." 4",
 		recipe = {
 			{materials.sand, materials.sand},
 			{materials.sand, materials.steel_ingot},
@@ -403,8 +531,8 @@ end
 register_craft( {
 	output = "basic_materials:ic 4",
 	recipe = {
-		{"basic_materials:silicon", "basic_materials:silicon"},
+		{materials.silicon, materials.silicon},
-		{"basic_materials:silicon", materials.copper_ingot},
+		{materials.silicon, materials.copper_ingot},
 	},
 })
 

locale/basic_materials.uk.tr

@@ -1,48 +0,0 @@
-# textdomain: basic_materials
-
-Basic Materials and items=Базові матеріали та предмети
-Provides a small selection of "basic" materials and items that other mods should use when possible -- things like steel bars and chains, wire, plastic strips and sheets, and more.=Пропонує обмежений набір "основних" матеріалів та виробів, які іншим модам рекомендується використовувати, де це доречно — наприклад, сталеві бруски та ланцюги, дріт, пластикові стрічки та листи, тощо.
-
-Silicon lump=Шмат Кремнію
-Simple Integrated Circuit=Мікросхема
-Simple Motor=Двигун
-Heating element=Нагрівальний елемент
-Simple energy crystal=Енергетичний кристал
-
-Gold Strip=Золота смужка
-Lead Strip=Свинцева смужка
-Aluminum Strip=Алюмінієва смужка
-
-Aluminum Bar=Алюмінієвий брусок
-Spool of aluminum wire=Котушка алюмінієвого дроту
-Carbon Steel Bar=Брусок вуглецевої сталі
-Stainless Steel Bar=Брусок нержавіючої сталі
-Spool of stainless steel wire=Котушка дроту з нержавіючої сталі
-Stainless Steel Strip=Смужка з нержавіючої сталі
-
-Spool of steel wire=Катушка сталевої проволки
-Spool of copper wire=Катушка мідної проволки
-Spool of silver wire=Катушка срібної проволки
-Spool of gold wire=Катушка золотої проволки
-Steel Strip=Сталева стрічка
-Copper Strip=Мідна стрічка
-Steel Bar=Сталевий Прут
-Chainlinks (brass)=Латунний ланцюг
-Chainlinks (steel)=Сталевий ланцюг
-Brass Ingot=Латунний злиток
-Steel gear=Сталева шестерня
-Padlock=Навісний замок
-Chain (steel, hanging)=Ланцюг (сталевий, підвісний)
-Chain (brass, hanging)=Ланцюг (латунь, підвісна)
-Brass Block=Латунний блок
-
-Oil extract=Олійний екстракт
-Unprocessed paraffin=Необроблений парафін
-Uncooked Terracotta Base=Сира теракотова основа
-Wet Cement=Мокрий цемент
-Cement=Цемент
-Concrete Block=Бетонний блок
-
-Plastic sheet=Лист пластику
-Plastic strips=Стрічка пластику
-Empty wire spool=Порожня катушка

mod.conf

@@ -1,4 +1,3 @@
 name = basic_materials
-depends = xcompat
+optional_depends = moreores, default, mesecons_materials, dye, bucket, fl_stone, fl_trees, mcl_sounds, hades_core, hades_sounds, hades_materials, hades_dye, hades_bucket, hades_extraores, hades_mesecons_materials, aloz, rp_crafting
-optional_depends = moreores, default, mesecons_materials, dye, bucket, fl_stone, fl_trees, mcl_sounds, hades_core, hades_sounds, hades_materials, hades_dye, hades_bucket, hades_extraores, hades_mesecons_materials, aloz, rp_crafting, mcl_core, mcl_copper
 min_minetest_version = 5.2.0

nodes.lua

@@ -1,11 +1,11 @@
 local S = minetest.get_translator("basic_materials")
-local sound_api = xcompat.sounds
+local sound_api = dofile(basic_materials.modpath .. "/sound_api_core/init.lua")
 local chains_sbox = {type = "fixed",fixed = { -0.1, -0.5, -0.1, 0.1, 0.5, 0.1 }}
 
 minetest.register_node("basic_materials:cement_block", {
 	description = S("Cement"),
 	tiles = {"basic_materials_cement_block.png"},
-	is_ground_content = false,
+	is_ground_content = true,
 	groups = {cracky=2, dig_stone = 1, pickaxey=5},
 	_mcl_hardness=1.6,
 	sounds = sound_api.node_sound_stone_defaults(),
@@ -14,7 +14,6 @@ minetest.register_node("basic_materials:cement_block", {
 minetest.register_node("basic_materials:concrete_block", {
 	description = S("Concrete Block"),
 	tiles = {"basic_materials_concrete_block.png",},
-	is_ground_content = false,
 	groups = {cracky=1, concrete=1, dig_stone = 1, pickaxey=5},
 	_mcl_hardness=1.6,
 	sounds = sound_api.node_sound_stone_defaults(),
@@ -30,7 +29,6 @@ minetest.register_node("basic_materials:chain_steel", {
 	sunlight_propagates = true,
 	paramtype = "light",
 	inventory_image = "basic_materials_chain_steel_inv.png",
-	is_ground_content = false,
 	groups = {cracky=3, dig_stone = 1, pickaxey=5},
 	_mcl_hardness=1.6,
 	selection_box = chains_sbox,
@@ -46,7 +44,6 @@ minetest.register_node("basic_materials:chain_brass", {
 	sunlight_propagates = true,
 	paramtype = "light",
 	inventory_image = "basic_materials_chain_brass_inv.png",
-	is_ground_content = false,
 	groups = {cracky=3, dig_stone = 1, pickaxey=5},
 	_mcl_hardness=1.6,
 	selection_box = chains_sbox,