From 37d58fcf9166a9e13ffabee6a7df22383e60965c Mon Sep 17 00:00:00 2001
From: Justin Aquadro <jaquadro@gmail.com>
Date: Sun, 10 Apr 2011 21:04:33 +0000
Subject: [PATCH] Fixed bug in TileEntity factory

---
 Substrate/SubstrateCS/Properties/AssemblyInfo.cs  | 8 ++++----
 Substrate/SubstrateCS/Source/BlockInterface.cs    | 4 +++-
 Substrate/SubstrateCS/Source/RegionFile.cs        | 3 +--
 Substrate/SubstrateCS/Source/RegionManager.cs     | 8 ++++++--
 Substrate/SubstrateCS/Source/TileEntityFactory.cs | 2 +-
 Substrate/SubstrateCS/Source/World.cs             | 3 +++
 Substrate/SubstrateCS/Substrate.csproj            | 2 --
 7 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Substrate/SubstrateCS/Properties/AssemblyInfo.cs b/Substrate/SubstrateCS/Properties/AssemblyInfo.cs
index 4785f96..d6f6d3b 100644
--- a/Substrate/SubstrateCS/Properties/AssemblyInfo.cs
+++ b/Substrate/SubstrateCS/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("Substrate")]
 [assembly: AssemblyDescription("Minecraft map SDK")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Substrate.Properties")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Substrate")]
 [assembly: AssemblyCopyright("2011 Justin Aquadro")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.1.0.0")]
-[assembly: AssemblyFileVersion("0.1.0.0")]
+[assembly: AssemblyVersion("0.2.0.0")]
+[assembly: AssemblyFileVersion("0.2.0.0")]
diff --git a/Substrate/SubstrateCS/Source/BlockInterface.cs b/Substrate/SubstrateCS/Source/BlockInterface.cs
index e0c258a..fdb13d2 100644
--- a/Substrate/SubstrateCS/Source/BlockInterface.cs
+++ b/Substrate/SubstrateCS/Source/BlockInterface.cs
@@ -82,9 +82,11 @@ namespace Substrate
 
     public interface IAlphaBlockContainer : ILitBlockContainer, IPropertyBlockContainer
     {
+        new Block GetBlock (int x, int y, int z);
+        new BlockRef GetBlockRef (int x, int y, int z);
     }
 
     public interface IBlockManager : IAlphaBlockContainer
-    {
+    { 
     }
 }
diff --git a/Substrate/SubstrateCS/Source/RegionFile.cs b/Substrate/SubstrateCS/Source/RegionFile.cs
index 758eed1..63112b8 100644
--- a/Substrate/SubstrateCS/Source/RegionFile.cs
+++ b/Substrate/SubstrateCS/Source/RegionFile.cs
@@ -1,9 +1,8 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using Ionic.Zlib;
-using System.Collections;
 
 namespace Substrate
 {
diff --git a/Substrate/SubstrateCS/Source/RegionManager.cs b/Substrate/SubstrateCS/Source/RegionManager.cs
index 4f173d3..8371c05 100644
--- a/Substrate/SubstrateCS/Source/RegionManager.cs
+++ b/Substrate/SubstrateCS/Source/RegionManager.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using System.Collections;
 
 namespace Substrate
 {
@@ -15,7 +15,11 @@ namespace Substrate
         bool DeleteRegion (int rx, int rz);
     }
 
-    public class RegionManager : IRegionContainer, IEnumerable<Region>
+    public interface IRegionManager : IRegionContainer, IEnumerable<Region>
+    {
+    }
+
+    public class RegionManager : IRegionManager
     {
         protected string _regionPath;
 
diff --git a/Substrate/SubstrateCS/Source/TileEntityFactory.cs b/Substrate/SubstrateCS/Source/TileEntityFactory.cs
index da1bfb4..eeeeb83 100644
--- a/Substrate/SubstrateCS/Source/TileEntityFactory.cs
+++ b/Substrate/SubstrateCS/Source/TileEntityFactory.cs
@@ -18,7 +18,7 @@ namespace Substrate
                 return null;
             }
 
-            return Activator.CreateInstance(t, new object[] { type }) as TileEntity;
+            return Activator.CreateInstance(t) as TileEntity;
         }
 
         public static TileEntity Create (TagCompound tree)
diff --git a/Substrate/SubstrateCS/Source/World.cs b/Substrate/SubstrateCS/Source/World.cs
index 1fa476b..4545972 100644
--- a/Substrate/SubstrateCS/Source/World.cs
+++ b/Substrate/SubstrateCS/Source/World.cs
@@ -162,6 +162,9 @@ namespace Substrate
         {
             get { return _blockMan; }
         }
+
+        //public static BetaWorld Open (string path);
+        //public static BetaWorld Create (string path);
     }
 
 }
diff --git a/Substrate/SubstrateCS/Substrate.csproj b/Substrate/SubstrateCS/Substrate.csproj
index 72a9ea2..0724676 100644
--- a/Substrate/SubstrateCS/Substrate.csproj
+++ b/Substrate/SubstrateCS/Substrate.csproj
@@ -59,8 +59,6 @@
       <HintPath>Assemblies\Ionic.Zlib.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Source\Level.cs" />