From dfb7beb8b7ba1a336ae3d95b11c59c1d3672605c Mon Sep 17 00:00:00 2001
From: wsor4035 <24964441+wsor4035@users.noreply.github.com>
Date: Sun, 27 Feb 2022 17:43:13 -0500
Subject: [PATCH 1/3] add hades revisted crafts and update sound api for sounds
 (#10)

* add hades revisted crafts and update sound api for sounds
---
 crafts.lua     | 27 +++++++++++++++++++++++++++
 mod.conf       |  2 +-
 sound_api_core |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/crafts.lua b/crafts.lua
index d58e280..52dd255 100644
--- a/crafts.lua
+++ b/crafts.lua
@@ -52,6 +52,33 @@ elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then
         tin_ingot = "fl_ores:tin_ingot",
         silver_ingot = "fl_ores:iron_ingot",
     }
+elseif minetest.get_modpath("hades_core") then
+    materials = {
+        dirt = "fl_topsoil: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 = "dye:dark_grey_dye",
+        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:fertile_sand",
+        empty_bucket = "hades_core:dirt",
+        --set this to steel unless hadesextraores is present
+        silver_ingot = "hades_core:steel_ingot",
+    }
+
+    if minetest.get_modpath("hades_extraores") then
+        materials["silver_ingot"] = "hades_extraores:silver_ingot"
+    end
 end
 
 --craft recipes
diff --git a/mod.conf b/mod.conf
index aeffb54..6a16208 100644
--- a/mod.conf
+++ b/mod.conf
@@ -1,3 +1,3 @@
 name = basic_materials
-optional_depends = moreores, default, mesecons_materials, dye, bucket, fl_stone, fl_trees, mcl_sounds
+optional_depends = moreores, default, mesecons_materials, dye, bucket, fl_stone, fl_trees, mcl_sounds, hades_sounds
 min_minetest_version = 5.2.0
diff --git a/sound_api_core b/sound_api_core
index 87bd12d..6956e49 160000
--- a/sound_api_core
+++ b/sound_api_core
@@ -1 +1 @@
-Subproject commit 87bd12dd0facb4c58f8643b10f98a27dd112b21a
+Subproject commit 6956e49e775f325116f8e0c643899c089c691e1e

From 39d822252eb8c63e80b570630499b343efb111ff Mon Sep 17 00:00:00 2001
From: unknown <24964441+wsor4035@users.noreply.github.com>
Date: Sun, 27 Feb 2022 17:45:47 -0500
Subject: [PATCH 2/3] fix https://github.com/mt-mods/basic_materials/issues/9

---
 crafts.lua | 47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/crafts.lua b/crafts.lua
index 52dd255..a835363 100644
--- a/crafts.lua
+++ b/crafts.lua
@@ -305,32 +305,29 @@ minetest.register_craft( {
     },
 })
 
---i3 does has issues in its craft override with replacements
-if not minetest.get_modpath("i3") then
-    minetest.register_craft( {
-        type = "shapeless",
-        output = "basic_materials:terracotta_base 8",
-        recipe = {
-            materials.bucket_water,
-            materials.clay_lump,
-            materials.gravel,
-        },
-        replacements = {{materials.bucket_water, materials.bucket_empty}},
-    })
+minetest.register_craft( {
+    type = "shapeless",
+    output = "basic_materials:terracotta_base 8",
+    recipe = {
+        materials.bucket_water,
+        materials.clay_lump,
+        materials.gravel,
+    },
+    replacements = {{materials.water_bucket, materials.empty_bucket}},
+})
 
-    minetest.register_craft({
-        type = "shapeless",
-        output = "basic_materials:wet_cement 3",
-        recipe = {
-            materials.dirt,
-            materials.dark_grey,
-            materials.dark_grey,
-            materials.dark_grey,
-            materials.bucket_water
-        },
-        replacements = {{materials.bucket_water, materials.bucket_empty}},
-    })
-end
+minetest.register_craft({
+    type = "shapeless",
+    output = "basic_materials:wet_cement 3",
+    recipe = {
+        materials.dirt,
+        materials.dark_grey,
+        materials.dark_grey,
+        materials.dark_grey,
+        materials.bucket_water
+    },
+    replacements = {{materials.water_bucket, materials.empty_bucket}},
+})
 
 minetest.register_craft( {
     output = "mesecons_materials:silicon 4",

From 1f8085b8c34adb6312de0c40e583885aa9cc5bbd Mon Sep 17 00:00:00 2001
From: unknown <24964441+wsor4035@users.noreply.github.com>
Date: Sun, 27 Feb 2022 18:37:28 -0500
Subject: [PATCH 3/3] fix https://github.com/mt-mods/basic_materials/issues/9
 part 2

---
 crafts.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/crafts.lua b/crafts.lua
index a835363..bc33885 100644
--- a/crafts.lua
+++ b/crafts.lua
@@ -309,7 +309,7 @@ minetest.register_craft( {
     type = "shapeless",
     output = "basic_materials:terracotta_base 8",
     recipe = {
-        materials.bucket_water,
+        materials.water_bucket,
         materials.clay_lump,
         materials.gravel,
     },
@@ -321,10 +321,10 @@ minetest.register_craft({
     output = "basic_materials:wet_cement 3",
     recipe = {
         materials.dirt,
-        materials.dark_grey,
-        materials.dark_grey,
-        materials.dark_grey,
-        materials.bucket_water
+        materials.dye_dark_grey,
+        materials.dye_dark_grey,
+        materials.dye_dark_grey,
+        materials.water_bucket
     },
     replacements = {{materials.water_bucket, materials.empty_bucket}},
 })