From 0724b0dda9bba5ec9b7bd36c847ae2c1edc366b7 Mon Sep 17 00:00:00 2001
From: Niklp <89982526+Niklp09@users.noreply.github.com>
Date: Wed, 29 Jun 2022 14:02:38 +0200
Subject: [PATCH] fix and add crafting recipes (#10)

* fix and add crafting recipes

* Update home_vending_machines/crafts.lua

Co-authored-by: SX <50966843+S-S-X@users.noreply.github.com>

* fix luacheck warning

Co-authored-by: SX <50966843+S-S-X@users.noreply.github.com>
---
 .luacheckrc                      |  2 +-
 home_vending_machines/crafts.lua |  4 ++--
 home_vending_machines/mod.conf   |  3 ++-
 home_workshop_machines/init.lua  | 22 ++++++++++++++++++++++
 home_workshop_machines/mod.conf  |  3 +--
 modpack.conf                     |  1 +
 6 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/.luacheckrc b/.luacheckrc
index 8ceb8c3..784ff1a 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -21,5 +21,5 @@ read_globals = {
     "vector", "ItemStack", "dump", "DIR_DELIM", "VoxelArea", "Settings", "PcgRandom", "VoxelManip", "PseudoRandom",
 
     --mod produced
-    "default", "screwdriver", "unifieddyes", "computers",
+    "default", "screwdriver", "unifieddyes", "computers", "farming",
 }
\ No newline at end of file
diff --git a/home_vending_machines/crafts.lua b/home_vending_machines/crafts.lua
index 2990b29..7bd123b 100644
--- a/home_vending_machines/crafts.lua
+++ b/home_vending_machines/crafts.lua
@@ -9,7 +9,7 @@ if minetest.get_modpath("default") then
             },
         })
     end
-    if minetest.get_modpath("vessel") then
+    if minetest.get_modpath("vessels") then
         minetest.register_craft({
             output = "home_vending_machines:drink_machine",
             recipe = {
@@ -19,7 +19,7 @@ if minetest.get_modpath("default") then
             },
         })
     end
-    if minetest.get_modpath("farming") then
+    if farming and farming.mod == "redo" then
         minetest.register_craft({
             output = "home_vending_machines:sweet_machine",
             recipe = {
diff --git a/home_vending_machines/mod.conf b/home_vending_machines/mod.conf
index 6ca3f1a..b39b636 100644
--- a/home_vending_machines/mod.conf
+++ b/home_vending_machines/mod.conf
@@ -1 +1,2 @@
-optional_depends = screwdriver
\ No newline at end of file
+name = home_vending_machines
+optional_depends = screwdriver, default, dye, vessels, farming
\ No newline at end of file
diff --git a/home_workshop_machines/init.lua b/home_workshop_machines/init.lua
index 3bcab6d..551031d 100644
--- a/home_workshop_machines/init.lua
+++ b/home_workshop_machines/init.lua
@@ -61,6 +61,28 @@ minetest.register_node("home_workshop_machines:3dprinter_corexy", {
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 })
 
+if minetest.get_modpath("basic_materials") then
+	minetest.register_craft({
+		output = "home_workshop_machines:3dprinter_bedflinger",
+		recipe = {
+			{"basic_materials:plastic_sheet", "dye:white", "basic_materials:plastic_sheet"},
+			{"basic_materials:motor", "basic_materials:heating_element", "basic_materials:motor"},
+			{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
+		},
+	})
+end
+
+if minetest.get_modpath("basic_materials") then
+	minetest.register_craft({
+		output = "home_workshop_machines:3dprinter_corexy",
+		recipe = {
+			{"default:steel_ingot", "basic_materials:motor", "basic_materials:plastic_sheet"},
+			{"default:glass", "basic_materials:heating_element", "default:glass"},
+			{"default:steel_ingot", "basic_materials:motor", "default:steel_ingot"},
+		},
+	})
+end
+
 minetest.register_alias("computer:3dprinter_bedflinger",  "home_workshop_machines:3dprinter_bedflinger")
 minetest.register_alias("computers:3dprinter_bedflinger", "home_workshop_machines:3dprinter_bedflinger")
 minetest.register_alias("computer:3dprinter_corexy",      "home_workshop_machines:3dprinter_corexy")
diff --git a/home_workshop_machines/mod.conf b/home_workshop_machines/mod.conf
index 2bcc916..1145336 100644
--- a/home_workshop_machines/mod.conf
+++ b/home_workshop_machines/mod.conf
@@ -1,4 +1,3 @@
 name = home_workshop_machines
 depends = unifieddyes
-optional_depends = default
-optional_depends = screwdriver
+optional_depends = default, screwdriver, dye, basic_materials
diff --git a/modpack.conf b/modpack.conf
index e69de29..e13730e 100644
--- a/modpack.conf
+++ b/modpack.conf
@@ -0,0 +1 @@
+name = home_workshop_modpack
\ No newline at end of file