From 7d7fe7465c476f47a66f5bb9fabda0c5ea50d7fc Mon Sep 17 00:00:00 2001
From: SFENCE <sfence.software@gmail.com>
Date: Mon, 28 Feb 2022 15:56:44 +0100
Subject: [PATCH] Add hades_bucket to crafts. Fix some bugs.

---
 craftitems.lua | 28 +++++++++++++++++++---------
 crafts.lua     | 28 ++++++++++++++++++----------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/craftitems.lua b/craftitems.lua
index 553a974..a9051c6 100644
--- a/craftitems.lua
+++ b/craftitems.lua
@@ -1,9 +1,15 @@
 local S = minetest.get_translator("basic_materials")
 
-minetest.register_craftitem("basic_materials:plastic_sheet", {
-	description = S("Plastic sheet"),
-	inventory_image = "basic_materials_plastic_sheet.png",
-})
+local have_hades_materials = minetest.get_modpath("hades_materials")
+
+if not have_hades_materials then
+  minetest.register_craftitem("basic_materials:plastic_sheet", {
+    description = S("Plastic sheet"),
+    inventory_image = "basic_materials_plastic_sheet.png",
+  })
+else
+  minetest.register_alias("basic_materials:plastic_sheet", "hades_materials:plastic_sheeting");
+end
 
 minetest.register_craftitem("basic_materials:plastic_strip", {
 	description = S("Plastic strips"),
@@ -36,10 +42,14 @@ minetest.register_craftitem("basic_materials:wet_cement", {
 	inventory_image = "basic_materials_wet_cement.png",
 })
 
-minetest.register_craftitem("basic_materials:silicon", {
-	description = S("Silicon lump"),
-	inventory_image = "basic_materials_silicon.png",
-})
+if not have_hades_materials then
+  minetest.register_craftitem("basic_materials:silicon", {
+    description = S("Silicon lump"),
+    inventory_image = "basic_materials_silicon.png",
+  })
+else
+  minetest.register_alias("hades_extramaterials:silicon", "hades_materials:silicon");
+end
 
 minetest.register_craftitem("basic_materials:ic", {
 	description = S("Simple Integrated Circuit"),
@@ -127,4 +137,4 @@ minetest.register_craftitem("basic_materials:gear_steel", {
 minetest.register_craftitem("basic_materials:padlock", {
 	description = S("Padlock"),
 	inventory_image = "basic_materials_padlock.png"
-})
\ No newline at end of file
+})
diff --git a/crafts.lua b/crafts.lua
index 52dd255..18d0ca4 100644
--- a/crafts.lua
+++ b/crafts.lua
@@ -54,7 +54,7 @@ elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then
     }
 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",
@@ -76,11 +76,17 @@ elseif minetest.get_modpath("hades_core") then
         silver_ingot = "hades_core:steel_ingot",
     }
 
+    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
 
+local have_hades_materials = minetest.get_modpath("hades_materials")
+
 --craft recipes
 minetest.register_craft({
 	output = "basic_materials:chainlink_brass 12",
@@ -332,13 +338,15 @@ if not minetest.get_modpath("i3") then
     })
 end
 
-minetest.register_craft( {
-    output = "mesecons_materials:silicon 4",
-    recipe = {
-        { materials.sand, materials.sand },
-        { materials.sand, materials.steel_ingot },
-    },
-})
+if not have_hades_materials then
+    minetest.register_craft( {
+        output = "mesecons_materials:silicon 4",
+        recipe = {
+            { materials.sand, materials.sand },
+            { materials.sand, materials.steel_ingot },
+        },
+    })
+end
 
 minetest.register_craft( {
     output = "basic_materials:ic 4",
@@ -362,7 +370,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",
     },
@@ -376,4 +384,4 @@ minetest.register_craft( {
         materials.copper_ingot,
         materials.silver_ingot,
     },
-})
\ No newline at end of file
+})