From 22d8aa7a411af0ef50146eff5bfe4d0d5678bf56 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Mon, 16 Jan 2017 19:10:18 +0100
Subject: [PATCH] Add different boat types

---
 mods/craftingpack/crafting/creative.lua |  2 +-
 mods/mcl_boats/init.lua                 | 66 ++++++++++++++-----------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/mods/craftingpack/crafting/creative.lua b/mods/craftingpack/crafting/creative.lua
index 5fd6fd6f2e..278e4ed83b 100644
--- a/mods/craftingpack/crafting/creative.lua
+++ b/mods/craftingpack/crafting/creative.lua
@@ -54,7 +54,7 @@ function set_inv(filter, player)
 						table.insert(creative_list, name)
 					end
 				elseif filter == "#rail" then
-					if string.find(string.lower(def.name), "rail") or string.find(string.lower(def.description), "rail") or string.find(string.lower(def.name), "cart") or string.find(string.lower(def.description), "cart") or string.find(string.lower(def.description), "boat") then
+					if def.groups.rail or def.groups.cart or def.groups.boat then
 						table.insert(creative_list, name)
 					end
 				elseif filter == "#misc" then
diff --git a/mods/mcl_boats/init.lua b/mods/mcl_boats/init.lua
index defc2d5e7b..90bc950d9e 100644
--- a/mods/mcl_boats/init.lua
+++ b/mods/mcl_boats/init.lua
@@ -22,7 +22,6 @@ local boat = {
 	collisionbox = {-1,-0.5,-1, 1,0.5,1},
 	visual = "mesh",
 	mesh = "mcl_boats_base.x",
-	textures = {"mcl_boats_texture.png"},
 
 	_driver = nil,
 	_v = 0,
@@ -134,38 +133,45 @@ function boat.on_step(self, dtime)
 	
 end
 
-minetest.register_entity("mcl_boats:boat", boat)
+local woods = { "", "_spruce", "_birch", "_jungle", "_dark", "_acacia" }
+local names = { "Oak Boat", "Spruce Boat", "Birch Boat", "Jungle Boat", "Dark Oak Boat", "Acacia Boat" }
+local craftstuffs = { "default:wood", "default:sprucewood", "default:birchwood", "default:junglewood", "default:darkwood", "default:acaciawood" }
 
-minetest.register_craftitem("mcl_boats:boat", {
-	description = "Boat",
-	inventory_image = "mcl_boats_inventory.png",
-	liquids_pointable = true,
-	groups = { boat = 1, },
+for w=1, #woods do
+	textures = {"mcl_boats_texture.png"},
+	minetest.register_entity("mcl_boats:boat"..woods[w], boat)
 
-	on_place = function(itemstack, placer, pointed_thing)
-		if pointed_thing.type ~= "node" then
-			return
-		end
-		if not is_water(pointed_thing.under) then
-			return
-		end
-		pointed_thing.under.y = pointed_thing.under.y+0.5
-		minetest.add_entity(pointed_thing.under, "mcl_boats:boat")
-		if not minetest.setting_getbool("creative_mode") then
-			itemstack:take_item()
-		end
-		return itemstack
-	end,
-})
+	minetest.register_craftitem("mcl_boats:boat"..woods[w], {
+		description = names[w],
+		inventory_image = "mcl_boats_inventory.png",
+		liquids_pointable = true,
+		groups = { boat = 1, },
 
-minetest.register_craft({
-	output = "mcl_boats:boat",
-	recipe = {
-		{"", "", ""},
-		{"default:wood", "", "default:wood"},
-		{"default:wood", "default:wood", "default:wood"},
-	},
-})
+		on_place = function(itemstack, placer, pointed_thing)
+			if pointed_thing.type ~= "node" then
+				return
+			end
+			if not is_water(pointed_thing.under) then
+				return
+			end
+			pointed_thing.under.y = pointed_thing.under.y+0.5
+			minetest.add_entity(pointed_thing.under, "mcl_boats:boat"..woods[w])
+			if not minetest.setting_getbool("creative_mode") then
+				itemstack:take_item()
+			end
+			return itemstack
+		end,
+	})
+
+	local c = craftstuffs[w]
+	minetest.register_craft({
+		output = "mcl_boats:boat",
+		recipe = {
+			{c, "", c},
+			{c, c, c},
+		},
+	})
+end
 
 minetest.register_craft({
 	type = "fuel",