From eb7d9fd4f678f470e0e590427741ca26add7f366 Mon Sep 17 00:00:00 2001
From: Kazooo100 <106842463+Kazooo100@users.noreply.github.com>
Date: Sat, 25 May 2024 14:45:57 -0400
Subject: [PATCH] Added flint, bowls, aspen/birch(planks, logs, leaves) and
 apple/oak(planks, logs) (#21)

Co-authored-by: wsor4035 <24964441+wsor4035@users.noreply.github.com>
---
 src/materials.lua | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/materials.lua b/src/materials.lua
index e8c88f5..b873578 100644
--- a/src/materials.lua
+++ b/src/materials.lua
@@ -2,6 +2,7 @@ local materials = {
     sand = "default:sand",
     sandstone = "default:sandstone",
     gravel = "default:gravel",
+    flint = "default:flint",
     copper_ingot = "default:copper_ingot",
     steel_ingot = "default:steel_ingot",
     gold_ingot = "default:gold_ingot",
@@ -66,9 +67,21 @@ local materials = {
     dirt = "default:dirt",
     dirt_with_grass = "default:dirt_with_grass",
     apple_leaves = "default:leaves",
+    apple_log = "default:tree",
+    apple_planks = "default:wood",
+    birch_leaves = "default:aspen_leaves",
+    birch_log = "default:aspen_tree",
+    birch_planks = "default:aspen_wood",
     jungle_leaves = "default:jungleleaves",
+    bowl = "",
 }
 
+if minetest.registered_items["farming:bowl"] then
+    materials.bowl = "farming:bowl"
+elseif minetest.get_modpath("x_farming") then
+    materials.bowl = "x_farming:bowl"
+end
+
 if minetest.get_modpath("moreores") then
     materials.silver_ingot = "moreores:silver_ingot"
 end
@@ -92,6 +105,7 @@ if minetest.get_modpath("mcl_core") then
         sand = "mcl_core:sand",
         sandstone = "mcl_core:sandstone",
         gravel = "mcl_core:gravel",
+        flint = "mcl_core:flint",
         copper_ingot = "mcl_copper:copper_ingot",
         steel_ingot = "mcl_core:iron_ingot",
         gold_ingot = "mcl_core:gold_ingot",
@@ -155,13 +169,20 @@ if minetest.get_modpath("mcl_core") then
         dirt = "mcl_core:dirt",
         dirt_with_grass = "mcl_core:dirt_with_grass",
         apple_leaves = "mcl_trees:leaves_oak",
-        jungle_leaves = "mcl_trees:leaves_jungle",
+        apple_log = "mcl_trees:tree_oak",
+        apple_planks = "mcl_trees:wood_oak",
+        birch_leaves = "mcl_trees:leaves_birch",
+        birch_log = "mcl_trees:tree_birch",
+        birch_planks = "mcl_trees:wood_birch",
+        jungle_leaves = "mcl_trees:jungle_leaves",
+        bowl = "mcl_core:bowl",
     }
 elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then
     materials = {
         sand = "fl_stone:sand",
         sandstone = "fl_stone:sandstone",
         gravel = "fl_topsoil:gravel",
+        flint = "fl_topsoil:flint",
         copper_ingot = "fl_ores:copper_ingot",
         steel_ingot = "fl_ores:iron_ingot",
         gold_ingot = "fl_ores:gold_ingot",
@@ -225,13 +246,20 @@ elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then
         dirt = "fl_stone:dirt",
         dirt_with_grass = "fl_topsoil:dirt_with_grass",
         apple_leaves = "fl_trees:apple_leaves",
+        apple_log = "fl_trees:apple_trunk",
+        apple_planks = "fl_trees:apple_plank",
+        birch_leaves = "fl_trees:aspen_leaves",
+        birch_log = "fl_trees:aspen_trunk",
+        birch_planks = "fl_trees:aspen_plank",
         jungle_leaves = "fl_trees:jungletree_leaves",
+        bowl = "",
     }
 elseif minetest.get_modpath("hades_core") then
     materials = {
         sand = "hades_core:fertile_sand",
         sandstone = "hades_core:sandstone",
         gravel = "hades_core:gravel",
+        flint = "",
         copper_ingot = "hades_core:copper_ingot",
         steel_ingot = "hades_core:steel_ingot",
         gold_ingot = "hades_core:gold_ingot",
@@ -303,7 +331,14 @@ elseif minetest.get_modpath("hades_core") then
         dirt = "hades_core:dirt",
         dirt_with_grass = "hades_core:dirt_with_grass",
         apple_leaves = "hades_trees:leaves",
+        apple_log = "hades_trees:tree",
+        apple_planks = "hades_trees:wood",
+        birch_leaves = "hades_core:birch_leaves",
+        birch_log = "hades_trees:birch_tree",
+        birch_planks = "hades_trees:cream_wood",
         jungle_leaves = "hades_trees:jungle_leaves",
+--hades has no bowl but you get plate on eat so makes most sense?
+        bowl = "hades_food:plate",
     }
 
     if minetest.get_modpath("hades_bucket") then
@@ -324,4 +359,4 @@ elseif minetest.get_modpath("hades_core") then
 	end
 end
 
-return materials
\ No newline at end of file
+return materials