2 files changed, 286 insertions, 2 deletions

diff --git a/VC2010/MCServer.vcxproj b/VC2010/MCServer.vcxproj
index f388d704d..4d89c215c 100644
--- a/VC2010/MCServer.vcxproj
+++ b/VC2010/MCServer.vcxproj
@@ -305,6 +305,20 @@
     <ClCompile Include="..\source\BioGen.cpp" />

     <ClCompile Include="..\source\BlockArea.cpp" />

     <ClCompile Include="..\source\BlockID.cpp" />

+    <ClCompile Include="..\source\blocks\BlockCloth.cpp" />

+    <ClCompile Include="..\source\blocks\BlockDirt.cpp" />

+    <ClCompile Include="..\source\blocks\BlockDoor.cpp" />

+    <ClCompile Include="..\source\blocks\BlockEntity.cpp" />

+    <ClCompile Include="..\source\blocks\BlockFire.cpp" />

+    <ClCompile Include="..\source\blocks\BlockPiston.cpp" />

+    <ClCompile Include="..\source\blocks\BlockRedstone.cpp" />

+    <ClCompile Include="..\source\blocks\BlockRedstoneRepeater.cpp" />

+    <ClCompile Include="..\source\blocks\BlockSlab.cpp" />

+    <ClCompile Include="..\source\blocks\BlockStairs.cpp" />

+    <ClCompile Include="..\source\blocks\BlockTorch.cpp" />

+    <ClCompile Include="..\source\blocks\BlockVine.cpp" />

+    <ClCompile Include="..\source\blocks\BlockWorkbench.cpp" />

+    <ClCompile Include="..\source\blocks\Block.cpp" />

     <ClCompile Include="..\source\cAggressiveMonster.cpp" />

     <ClCompile Include="..\Source\cAuthenticator.cpp" />

     <ClCompile Include="..\source\cBlockingTCPLink.cpp" />

@@ -401,6 +415,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="..\source\HeiGen.cpp" />

+    <ClCompile Include="..\source\items\Item.cpp" />

     <ClCompile Include="..\source\LeakFinder.cpp">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'">NotUsing</PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>

@@ -498,6 +513,43 @@
     <ClInclude Include="..\source\BioGen.h" />

     <ClInclude Include="..\source\BlockArea.h" />

     <ClInclude Include="..\Source\BlockID.h" />

+    <ClInclude Include="..\source\blocks\BlockCactus.h" />

+    <ClInclude Include="..\source\blocks\BlockChest.h" />

+    <ClInclude Include="..\source\blocks\BlockCloth.h" />

+    <ClInclude Include="..\source\blocks\BlockCrops.h" />

+    <ClInclude Include="..\source\blocks\BlockDirt.h" />

+    <ClInclude Include="..\source\blocks\BlockDispenser.h" />

+    <ClInclude Include="..\source\blocks\BlockDoor.h" />

+    <ClInclude Include="..\source\blocks\BlockEntity.h" />

+    <ClInclude Include="..\source\blocks\BlockFire.h" />

+    <ClInclude Include="..\source\blocks\BlockFlower.h" />

+    <ClInclude Include="..\source\blocks\BlockFluid.h" />

+    <ClInclude Include="..\source\blocks\BlockFurnace.h" />

+    <ClInclude Include="..\source\blocks\BlockGlowstone.h" />

+    <ClInclude Include="..\source\blocks\BlockIce.h" />

+    <ClInclude Include="..\source\blocks\BlockLadder.h" />

+    <ClInclude Include="..\source\blocks\BlockLeaves.h" />

+    <ClInclude Include="..\source\blocks\BlockMelon.h" />

+    <ClInclude Include="..\source\blocks\BlockMushroom.h" />

+    <ClInclude Include="..\source\blocks\BlockPiston.h" />

+    <ClInclude Include="..\source\blocks\BlockRedstone.h" />

+    <ClInclude Include="..\source\blocks\BlockRedstoneOre.h" />

+    <ClInclude Include="..\source\blocks\BlockRedstoneRepeater.h" />

+    <ClInclude Include="..\source\blocks\BlockRedstoneTorch.h" />

+    <ClInclude Include="..\source\blocks\BlockSapling.h" />

+    <ClInclude Include="..\source\blocks\BlockSign.h" />

+    <ClInclude Include="..\source\blocks\BlockSlab.h" />

+    <ClInclude Include="..\source\blocks\BlockSnow.h" />

+    <ClInclude Include="..\source\blocks\BlockStairs.h" />

+    <ClInclude Include="..\source\blocks\BlockStems.h" />

+    <ClInclude Include="..\source\blocks\BlockStone.h" />

+    <ClInclude Include="..\source\blocks\BlockSugarcane.h" />

+    <ClInclude Include="..\source\blocks\BlockTallGrass.h" />

+    <ClInclude Include="..\source\blocks\BlockTorch.h" />

+    <ClInclude Include="..\source\blocks\BlockVine.h" />

+    <ClInclude Include="..\source\blocks\BlockWood.h" />

+    <ClInclude Include="..\source\blocks\BlockWorkbench.h" />

+    <ClInclude Include="..\source\blocks\Block.h" />

     <ClInclude Include="..\source\cAggressiveMonster.h" />

     <ClInclude Include="..\Source\cAuthenticator.h" />

     <ClInclude Include="..\source\cBlockingTCPLink.h" />

@@ -567,7 +619,6 @@
     <ClInclude Include="..\source\cSpider.h" />

     <ClInclude Include="..\source\cSquid.h" />

     <ClInclude Include="..\source\cStairs.h" />

-    <ClInclude Include="..\source\cStep.h" />

     <ClInclude Include="..\source\cStringMap.h" />

     <ClInclude Include="..\source\cSurvivalInventory.h" />

     <ClInclude Include="..\Source\cTCPLink.h" />

@@ -591,6 +642,24 @@
     <ClInclude Include="..\source\FinishGen.h" />

     <ClInclude Include="..\source\Globals.h" />

     <ClInclude Include="..\source\HeiGen.h" />

+    <ClInclude Include="..\source\items\ItemBucket.h" />

+    <ClInclude Include="..\source\items\ItemCloth.h" />

+    <ClInclude Include="..\source\items\Item.h" />

+    <ClInclude Include="..\source\items\ItemDoor.h" />

+    <ClInclude Include="..\source\items\ItemDye.h" />

+    <ClInclude Include="..\source\items\ItemHoe.h" />

+    <ClInclude Include="..\source\items\ItemLeaves.h" />

+    <ClInclude Include="..\source\items\ItemLighter.h" />

+    <ClInclude Include="..\source\items\ItemPickaxe.h" />

+    <ClInclude Include="..\source\items\ItemRedstoneDust.h" />

+    <ClInclude Include="..\source\items\ItemSapling.h" />

+    <ClInclude Include="..\source\items\ItemSeeds.h" />

+    <ClInclude Include="..\source\items\ItemShears.h" />

+    <ClInclude Include="..\source\items\ItemShovel.h" />

+    <ClInclude Include="..\source\items\ItemSlab.h" />

+    <ClInclude Include="..\source\items\ItemSugarcane.h" />

+    <ClInclude Include="..\source\items\ItemSword.h" />

+    <ClInclude Include="..\source\items\ItemWood.h" />

     <ClInclude Include="..\source\LeakFinder.h" />

     <ClInclude Include="..\source\LightingThread.h" />

     <ClInclude Include="..\Source\LuaFunctions.h" />

diff --git a/VC2010/MCServer.vcxproj.filters b/VC2010/MCServer.vcxproj.filters
index d7287ab3b..65abbe435 100644
--- a/VC2010/MCServer.vcxproj.filters
+++ b/VC2010/MCServer.vcxproj.filters
@@ -439,6 +439,12 @@
     <Filter Include="cPluginManager\cSquirrelCommandBinder">

       <UniqueIdentifier>{0a0b9b8e-ac72-4755-98e5-87cbc835016a}</UniqueIdentifier>

     </Filter>

+    <Filter Include="Blocks">

+      <UniqueIdentifier>{9013ce6d-8f75-4f87-90c6-99aa07b3c8f8}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Items">

+      <UniqueIdentifier>{2bd505e5-cfc9-44f4-8295-4a36185c7c54}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="..\source\cServer.cpp">

@@ -920,6 +926,51 @@
     <ClCompile Include="..\source\cSquirrelCommandBinder.cpp">

       <Filter>cPluginManager\cSquirrelCommandBinder</Filter>

     </ClCompile>

+    <ClCompile Include="..\source\blocks\BlockEntity.cpp">

+      <Filter>Blocks</Filter>

+    </ClCompile>

+    <ClCompile Include="..\source\blocks\BlockFire.cpp">

+      <Filter>Blocks</Filter>

+    </ClCompile>

+    <ClCompile Include="..\source\blocks\BlockPiston.cpp">

+      <Filter>Blocks</Filter>

+    </ClCompile>

+    <ClCompile Include="..\source\blocks\BlockRedstone.cpp">

+      <Filter>Blocks</Filter>

+    </ClCompile>

+    <ClCompile Include="..\source\blocks\BlockRedstoneRepeater.cpp">

+      <Filter>Blocks</Filter>

+    </ClCompile>

+    <ClCompile Include="..\source\blocks\BlockSlab.cpp">

+      <Filter>Blocks</Filter>

+    </ClCompile>

+    <ClCompile Include="..\source\blocks\BlockTorch.cpp">

+      <Filter>Blocks</Filter>

+    </ClCompile>

+    <ClCompile Include="..\source\blocks\BlockVine.cpp">

+      <Filter>Blocks</Filter>

+    </ClCompile>

+    <ClCompile Include="..\source\blocks\BlockWorkbench.cpp">

+      <Filter>Blocks</Filter>

+    </ClCompile>

+    <ClCompile Include="..\source\blocks\BlockCloth.cpp">

+      <Filter>Blocks</Filter>

+    </ClCompile>

+    <ClCompile Include="..\source\blocks\BlockDirt.cpp">

+      <Filter>Blocks</Filter>

+    </ClCompile>

+    <ClCompile Include="..\source\blocks\BlockDoor.cpp">

+      <Filter>Blocks</Filter>

+    </ClCompile>

+    <ClCompile Include="..\source\blocks\Block.cpp">

+      <Filter>Blocks</Filter>

+    </ClCompile>

+    <ClCompile Include="..\source\items\Item.cpp">

+      <Filter>Items</Filter>

+    </ClCompile>

+    <ClCompile Include="..\source\blocks\BlockStairs.cpp">

+      <Filter>Blocks</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\source\cServer.h">

@@ -1425,7 +1476,6 @@
     <ClInclude Include="..\source\FastNBT.h">

       <Filter>Storage</Filter>

     </ClInclude>

-    <ClInclude Include="..\source\cStep.h" />

     <ClInclude Include="..\source\CraftingRecipes.h" />

     <ClInclude Include="..\source\squirrelbindings\SquirrelBindings.h">

       <Filter>LuaBindings\SquirrelBindings</Filter>

@@ -1449,6 +1499,171 @@
     <ClInclude Include="..\source\squirrelbindings\SquirrelArray.h">

       <Filter>LuaBindings\SquirrelBindings</Filter>

     </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockDoor.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockEntity.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockFire.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockPiston.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockRedstone.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockRedstoneRepeater.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockSlab.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockSnow.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockTallGrass.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockTorch.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockVine.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockWorkbench.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockCloth.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockDirt.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\Block.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockWood.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemCloth.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemHoe.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemSlab.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemWood.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\Item.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemShears.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockLeaves.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemSapling.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockSapling.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemLeaves.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemBucket.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockFluid.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemRedstoneDust.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockChest.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockDispenser.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockFurnace.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockStairs.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockLadder.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockSign.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemLighter.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemSeeds.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemDye.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockCrops.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockSugarcane.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemSugarcane.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockFlower.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockMushroom.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockCactus.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockStems.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockRedstoneTorch.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockGlowstone.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemPickaxe.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemShovel.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemSword.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockRedstoneOre.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockStone.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockMelon.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\items\ItemDoor.h">

+      <Filter>Items</Filter>

+    </ClInclude>

+    <ClInclude Include="..\source\blocks\BlockIce.h">

+      <Filter>Blocks</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <None Include="..\source\AllToLua.pkg">