From 8a0ed5d4391a39a220fa98f2aa4e3f93592f6910 Mon Sep 17 00:00:00 2001
From: Samuel Lockyer <samuel.r.lockyer@gmail.com>
Date: Sun, 23 Jun 2013 22:08:16 +0200
Subject: [PATCH] Bug fixes

- Require for nbtfile was incorrect for Macs.
- Bizarre 'undefined method' exception affected the sorting of the 'deferred' array.
---
 s2b.rb | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/s2b.rb b/s2b.rb
index c2afb18..282ff9e 100644
--- a/s2b.rb
+++ b/s2b.rb
@@ -10,7 +10,17 @@
 #
 # Lisence: MIT
 
-require "nbtfile"
+require 'rbconfig'
+
+# Detect whether script is running on a Mac, change 'require' accordingly.
+hostOs = RbConfig::CONFIG['host_os']
+if /darwin|mac/.match(hostOs)
+    if ! require "/Library/Ruby/Gems/1.8/gems/nbtfile-0.2.0/lib/nbtfile.rb"
+        require "nbtfile"
+    end
+else
+    require "nbtfile"
+end
 
 # Needy blocks are items like torches and doors, which require other blocks to
 # be in place -- otherwise they'll simply fall to the ground as entities. We
@@ -97,7 +107,12 @@ def schematicToBO2(schematic, zoffset)
 	data = data.each_slice(schematic["Length"]).to_a
 	layers = blocks.zip(data).map { |blocks, data| blocks.zip(data).map { |blocks, data| blocks.zip(data) } }
 	deferred = []
-
+    
+    # Utility function that converts lines into strings.
+    def stringifyLine(lineArray)
+        return stringified = "#{lineArray[0]},#{lineArray[1]},#{lineArray[2]}:#{lineArray[3]}.#{lineArray[4]}"
+    end
+    
 	ret.push(*FILE_HEADER)
 	layers.each_with_index do |rows, z|
 		z += zoffset
@@ -108,11 +123,11 @@ def schematicToBO2(schematic, zoffset)
 					next
 				end
 				y -= schematic["Length"] / 2 # Center the object on the Y axis
-				line = "#{y},#{x},#{z}:#{block}.#{data}"
+                line = [y, x, z, block, data]
 				if NEEDY_BLOCKS.include?(block)
 					deferred << line
 				else
-					ret << line
+                    ret << stringifyLine(line)
 				end
 			end
 		end
@@ -120,9 +135,13 @@ def schematicToBO2(schematic, zoffset)
 	
 	# Write needy blocks to the end of the BOB file, respecting the order of
 	# NEEDY_BLOCKS, in case some blocks are needier than others.
-	deferred.sort! { |a, b| NEEDY_BLOCKS.index(a) <=> NEEDY_BLOCKS.index(b) }
-	deferred.reverse.each { |line| ret << line }
-
+    deferred.sort! { |a, b| NEEDY_BLOCKS.index(a[3]) <=> NEEDY_BLOCKS.index(b[3]) }
+    deferredStringified = []
+    deferred.each do |lineToStringify|
+        deferredStringified << stringifyLine(lineToStringify)
+    end
+    deferredStringified.reverse.each { |line| ret << line }
+        
 	return ret
 end
 
@@ -131,4 +150,4 @@ print "== START ==\n"
 @filenames.each do |filename|
 	handleFileName(filename)
 end
-print "== DONE =="
+print "== DONE ==\n"