Hades branch improvements (#12)

* 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>

* formatting fixes

Co-authored-by: sfence <sfence.software@gmail.com>
Co-authored-by: OgelGames <olliverdc28@gmail.com>

craftitems.lua

@@ -128,3 +128,10 @@ minetest.register_craftitem("basic_materials:padlock", {
 	description = S("Padlock"),
 	inventory_image = "basic_materials_padlock.png"
 })
+
+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("hades_extramaterials:silicon", "hades_materials:silicon")
+end
+

crafts.lua

@@ -13,6 +13,7 @@ local materials = {
 	water_bucket = "bucket:bucket_water",
 	empty_bucket = "bucket:bucket_empty",
 	dye_dark_grey = "dye:dark_grey",
+	silicon = "mesecons_materials:silicon",
 }
 
 if minetest.get_modpath("mcl_core") then
@@ -29,10 +30,11 @@ if minetest.get_modpath("mcl_core") then
 		water_bucket = "mcl_buckets:bucket_water",
 		empty_bucket = "mcl_buckets:bucket_empty",
 		dye_dark_grey = "mcl_dye:dark_grey",
-        --use iron where no equivalent
+		-- 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 = {
@@ -51,10 +53,11 @@ elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then
 		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("hades_core") then
 	materials = {
-        dirt = "fl_topsoil:dirt",
+		dirt = "hades_core:dirt",
 		sand = "hades_core:fertile_sand",
 		gravel = "hades_core:gravel",
 		steel_ingot = "hades_core:steel_ingot",
@@ -63,36 +66,43 @@ elseif minetest.get_modpath("hades_core") then
 		torch = "hades_torches:torch",
 		diamond = "hades_core:diamond",
 		clay_lump = "hades_core:clay_lump",
-        dye_dark_grey = "dye:dark_grey_dye",
+		dye_dark_grey = "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,
+			Since hades doesnt have buckets or water for the user,
 			using dirt from near water to pull the water out
 		]]
-        water_bucket = "hades_core:fertile_sand",
+		water_bucket = "hades_core:dirt",
-        empty_bucket = "hades_core:dirt",
+		empty_bucket = "hades_core:fertile_sand",
-        --set this to steel unless hadesextraores is present
+		-- 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"
 	end
 end
 
---craft recipes
+local have_hades_materials = minetest.get_modpath("hades_materials")
+
+-- Craft recipes
 minetest.register_craft({
 	output = "basic_materials:chainlink_brass 12",
 	recipe = {
 		{"", "basic_materials:brass_ingot", "basic_materials:brass_ingot"},
-		{ "basic_materials:brass_ingot", "", "basic_materials:brass_ingot" },
+		{"basic_materials:brass_ingot", "", "basic_materials:brass_ingot"},
-		{ "basic_materials:brass_ingot", "basic_materials:brass_ingot", "" },
+		{"basic_materials:brass_ingot", "basic_materials:brass_ingot", ""},
 	},
 })
 
 minetest.register_craft({
-	output = 'basic_materials:chain_steel 2',
+	output = "basic_materials:chain_steel 2",
 	recipe = {
 		{"basic_materials:chainlink_steel"},
 		{"basic_materials:chainlink_steel"},
@@ -101,7 +111,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'basic_materials:chain_brass 2',
+	output = "basic_materials:chain_brass 2",
 	recipe = {
 		{"basic_materials:chainlink_brass"},
 		{"basic_materials:chainlink_brass"},
@@ -112,46 +122,55 @@ minetest.register_craft({
 minetest.register_craft( {
 	type = "shapeless",
 	output = "basic_materials:brass_ingot 9",
-	recipe = { "basic_materials:brass_block" },
+	recipe = {"basic_materials:brass_block"},
 })
 
 minetest.register_craft( {
 	output = "basic_materials:brass_block",
 	recipe = {
-		{ "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" },
+		{"basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot"},
-		{ "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" },
+		{"basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot"},
-		{ "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" },
+		{"basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot"},
 	},
 })
 
 minetest.register_craft( {
 	output = "basic_materials:plastic_strip 9",
 	recipe = {
-		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+		{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"}
 	},
 })
 
 minetest.register_craft( {
 	output = "basic_materials:empty_spool 3",
 	recipe = {
-		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+		{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"},
-		{ "", "basic_materials:plastic_sheet", "" },
+		{"", "basic_materials:plastic_sheet", ""},
-		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+		{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"}
 	},
 })
 
+if have_hades_materials then
+	minetest.clear_craft({
+	type = "shapeless",
+	recipe = {"group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves"}
+	})
+end
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "basic_materials:oil_extract 2",
 	recipe = {"group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves"}
 })
 
---cooking recipes
+-- Cooking recipes
-minetest.register_craft({
+if not have_hades_materials then
+	minetest.register_craft({
 	type = "cooking",
 	output = "basic_materials:plastic_sheet",
 	recipe = "basic_materials:paraffin",
-})
+	})
+end
 
 minetest.register_craft({
 	type = "cooking",
@@ -166,7 +185,7 @@ minetest.register_craft({
 	cooktime = 8
 })
 
---fuel recipes
+-- Fuel recipes
 minetest.register_craft({
 	type = "fuel",
 	recipe = "basic_materials:plastic_sheet",
@@ -186,31 +205,31 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-    output = 'basic_materials:concrete_block 6',
+	output = "basic_materials:concrete_block 6",
 	recipe = {
-        {'group:sand',                'basic_materials:wet_cement', materials.gravel},
+		{"group:sand", "basic_materials:wet_cement", materials.gravel},
-        {'basic_materials:steel_bar', 'basic_materials:wet_cement', 'basic_materials:steel_bar'},
+		{"basic_materials:steel_bar", "basic_materials:wet_cement", "basic_materials:steel_bar"},
-        {materials.gravel,            'basic_materials:wet_cement', 'group:sand'},
+		{materials.gravel, "basic_materials:wet_cement", "group:sand"},
 	}
 })
 
 minetest.register_craft( {
 	output = "basic_materials:motor 2",
 	recipe = {
-        { materials.mese_crystal_fragment, "basic_materials:copper_wire", "basic_materials:plastic_sheet" },
+		{materials.mese_crystal_fragment, "basic_materials:copper_wire", "basic_materials:plastic_sheet"},
-        { materials.copper_ingot,          materials.steel_ingot,         materials.steel_ingot },
+		{materials.copper_ingot, materials.steel_ingot, materials.steel_ingot},
-        { materials.mese_crystal_fragment, "basic_materials:copper_wire", "basic_materials:plastic_sheet" }
+		{materials.mese_crystal_fragment, "basic_materials:copper_wire", "basic_materials:plastic_sheet"}
 	},
 	replacements = {
-        { "basic_materials:copper_wire", "basic_materials:empty_spool" },
+		{"basic_materials:copper_wire", "basic_materials:empty_spool"},
-        { "basic_materials:copper_wire", "basic_materials:empty_spool" },
+		{"basic_materials:copper_wire", "basic_materials:empty_spool"},
 	}
 })
 
 minetest.register_craft( {
 	output = "basic_materials:heating_element 2",
 	recipe = {
-        { materials.copper_ingot, materials.mese_crystal_fragment, materials.copper_ingot }
+		{materials.copper_ingot, materials.mese_crystal_fragment, materials.copper_ingot}
 	},
 })
 
@@ -218,8 +237,8 @@ minetest.register_craft({
 	--type = "shapeless",
 	output = "basic_materials:energy_crystal_simple 2",
 	recipe = {
-        { materials.mese_crystal_fragment, materials.torch, materials.mese_crystal_fragment },
+		{materials.mese_crystal_fragment, materials.torch, materials.mese_crystal_fragment},
-        { materials.diamond, materials.gold_ingot, materials.diamond }
+		{materials.diamond, materials.gold_ingot, materials.diamond}
 	},
 })
 
@@ -256,34 +275,34 @@ minetest.register_craft( {
 minetest.register_craft( {
 	output = "basic_materials:steel_strip 12",
 	recipe = {
-        { "", materials.steel_ingot, "" },
+		{"", materials.steel_ingot, ""},
-        { materials.steel_ingot, "", "" },
+		{materials.steel_ingot, "", ""},
 	},
 })
 
 minetest.register_craft( {
 	output = "basic_materials:copper_strip 12",
 	recipe = {
-        { "", materials.copper_ingot, "" },
+		{"", materials.copper_ingot, ""},
-        { materials.copper_ingot, "", "" },
+		{materials.copper_ingot, "", ""},
 	},
 })
 
 minetest.register_craft( {
 	output = "basic_materials:steel_bar 6",
 	recipe = {
-        { "", "", materials.steel_ingot },
+		{"", "", materials.steel_ingot},
-        { "", materials.steel_ingot, "" },
+		{"", materials.steel_ingot, ""},
-        { materials.steel_ingot, "", "" },
+		{materials.steel_ingot, "", ""},
 	},
 })
 
 minetest.register_craft( {
 	output = "basic_materials:padlock 2",
 	recipe = {
-        { "basic_materials:steel_bar" },
+		{"basic_materials:steel_bar"},
-        { materials.steel_ingot },
+		{materials.steel_ingot},
-        { materials.steel_ingot },
+		{materials.steel_ingot},
 	},
 })
 
@@ -291,17 +310,17 @@ minetest.register_craft({
 	output = "basic_materials:chainlink_steel 12",
 	recipe = {
 		{"", materials.steel_ingot, materials.steel_ingot},
-        { materials.steel_ingot, "", materials.steel_ingot },
+		{materials.steel_ingot, "", materials.steel_ingot},
-        { materials.steel_ingot, materials.steel_ingot, "" },
+		{materials.steel_ingot, materials.steel_ingot, ""},
 	},
 })
 
 minetest.register_craft( {
 	output = "basic_materials:gear_steel 6",
 	recipe = {
-        { "", materials.steel_ingot, "" },
+		{"", materials.steel_ingot, ""},
-        { materials.steel_ingot,"basic_materials:chainlink_steel", materials.steel_ingot },
+		{materials.steel_ingot,"basic_materials:chainlink_steel", materials.steel_ingot},
-        { "", materials.steel_ingot, "" }
+		{"", materials.steel_ingot, ""}
 	},
 })
 
@@ -329,19 +348,21 @@ minetest.register_craft({
 	replacements = {{materials.water_bucket, materials.empty_bucket}},
 })
 
-minetest.register_craft( {
+if not have_hades_materials then
-    output = "mesecons_materials:silicon 4",
+	minetest.register_craft( {
+		output = materials.silicon.." 4",
 		recipe = {
-        { materials.sand, materials.sand },
+			{materials.sand, materials.sand},
-        { materials.sand, materials.steel_ingot },
+			{materials.sand, materials.steel_ingot},
 		},
-})
+	})
+end
 
 minetest.register_craft( {
 	output = "basic_materials:ic 4",
 	recipe = {
-        { "mesecons_materials:silicon", "mesecons_materials:silicon" },
+		{materials.silicon, materials.silicon},
-        { "mesecons_materials:silicon", materials.copper_ingot },
+		{materials.silicon, materials.copper_ingot},
 	},
 })
 
@@ -359,7 +380,7 @@ minetest.register_craft( {
 	output = "basic_materials:silver_wire 2",
 	type = "shapeless",
 	recipe = {
-        "moreores:silver_ingot",
+		materials.silver_ingot,
 		"basic_materials:empty_spool",
 		"basic_materials:empty_spool",
 	},

mod.conf

@@ -1,3 +1,3 @@
 name = basic_materials
-optional_depends = moreores, default, mesecons_materials, dye, bucket, fl_stone, fl_trees, mcl_sounds, hades_sounds
+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