Merge https://github.com/h-v-smacker/technic

12 files changed, 93 insertions, 25 deletions

diff --git a/technic/machines/MV/init.lua b/technic/machines/MV/init.lua
index 66e2d45..804f81c 100644
--- a/technic/machines/MV/init.lua
+++ b/technic/machines/MV/init.lua
@@ -24,6 +24,8 @@ dofile(path.."/centrifuge.lua")
 
 dofile(path.."/tool_workshop.lua")
 
+dofile(path.."/thresher.lua")
+
 -- The power radiator supplies appliances with inductive coupled power:
 -- Lighting and associated textures is taken directly from VanessaE's homedecor and made electric.
 -- This is currently useless, slow, and mostly copied
diff --git a/technic/machines/MV/thresher.lua b/technic/machines/MV/thresher.lua
new file mode 100644
index 0000000..00fbf20
--- /dev/null
+++ b/technic/machines/MV/thresher.lua
@@ -0,0 +1,16 @@
+minetest.register_craft({
+	output = "technic:mv_thresher",
+	recipe = {
+		{'technic:stainless_steel_ingot', 'technic:motor',          'technic:stainless_steel_ingot'},
+		{'pipeworks:tube_1',              'technic:machine_casing', 'pipeworks:tube_1'},
+		{'technic:stainless_steel_ingot', 'technic:mv_cable',       'technic:stainless_steel_ingot'},
+	}
+})
+
+technic.register_thresher({
+	tier = "MV",
+	demand = {700, 500, 350},
+	speed = 2,
+	upgrade = 1,
+	tube = 1,
+})
diff --git a/technic/machines/register/centrifuge_recipes.lua b/technic/machines/register/centrifuge_recipes.lua
index fb16d0c..925ed0d 100644
--- a/technic/machines/register/centrifuge_recipes.lua
+++ b/technic/machines/register/centrifuge_recipes.lua
@@ -25,31 +25,6 @@ for p = 1, 34 do
 	table.insert(recipes, { uranium_dust(p).." 2", uranium_dust(p-1), uranium_dust(p+1) })
 end
 
-if minetest.get_modpath("bushes_classic") then
-	for _, berry in ipairs({ "blackberry", "blueberry", "gooseberry", "raspberry", "strawberry" }) do
-		table.insert(recipes, { "bushes:"..berry.."_bush", "default:stick 20", "bushes:"..berry.." 4" })
-	end
-end
-
-if minetest.get_modpath("farming") then
-	if minetest.get_modpath("cottages") then
-		-- work as a mechanized threshing floor
-		table.insert(recipes, { "farming:wheat", "farming:seed_wheat", "cottages:straw_mat" })
-		table.insert(recipes, { "farming:barley", "farming:seed_barley", "cottages:straw_mat" })
-	else
-		-- work in a less fancy and less efficient manner
-		table.insert(recipes, { "farming:wheat 4", "farming:seed_wheat 3", "default:dry_shrub 1" })
-		table.insert(recipes, { "farming:barley 4", "farming:seed_barley 3", "default:dry_shrub 1" })
-	end
-end
-
--- using centfuge as a sorting machine for grass seeds
-table.insert(recipes, { "default:grass_1 99", "default:dry_grass_1 80", "default:dry_shrub 7", "default:junglegrass 12" })
-if minetest.get_modpath("ethereal") then
-	table.insert(recipes, { "default:junglegrass 99", "ethereal:dry_shrub 10", "ethereal:crystalgrass 5", "ethereal:snowygrass 5" })
-	table.insert(recipes, { "default:dry_grass_1 99", "ethereal:fern 5" })
-end
-
 
 for _, data in pairs(recipes) do
 	technic.register_separating_recipe({ input = { data[1] }, output = { data[2], data[3], data[4] } })
diff --git a/technic/machines/register/init.lua b/technic/machines/register/init.lua
index 1667d75..3356fe5 100644
--- a/technic/machines/register/init.lua
+++ b/technic/machines/register/init.lua
@@ -20,6 +20,7 @@ dofile(path.."/grinder_recipes.lua")
 dofile(path.."/extractor_recipes.lua")
 dofile(path.."/compressor_recipes.lua")
 dofile(path.."/centrifuge_recipes.lua")
+dofile(path.."/thresher_recipes.lua")
 
 -- Multi-Machine Recipes
 dofile(path.."/grindings.lua")
@@ -31,3 +32,5 @@ dofile(path.."/grinder.lua")
 dofile(path.."/extractor.lua")
 dofile(path.."/compressor.lua")
 dofile(path.."/centrifuge.lua")
+
+dofile(path.."/thresher.lua")
diff --git a/technic/machines/register/thresher.lua b/technic/machines/register/thresher.lua
new file mode 100644
index 0000000..62f2404
--- /dev/null
+++ b/technic/machines/register/thresher.lua
@@ -0,0 +1,8 @@
+local S = technic.getter
+
+function technic.register_thresher(data)
+	data.typename = "threshing"
+	data.machine_name = "thresher"
+	data.machine_desc = S("%s Thresher")
+	technic.register_base_machine(data)
+end
diff --git a/technic/machines/register/thresher_recipes.lua b/technic/machines/register/thresher_recipes.lua
new file mode 100644
index 0000000..3b43766
--- /dev/null
+++ b/technic/machines/register/thresher_recipes.lua
@@ -0,0 +1,62 @@
+-- the thresher should take the agricultural functions away from the centrifuge
+
+local S = technic.getter
+
+technic.register_recipe_type("threshing", {
+	description = S("Threshing"),
+	output_size = 2,
+})
+
+function technic.register_threshing_recipe(data)
+	data.time = data.time or 2
+	technic.register_recipe("threshing", data)
+end
+
+local recipes = {
+}
+
+if minetest.get_modpath("bushes_classic") then
+	for _, berry in ipairs({ "blackberry", "blueberry", "gooseberry", "raspberry", "strawberry" }) do
+		table.insert(recipes, { input = "bushes:"..berry.."_bush", 
+		                        output = {"default:stick 20", "bushes:"..berry.." 4" }})
+	end
+end
+
+if minetest.get_modpath("farming") then
+	
+	table.insert(recipes, { input = "farming:hemp_leaf", 
+	                        output = {"farming:hemp_fibre"}})
+	
+	if minetest.get_modpath("cottages") then
+		-- work as a mechanized threshing floor from cottages
+		table.insert(recipes, { input = "farming:wheat", 
+		                        output = {"farming:seed_wheat", "cottages:straw_mat"} })
+		table.insert(recipes, { input = "farming:barley", 
+		                        output = {"farming:seed_barley", "cottages:straw_mat"} })
+	else
+		-- work in a less fancy and less efficient manner
+		table.insert(recipes, { input = "farming:wheat 4", 
+		                        output = {"farming:seed_wheat 3", "default:dry_shrub 1"} })
+		table.insert(recipes, { input = "farming:barley 4", 
+		                        output = { "farming:seed_barley 3", "default:dry_shrub 1"} })
+	end
+end
+
+-- using thresher as a sorting machine for grass seeds
+table.insert(recipes, { input = "default:grass_1 99", 
+                        output = {"default:dry_grass_1 80", "default:dry_shrub 7", "default:junglegrass 12"}, 
+                        time = 16 })
+
+if minetest.get_modpath("ethereal") then
+	table.insert(recipes, { input = "default:junglegrass 99", 
+	                        output = {"ethereal:dry_shrub 10", "ethereal:crystalgrass 5", "ethereal:snowygrass 5" }, 
+	                        time = 16 })
+	table.insert(recipes, { input = "default:dry_grass_1 99", 
+	                        output = {"ethereal:fern 5"}, 
+	                        time = 16 })
+end
+
+
+for _,data in ipairs(recipes) do
+	technic.register_threshing_recipe({input = {data.input}, output = data.output, time = data.time})
+end
diff --git a/technic/textures/technic_mv_thresher_bottom.png b/technic/textures/technic_mv_thresher_bottom.png
new file mode 100644
index 0000000..2c0aaee
--- /dev/null
+++ b/technic/textures/technic_mv_thresher_bottom.png
diff --git a/technic/textures/technic_mv_thresher_front.png b/technic/textures/technic_mv_thresher_front.png
new file mode 100644
index 0000000..71e1048
--- /dev/null
+++ b/technic/textures/technic_mv_thresher_front.png
diff --git a/technic/textures/technic_mv_thresher_front_active.png b/technic/textures/technic_mv_thresher_front_active.png
new file mode 100644
index 0000000..224afdb
--- /dev/null
+++ b/technic/textures/technic_mv_thresher_front_active.png
diff --git a/technic/textures/technic_mv_thresher_side.png b/technic/textures/technic_mv_thresher_side.png
new file mode 100644
index 0000000..821ee58
--- /dev/null
+++ b/technic/textures/technic_mv_thresher_side.png
diff --git a/technic/textures/technic_mv_thresher_top.png b/technic/textures/technic_mv_thresher_top.png
new file mode 100644
index 0000000..7fa4553
--- /dev/null
+++ b/technic/textures/technic_mv_thresher_top.png
diff --git a/technic/tools/walking_tractor.lua b/technic/tools/walking_tractor.lua
index 88e89c3..1f40a4b 100644
--- a/technic/tools/walking_tractor.lua
+++ b/technic/tools/walking_tractor.lua
@@ -60,6 +60,8 @@ local ripe_for_harvest = {
 	-- mushrooms
 	"flowers:mushroom_red",
 	"flowers:mushroom_brown",
+	-- agave
+	"wine:blue_agave",
 }
 
 local compatible_soils = {