Merge pull request #192 from dacmot/main

Replace sound_api with xcompat

.gitmodules

@@ -229,9 +229,6 @@
 [submodule "builder/mods_src/libs/sfcraftguide"]
 	path = builder/mods_src/libs/sfcraftguide
 	url = https://github.com/dacmot/sfcraftguide.git
-[submodule "builder/mods_src/libs/sound_api"]
-	path = builder/mods_src/libs/sound_api
-	url = https://github.com/mt-mods/sound_api.git
 [submodule "builder/mods_src/libs/ediblestuff_api"]
 	path = builder/mods_src/libs/ediblestuff_api
 	url = https://github.com/Lazerbeak12345/ediblestuff_api.git
@@ -256,3 +253,6 @@
 [submodule "builder/mods_src/tools/supercub"]
 	path = builder/mods_src/tools/supercub
 	url = https://github.com/APercy/supercub.git
+[submodule "builder/mods_src/libs/xcompat"]
+	path = builder/mods_src/libs/xcompat
+	url = https://github.com/mt-mods/xcompat.git

builder/lib-config-whynot.sh

@@ -6,10 +6,6 @@
   declare -Ag BRANCHES=(
     [minetest_game/minetest_game]=origin/stable-5 # Stay on stable version
     [flora_ores/farming]=0b06c7cd450c5ec9a76b3c22a9c57f06e4f8a7c2 # freeze due to incompatibility with milk buckets
-    [decor/basic_materials]=1009295ee68c490e388302d0600f293685226b67 # freeze until addition of xcompat
-    [decor/home_workshop_modpack]=4b5e58331c8ecf6d6f1f23b5e8b8b167dc772069 # freeze until addition of xcompat
-    [decor/homedecor_modpack]=52f7c54702c58bccec2877cb67dbcfa87cd83ace # freeze until addition of xcompat
-    [libs/sound_api]=d13501cc10059149cde3c266df7e623556e9a5ef # freeze until addition of xcompat
   )
 
   #

mod_sources.txt

@@ -20,7 +20,7 @@ origin https://github.com/Ezhh/abriglass/ (fetch)
 Mod: decor/abriglass
 
 origin https://github.com/mt-mods/basic_materials (fetch)
-* 1009295ee68c490e388302d0600f293685226b67 Add mcl_copper support (#22)
+* 800310c0fa2522d04409d95676d1d0e9ed3964db nodes aren't ground content (#26)
 Mod: decor/basic_materials
 
 origin https://github.com/Napiophelios/campfire (fetch)
@@ -44,11 +44,11 @@ origin https://github.com/HybridDog/heads (fetch)
 Mod: decor/heads
 
 origin https://github.com/mt-mods/home_workshop_modpack (fetch)
-* 4b5e58331c8ecf6d6f1f23b5e8b8b167dc772069 nodes that aren't ground content (#16)
+* c3f11977c710f6ef626f1f11d2920fbdb773a187 remove default checks from before loading craft files (#19)
 Mod: decor/home_workshop_modpack
 
 origin https://github.com/mt-mods/homedecor_modpack (fetch)
-* 52f7c54702c58bccec2877cb67dbcfa87cd83ace Fix particlespawner removal when digging fancy fire
+* d400e421cefef866cdec217e4c6c81b1328c8eab Replace `homedecor_blanktile.png` w/ engine provided `blank.png` (#69)
 Mod: decor/homedecor_modpack
 
 origin https://codeberg.org/Dacmot/minetest-laptop.git (fetch)
@@ -155,9 +155,9 @@ origin https://github.com/dacmot/sfcraftguide.git (fetch)
 * ed75268b9e4a7b04df2c942c1bc389b31ecbde4a Add supported games
 Mod: libs/sfcraftguide
 
-origin https://github.com/mt-mods/sound_api.git (fetch)
-* d13501cc10059149cde3c266df7e623556e9a5ef Avoid crash when sound_api function for a key is undefined (#4)
-Mod: libs/sound_api
+origin https://github.com/mt-mods/xcompat.git (fetch)
+* 3da43ebf4e2338137379c8c2d705da2a536115fa adds stuff for home workshop game agnostic pr (#16)
+Mod: libs/xcompat
 
 origin https://github.com/Treer/cloudlands/ (fetch)
 * aed3ab8306ef92a47f228c7ea4577eae7bb00e67 fix ancient portalstone upgrade

mods/decor/basic_materials/.luacheckrc

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

mods/decor/basic_materials/README.md

@@ -20,11 +20,4 @@ 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`
-* `git submodule init`
-* `git submodule update`
-
-to update please use the following commands starting inside the mod directory
-
-* `git submodule sync`
-* `git submodule update`
+* `cd basic_materials`

mods/decor/basic_materials/crafts.lua

@@ -1,139 +1,4 @@
-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("techage") then
-	materials.aluminum_ingot = "techage:aluminum"
-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",
-	}
-	if minetest.get_modpath("mcl_copper") then
-		materials.copper_ingot = "mcl_copper:copper_ingot"
-	end
-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 materials = xcompat.materials
 
 local have_hades_materials = minetest.get_modpath("hades_materials")
 
@@ -527,7 +392,7 @@ register_craft({
 
 if not have_hades_materials then
 	register_craft( {
-		output = materials.silicon.." 4",
+		output = "basic_materials:silicon 4",
 		recipe = {
 			{materials.sand, materials.sand},
 			{materials.sand, materials.steel_ingot},
@@ -538,8 +403,8 @@ end
 register_craft( {
 	output = "basic_materials:ic 4",
 	recipe = {
-		{materials.silicon, materials.silicon},
-		{materials.silicon, materials.copper_ingot},
+		{"basic_materials:silicon", "basic_materials:silicon"},
+		{"basic_materials:silicon", materials.copper_ingot},
 	},
 })
 

mods/decor/basic_materials/mod.conf

@@ -1,3 +1,4 @@
 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, mcl_core, mcl_copper
 min_minetest_version = 5.2.0

mods/decor/basic_materials/nodes.lua

@@ -1,11 +1,11 @@
 local S = minetest.get_translator("basic_materials")
-local sound_api = dofile(basic_materials.modpath .. "/sound_api_core/init.lua")
+local sound_api = xcompat.sounds
 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 = true,
+	is_ground_content = false,
 	groups = {cracky=2, dig_stone = 1, pickaxey=5},
 	_mcl_hardness=1.6,
 	sounds = sound_api.node_sound_stone_defaults(),
@@ -14,6 +14,7 @@ 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(),
@@ -29,6 +30,7 @@ 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,
@@ -44,6 +46,7 @@ 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,