Reworked unifiedyes to use my vessels mod

3 files changed, 128 insertions, 37 deletions

diff --git a/depends.txt b/depends.txt
index 6a4468d..0c34fc8 100644
--- a/depends.txt
+++ b/depends.txt
@@ -1,3 +1,4 @@
 default
 flowers
+vessels
 bucket
diff --git a/init.lua b/init.lua
index bd9685a..d5efaf3 100644
--- a/init.lua
+++ b/init.lua
@@ -2,46 +2,32 @@
 --
 -- License: GPL
 --
--- This mod depends on ironzorg's flowers mod
---
+-- This mod depends on ironzorg's flowers mod and my Vessels mod.
 
---===========================================================================
--- First you need something to put the dyes into - glass bottles
---
--- Smelt some sand into glass as usual, then craft 5 of those into an upside-
--- down "U" to get 15 empty bottles.
+--============================================================================
+-- First, craft some bottles from the Vessels mod, then make some dye base:
+-- Craft six empty bottles along with a bucket of water and a piece
+-- of jungle grass to get 6 portions of dye base.
+
+-- These craft/craftitem definitions for glass bottles are deprecated and are
+-- only included here for backwards compatibility. Use vessels:glass_bottle
+-- instead.
 
 minetest.register_craftitem("unifieddyes:empty_bottle", {
-        description = "Empty Glass Bottle",
+        description = "Glass Bottle (empty) (Deprecated)",
         inventory_image = "unifieddyes_empty_bottle.png",
 })
 
 minetest.register_craft( {
-	output = "unifieddyes:empty_bottle 15",
-	recipe = {
-		{ "default:glass",  "",              "default:glass" },
-		{ "default:glass",  "",              "default:glass" },
-		{ "",               "default:glass", ""              }
-	}
-})
-
--- Make sure we can recycle the bottles.  3 bottles -> 1 glass block.
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "default:glass",
-	recipe = {
-		"unifieddyes:empty_bottle",
-		"unifieddyes:empty_bottle",
-		"unifieddyes:empty_bottle",
-	},
+        type = "shapeless",
+        output = "default:glass",
+        recipe = {
+                "unifieddyes:empty_bottle",
+                "unifieddyes:empty_bottle",
+        },
 })
 
-
---============================================================================
--- Now let's use some of those bottles along with some other stuff to make
--- dye base.  Craft six empty bottles along with a bucket of water and a piece
--- of jungle grass to get 6 portions of dye base.
+-- Now the current stuff, using vessels:glass_bottle.
 
 minetest.register_craftitem("unifieddyes:dye_base", {
         description = "Uncolored Dye Base Liquid",
@@ -52,12 +38,12 @@ minetest.register_craft( {
 	type = "shapeless",
 	output = "unifieddyes:dye_base 6",
 	recipe = {
-		"unifieddyes:empty_bottle",
-		"unifieddyes:empty_bottle",
-		"unifieddyes:empty_bottle",
-		"unifieddyes:empty_bottle",
-		"unifieddyes:empty_bottle",
-		"unifieddyes:empty_bottle",
+		"vessels:glass_bottle",
+		"vessels:glass_bottle",
+		"vessels:glass_bottle",
+		"vessels:glass_bottle",
+		"vessels:glass_bottle",
+		"vessels:glass_bottle",
 		"bucket:bucket_water",
 		"default:junglegrass",
 	},
diff --git a/vessels.lua b/vessels.lua
new file mode 100644
index 0000000..24cf8a4
--- /dev/null
+++ b/vessels.lua
@@ -0,0 +1,104 @@
+-- Vessels support for Unified Dyes Mod by Vanessa Ezekowitz  ~~  2012-07-26
+--
+-- License: GPL
+--
+
+--========================================
+-- Crafts
+--
+-- Glass bottle (yields 10)
+--
+--       G - G
+--       G - G
+--       - G -
+--
+-- Drinking Glass (yields 14)
+--
+--       G - G
+--       G - G
+--       G G G
+--
+-- Heavy Steel Bottle (yields 5)
+--
+--       S - S
+--       S - S
+--       - S -
+
+
+-- bottles
+
+minetest.register_alias("unifieddyes:empty_glass", "vessels:glass_bottle")
+
+minetest.register_craftitem("vessels:glass_bottle", {
+        description = "Glass Bottle (empty)",
+        inventory_image = "vessels_glass_bottle.png",
+})
+
+minetest.register_craft( {
+	output = "vessels:glass_bottle 10",
+	recipe = {
+		{ "default:glass", "", "default:glass" },
+		{ "default:glass", "", "default:glass" },
+		{ "", "default:glass", "" }
+	}
+})
+
+minetest.register_craftitem("vessels:drinking_glass", {
+        description = "Drinking Glass (empty)",
+        inventory_image = "vessels_drinking_glass.png",
+})
+
+minetest.register_craft( {
+	output = "vessels:drinking_glass 14",
+	recipe = {
+		{ "default:glass", "", "default:glass" },
+		{ "default:glass", "", "default:glass" },
+		{ "default:glass", "default:glass", "default:glass" }
+	}
+})
+
+minetest.register_craftitem("vessels:steel_bottle", {
+        description = "Heavy Steel Bottle (empty)",
+        inventory_image = "vessels_steel_bottle.png",
+})
+
+minetest.register_craft( {
+	output = "vessels:steel_bottle 5",
+	recipe = {
+		{ "default:steel_ingot", "", "default:steel_ingot" },
+		{ "default:steel_ingot", "", "default:steel_ingot" },
+		{ "", "default:steel_ingot", "" }
+	}
+})
+
+
+-- Make sure we can recycle them
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "default:glass",
+	recipe = {
+		"vessels:glass_bottle",
+		"vessels:glass_bottle",
+	},
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "default:glass",
+	recipe = {
+		"vessels:drinking_glass",
+		"vessels:drinking_glass",
+	},
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "default:steel_ingot",
+	recipe = {
+		"vessels:steel_bottle",
+	},
+})
+
+print("[Vessels] Loaded!")
+