formatting fixes

* add hades revisted crafts and update sound api for sounds (#10)

* add hades revisted crafts and update sound api for sounds

* fix https://github.com/mt-mods/basic_materials/issues/9

* fix https://github.com/mt-mods/basic_materials/issues/9 part 2

* Add hades_bucket to crafts. Fix some bugs.

* Fix dependencies and recipes. Disable silicon if hades_materials is aviable.

* Remove unused dependence.

* Clear original recipe for palstic base from hades_materials. Prevent dual plastic cook recipe.

* Use register_alias_force.

* Fix spaces vs tabs.

Co-authored-by: wsor4035 <24964441+wsor4035@users.noreply.github.com>

.luacheckrc

@@ -1,5 +1,5 @@
 globals = {
-    "minetest", "basic_materials", "crafting",
+    "minetest", "basic_materials",
 }
 
 read_globals = {

craftitems.lua

@@ -85,18 +85,6 @@ minetest.register_craftitem("basic_materials:gold_wire", {
 	inventory_image = "basic_materials_gold_wire.png"
 })
 
-minetest.register_craftitem("basic_materials:stainless_steel_wire", {
-	description = S("Spool of stainless steel wire"),
-	groups = { wire = 1 },
-	inventory_image = "basic_materials_stainless_steel_wire.png"
-})
-
-minetest.register_craftitem("basic_materials:aluminum_wire", {
-	description = S("Spool of aluminum wire"),
-	groups = { wire = 1 },
-	inventory_image = "basic_materials_aluminum_wire.png"
-})
-
 minetest.register_craftitem("basic_materials:steel_strip", {
 	description = S("Steel Strip"),
 	groups = { strip = 1 },
@@ -109,50 +97,11 @@ minetest.register_craftitem("basic_materials:copper_strip", {
 	inventory_image = "basic_materials_copper_strip.png"
 })
 
-minetest.register_craftitem("basic_materials:lead_strip", {
-	description = S("Lead Strip"),
-	groups = { strip = 1 },
-	inventory_image = "basic_materials_lead_strip.png"
-})
-
-minetest.register_craftitem("basic_materials:gold_strip", {
-	description = S("Gold Strip"),
-	groups = { strip = 1 },
-	inventory_image = "basic_materials_gold_strip.png"
-})
-
-minetest.register_craftitem("basic_materials:stainless_steel_strip", {
-	description = S("Stainless Steel Strip"),
-	groups = { strip = 1 },
-	inventory_image = "basic_materials_stainless_steel_strip.png"
-})
-
-minetest.register_craftitem("basic_materials:aluminum_strip", {
-	description = S("Aluminum Strip"),
-	groups = { strip = 1 },
-	inventory_image = "basic_materials_aluminum_strip.png"
-})
-
 minetest.register_craftitem("basic_materials:steel_bar", {
 	description = S("Steel Bar"),
 	inventory_image = "basic_materials_steel_bar.png",
 })
 
-minetest.register_craftitem("basic_materials:carbon_steel_bar", {
-	description = S("Carbon Steel Bar"),
-	inventory_image = "basic_materials_carbon_steel_bar.png",
-})
-
-minetest.register_craftitem("basic_materials:stainless_steel_bar", {
-	description = S("Stainless Steel Bar"),
-	inventory_image = "basic_materials_stainless_steel_bar.png",
-})
-
-minetest.register_craftitem("basic_materials:aluminum_bar", {
-	description = S("Aluminum Bar"),
-	inventory_image = "basic_materials_aluminum_bar.png",
-})
-
 minetest.register_craftitem("basic_materials:chainlink_brass", {
 	description = S("Chainlinks (brass)"),
 	groups = { chainlinks = 1 },
@@ -183,6 +132,6 @@ minetest.register_craftitem("basic_materials:padlock", {
 if minetest.get_modpath("hades_materials") then
 	minetest.register_alias_force("basic_materials:plastic_sheet", "hades_materials:plastic_sheeting")
 	minetest.register_alias_force("basic_materials:paraffin", "hades_materials:plastic_base")
-	minetest.register_alias_force("basic_materials:silicon", "hades_materials:silicon")
+	minetest.register_alias_force("hades_extramaterials:silicon", "hades_materials:silicon")
 end
 

crafts.lua

@@ -16,20 +16,6 @@ local materials = {
 	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",
@@ -69,25 +55,6 @@ elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then
 		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",
@@ -99,7 +66,7 @@ elseif minetest.get_modpath("hades_core") then
 		torch = "hades_torches:torch",
 		diamond = "hades_core:diamond",
 		clay_lump = "hades_core:clay_lump",
-		dye_dark_grey = "hades_dye:dark_grey",
+		dye_dark_grey = "dye:dark_grey",
 		copper_ingot = "hades_core:copper_ingot",
 		tin_ingot = "hades_core:tin_ingot",
 		--[[
@@ -119,55 +86,13 @@ elseif minetest.get_modpath("hades_core") then
 	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")
 
-local function compress_craft(input)
-	local buffer = {}
-	for _, item in pairs(input) do
-		if type(item)=="table" then
-			for _, inneritem in pairs(item) do
-				buffer[inneritem] = (buffer[inneritem] or 0) + 1
-			end
-		elseif item ~= "" then
-			buffer[item] = (buffer[item] or 0) + 1
-		end
-	end
-
-	local output = {}
-	for item, count in pairs(buffer) do
-		output[#output + 1] = item .. " " .. count
-	end
-	return output
-end
-
-local function register_craft(input)
-	if minetest.get_modpath("rp_crafting") then
-		local rp_craft = compress_craft(input.recipe)
-		if #rp_craft > crafting.MAX_INPUTS then
-			minetest.log("error", "[basic_materials] unable to register craft for " .. input.output)
-			return
-		end
-
-		crafting.register_craft({
-			output = input.output,
-			items = rp_craft
-		})
-	else
-		minetest.register_craft(input)
-	end
-end
-
 -- Craft recipes
-register_craft({
+minetest.register_craft({
 	output = "basic_materials:chainlink_brass 12",
 	recipe = {
 		{"", "basic_materials:brass_ingot", "basic_materials:brass_ingot"},
@@ -176,7 +101,7 @@ register_craft({
 	},
 })
 
-register_craft({
+minetest.register_craft({
 	output = "basic_materials:chain_steel 2",
 	recipe = {
 		{"basic_materials:chainlink_steel"},
@@ -185,7 +110,7 @@ register_craft({
 	}
 })
 
-register_craft({
+minetest.register_craft({
 	output = "basic_materials:chain_brass 2",
 	recipe = {
 		{"basic_materials:chainlink_brass"},
@@ -194,13 +119,13 @@ register_craft({
 	}
 })
 
-register_craft( {
+minetest.register_craft( {
 	type = "shapeless",
 	output = "basic_materials:brass_ingot 9",
 	recipe = {"basic_materials:brass_block"},
 })
 
-register_craft( {
+minetest.register_craft( {
 	output = "basic_materials:brass_block",
 	recipe = {
 		{"basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot"},
@@ -209,14 +134,14 @@ register_craft( {
 	},
 })
 
-register_craft( {
+minetest.register_craft( {
 	output = "basic_materials:plastic_strip 9",
 	recipe = {
 		{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"}
 	},
 })
 
-register_craft( {
+minetest.register_craft( {
 	output = "basic_materials:empty_spool 3",
 	recipe = {
 		{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"},
@@ -227,12 +152,12 @@ register_craft( {
 
 if have_hades_materials then
 	minetest.clear_craft({
-		type = "shapeless",
-		recipe = {"group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves"}
+	type = "shapeless",
+	recipe = {"group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves"}
 	})
 end
 
-register_craft({
+minetest.register_craft({
 	type = "shapeless",
 	output = "basic_materials:oil_extract 2",
 	recipe = {"group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves"}
@@ -241,9 +166,9 @@ register_craft({
 -- Cooking recipes
 if not have_hades_materials then
 	minetest.register_craft({
-		type = "cooking",
-		output = "basic_materials:plastic_sheet",
-		recipe = "basic_materials:paraffin",
+	type = "cooking",
+	output = "basic_materials:plastic_sheet",
+	recipe = "basic_materials:paraffin",
 	})
 end
 
@@ -279,7 +204,7 @@ minetest.register_craft({
 	burntime = 30,
 })
 
-register_craft({
+minetest.register_craft({
 	output = "basic_materials:concrete_block 6",
 	recipe = {
 		{"group:sand", "basic_materials:wet_cement", materials.gravel},
@@ -288,7 +213,7 @@ register_craft({
 	}
 })
 
-register_craft( {
+minetest.register_craft( {
 	output = "basic_materials:motor 2",
 	recipe = {
 		{materials.mese_crystal_fragment, "basic_materials:copper_wire", "basic_materials:plastic_sheet"},
@@ -301,14 +226,14 @@ register_craft( {
 	}
 })
 
-register_craft( {
+minetest.register_craft( {
 	output = "basic_materials:heating_element 2",
 	recipe = {
 		{materials.copper_ingot, materials.mese_crystal_fragment, materials.copper_ingot}
 	},
 })
 
-register_craft({
+minetest.register_craft({
 	--type = "shapeless",
 	output = "basic_materials:energy_crystal_simple 2",
 	recipe = {
@@ -317,7 +242,7 @@ register_craft({
 	},
 })
 
-register_craft( {
+minetest.register_craft( {
 	output = "basic_materials:copper_wire 2",
 	type = "shapeless",
 	recipe = {
@@ -327,7 +252,7 @@ register_craft( {
 	},
 })
 
-register_craft( {
+minetest.register_craft( {
 	output = "basic_materials:gold_wire 2",
 	type = "shapeless",
 	recipe = {
@@ -337,7 +262,7 @@ register_craft( {
 	},
 })
 
-register_craft( {
+minetest.register_craft( {
 	output = "basic_materials:steel_wire 2",
 	type = "shapeless",
 	recipe = {
@@ -347,31 +272,7 @@ register_craft( {
 	},
 })
 
-if materials.stainless_steel_ingot then
-	register_craft( {
-		output = "basic_materials:stainless_steel_wire 2",
-		type = "shapeless",
-		recipe = {
-			materials.stainless_steel_ingot,
-			"basic_materials:empty_spool",
-			"basic_materials:empty_spool",
-		},
-	})
-end
-
-if materials.aluminum_ingot then
-	register_craft( {
-		output = "basic_materials:aluminum_wire 2",
-		type = "shapeless",
-		recipe = {
-			materials.aluminum_ingot,
-			"basic_materials:empty_spool",
-			"basic_materials:empty_spool",
-		},
-	})
-end
-
-register_craft( {
+minetest.register_craft( {
 	output = "basic_materials:steel_strip 12",
 	recipe = {
 		{"", materials.steel_ingot, ""},
@@ -379,7 +280,7 @@ register_craft( {
 	},
 })
 
-register_craft( {
+minetest.register_craft( {
 	output = "basic_materials:copper_strip 12",
 	recipe = {
 		{"", materials.copper_ingot, ""},
@@ -387,45 +288,7 @@ register_craft( {
 	},
 })
 
-register_craft( {
-	output = "basic_materials:gold_strip 12",
-	recipe = {
-		{"", materials.gold_ingot, ""},
-		{materials.gold_ingot, "", ""},
-	},
-})
-
-if materials.lead_ingot then
-	register_craft( {
-		output = "basic_materials:lead_strip 12",
-		recipe = {
-			{"", materials.lead_ingot, ""},
-			{materials.lead_ingot, "", ""},
-		},
-	})
-end
-
-if materials.stainless_steel_ingot then
-	register_craft( {
-		output = "basic_materials:stainless_steel_strip 12",
-		recipe = {
-			{"", materials.stainless_steel_ingot, ""},
-			{materials.stainless_steel_ingot, "", ""},
-		},
-	})
-end
-
-if materials.aluminum_ingot then
-	register_craft( {
-		output = "basic_materials:aluminum_strip 12",
-		recipe = {
-			{"", materials.aluminum_ingot, ""},
-			{materials.aluminum_ingot, "", ""},
-		},
-	})
-end
-
-register_craft( {
+minetest.register_craft( {
 	output = "basic_materials:steel_bar 6",
 	recipe = {
 		{"", "", materials.steel_ingot},
@@ -434,40 +297,7 @@ register_craft( {
 	},
 })
 
-if materials.carbon_steel_ingot then
-	register_craft( {
-		output = "basic_materials:carbon_steel_bar 6",
-		recipe = {
-			{"", "", materials.carbon_steel_ingot},
-			{"", materials.carbon_steel_ingot, ""},
-			{materials.carbon_steel_ingot, "", ""},
-		},
-	})
-end
-
-if materials.stainless_steel_ingot then
-	register_craft( {
-		output = "basic_materials:stainless_steel_bar 6",
-		recipe = {
-			{"", "", materials.stainless_steel_ingot},
-			{"", materials.stainless_steel_ingot, ""},
-			{materials.stainless_steel_ingot, "", ""},
-		},
-	})
-end
-
-if materials.aluminum_ingot then
-	register_craft( {
-		output = "basic_materials:aluminum_bar 6",
-		recipe = {
-			{"", "", materials.aluminum_ingot},
-			{"", materials.aluminum_ingot, ""},
-			{materials.aluminum_ingot, "", ""},
-		},
-	})
-end
-
-register_craft( {
+minetest.register_craft( {
 	output = "basic_materials:padlock 2",
 	recipe = {
 		{"basic_materials:steel_bar"},
@@ -476,7 +306,7 @@ register_craft( {
 	},
 })
 
-register_craft({
+minetest.register_craft({
 	output = "basic_materials:chainlink_steel 12",
 	recipe = {
 		{"", materials.steel_ingot, materials.steel_ingot},
@@ -485,7 +315,7 @@ register_craft({
 	},
 })
 
-register_craft( {
+minetest.register_craft( {
 	output = "basic_materials:gear_steel 6",
 	recipe = {
 		{"", materials.steel_ingot, ""},
@@ -494,7 +324,7 @@ register_craft( {
 	},
 })
 
-register_craft( {
+minetest.register_craft( {
 	type = "shapeless",
 	output = "basic_materials:terracotta_base 8",
 	recipe = {
@@ -505,7 +335,7 @@ register_craft( {
 	replacements = {{materials.water_bucket, materials.empty_bucket}},
 })
 
-register_craft({
+minetest.register_craft({
 	type = "shapeless",
 	output = "basic_materials:wet_cement 3",
 	recipe = {
@@ -519,7 +349,7 @@ register_craft({
 })
 
 if not have_hades_materials then
-	register_craft( {
+	minetest.register_craft( {
 		output = materials.silicon.." 4",
 		recipe = {
 			{materials.sand, materials.sand},
@@ -528,7 +358,7 @@ if not have_hades_materials then
 	})
 end
 
-register_craft( {
+minetest.register_craft( {
 	output = "basic_materials:ic 4",
 	recipe = {
 		{materials.silicon, materials.silicon},
@@ -537,7 +367,7 @@ register_craft( {
 })
 
 -- Without moreores, there still should be a way to create brass.
-register_craft( {
+minetest.register_craft( {
 	output = "basic_materials:brass_ingot 9",
 	recipe = {
 		{materials.copper_ingot, materials.tin_ingot, materials.copper_ingot},
@@ -546,24 +376,22 @@ register_craft( {
 	},
 })
 
-if materials.silver_ingot then
-	register_craft( {
-		output = "basic_materials:silver_wire 2",
-		type = "shapeless",
-		recipe = {
-			materials.silver_ingot,
-			"basic_materials:empty_spool",
-			"basic_materials:empty_spool",
-		},
-	})
+minetest.register_craft( {
+	output = "basic_materials:silver_wire 2",
+	type = "shapeless",
+	recipe = {
+		materials.silver_ingot,
+		"basic_materials:empty_spool",
+		"basic_materials:empty_spool",
+	},
+})
 
-	register_craft( {
-		type = "shapeless",
-		output = "basic_materials:brass_ingot 3",
-		recipe = {
-			materials.copper_ingot,
-			materials.copper_ingot,
-			materials.silver_ingot,
-		},
-	})
-end
+minetest.register_craft( {
+	type = "shapeless",
+	output = "basic_materials:brass_ingot 3",
+	recipe = {
+		materials.copper_ingot,
+		materials.copper_ingot,
+		materials.silver_ingot,
+	},
+})

mod.conf

@@ -1,3 +1,3 @@
 name = basic_materials
-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_sounds, hades_materials, hades_bucket, hades_extraores
 min_minetest_version = 5.2.0

nodes.lua

@@ -6,16 +6,14 @@ minetest.register_node("basic_materials:cement_block", {
 	description = S("Cement"),
 	tiles = {"basic_materials_cement_block.png"},
 	is_ground_content = true,
-	groups = {cracky=2, dig_stone = 1, pickaxey=5},
-	_mcl_hardness=1.6,
+	groups = {cracky=2, dig_stone = 1},
 	sounds = sound_api.node_sound_stone_defaults(),
 })
 
 minetest.register_node("basic_materials:concrete_block", {
 	description = S("Concrete Block"),
 	tiles = {"basic_materials_concrete_block.png",},
-	groups = {cracky=1, concrete=1, dig_stone = 1, pickaxey=5},
-	_mcl_hardness=1.6,
+	groups = {cracky=1, concrete=1, dig_stone = 1},
 	sounds = sound_api.node_sound_stone_defaults(),
 })
 
@@ -29,8 +27,7 @@ minetest.register_node("basic_materials:chain_steel", {
 	sunlight_propagates = true,
 	paramtype = "light",
 	inventory_image = "basic_materials_chain_steel_inv.png",
-	groups = {cracky=3, dig_stone = 1, pickaxey=5},
-	_mcl_hardness=1.6,
+	groups = {cracky=3, dig_stone = 1},
 	selection_box = chains_sbox,
 })
 
@@ -44,8 +41,7 @@ minetest.register_node("basic_materials:chain_brass", {
 	sunlight_propagates = true,
 	paramtype = "light",
 	inventory_image = "basic_materials_chain_brass_inv.png",
-	groups = {cracky=3, dig_stone = 1, pickaxey=5},
-	_mcl_hardness=1.6,
+	groups = {cracky=3, dig_stone = 1},
 	selection_box = chains_sbox,
 })
 
@@ -53,7 +49,6 @@ minetest.register_node("basic_materials:brass_block", {
 	description = S("Brass Block"),
 	tiles = { "basic_materials_brass_block.png" },
 	is_ground_content = false,
-	groups = {cracky=1, dig_stone = 1, pickaxey=5},
-	_mcl_hardness=1.6,
+	groups = {cracky=1, dig_stone = 1},
 	sounds = sound_api.node_sound_metal_defaults()
 })