Restructuring project to support separate command-line utility

NBTExplorer.Installer/Product.wxs

@@ -3,7 +3,7 @@
 	<Product Id="*" 
            Name="NBTExplorer" 
            Language="1033" 
-           Version="2.6.1.0" 
+           Version="2.7.0.0" 
            Manufacturer="Justin Aquadro" 
            UpgradeCode="0bfb1026-21f2-4552-ad71-ca90aae10a25">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
@@ -81,6 +81,15 @@
       <Component Id="C.NBTExplorer.visualelementsmanifest.xml" Guid="*">
         <File Source="../Staging/Windows/NBTExplorer.visualelementsmanifest.xml" KeyPath="yes" />
       </Component>
+      <Component Id="C.NBTUtil.exe" Guid="*">
+        <File Source="../Staging/NBTUtil.exe" KeyPath="yes" />
+      </Component>
+      <Component Id="C.NBTUtil.exe.config" Guid="*">
+        <File Source="../Staging/NBTUtil.exe.config" KeyPath="yes" />
+      </Component>
+      <Component Id="C.NBTModel.dll" Guid="*">
+        <File Source="../Staging/NBTModel.dll" KeyPath="yes" />
+      </Component>
       <Component Id="C.Substrate.dll" Guid="*">
         <File Source="../Staging/Substrate.dll" KeyPath="yes" />
       </Component>

NBTExplorer.sln

@@ -9,6 +9,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBTExplorerMac", "NBTExplor
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "NBTExplorer.Installer", "NBTExplorer.Installer\NBTExplorer.Installer.wixproj", "{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBTUtil", "NBTUtil\NBTUtil.csproj", "{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBTModel", "NBTModel\NBTModel.csproj", "{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AppStore|Any CPU = AppStore|Any CPU
@@ -71,6 +75,36 @@ Global
 		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.Release|Mixed Platforms.Build.0 = Release|x86
 		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.Release|x86.ActiveCfg = Release|x86
 		{A1566071-7CBB-4C54-AAE1-4B81B7715DB3}.Release|x86.Build.0 = Release|x86
+		{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU
+		{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BD90EED5-97B9-47D5-AFEA-C2C0D0E59FCF}.Release|x86.ActiveCfg = Release|Any CPU
+		{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU
+		{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{20D7CBA3-5B6D-40B0-8D28-4C9A58E4FFBC}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

NBTExplorer/NBTExplorer.csproj

@@ -84,6 +84,9 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Substrate, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -98,12 +101,8 @@
   <ItemGroup>
     <Compile Include="Controllers\ExplorerBarController.cs" />
     <Compile Include="Controllers\NodeTreeController.cs" />
-    <Compile Include="FormRegistry.cs" />
     <Compile Include="Controllers\RuleTreeController.cs" />
     <Compile Include="Interop.cs" />
-    <Compile Include="Model\Search\SearchRule.cs" />
-    <Compile Include="NbtClipboardController.cs" />
-    <Compile Include="SnapshotList.cs" />
     <Compile Include="Vendor\MultiSelectTreeView\MultiSelectTreeview.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -174,32 +173,6 @@
     <Compile Include="Windows\EditHex.Designer.cs">
       <DependentUpon>EditHex.cs</DependentUpon>
     </Compile>
-    <Compile Include="Model\CompoundTagContainer.cs" />
-    <Compile Include="Model\CubicRegionDataNode.cs" />
-    <Compile Include="Model\CubicRegionFile.cs" />
-    <Compile Include="Model\DataNode.cs" />
-    <Compile Include="Model\DataNodeCollection.cs" />
-    <Compile Include="Model\DirectoryDataNode.cs" />
-    <Compile Include="Model\FileTypeRegistry.cs" />
-    <Compile Include="Model\ListTagContainer.cs" />
-    <Compile Include="Model\NbtFileDataNode.cs" />
-    <Compile Include="Model\NodeCapabilities.cs" />
-    <Compile Include="Model\RegionChunkDataNode.cs" />
-    <Compile Include="Model\RegionFileDataNode.cs" />
-    <Compile Include="Model\TagByteArrayDataNode.cs" />
-    <Compile Include="Model\TagByteDataNode.cs" />
-    <Compile Include="Model\TagCompoundDataNode.cs" />
-    <Compile Include="Model\TagContainerInterface.cs" />
-    <Compile Include="Model\TagDataNode.cs" />
-    <Compile Include="Model\TagDoubleDataNode.cs" />
-    <Compile Include="Model\TagFloatDataNode.cs" />
-    <Compile Include="Model\TagIntArrayDataNode.cs" />
-    <Compile Include="Model\TagIntDataNode.cs" />
-    <Compile Include="Model\TagListDataNode.cs" />
-    <Compile Include="Model\TagLongDataNode.cs" />
-    <Compile Include="Model\TagShortDataNode.cs" />
-    <Compile Include="Model\TagStringDataNode.cs" />
-    <Compile Include="NbtClipboardData.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
@@ -208,7 +181,6 @@
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
     <Compile Include="SearchWorker.cs" />
-    <Compile Include="Model\TagKey.cs" />
     <Compile Include="Vendor\Be.Windows.Forms.HexBox\BuiltInContextMenu.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -337,6 +309,12 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\NBTModel\NBTModel.csproj">
+      <Project>{20d7cba3-5b6d-40b0-8d28-4c9a58e4ffbc}</Project>
+      <Name>NBTModel</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

NBTExplorer/Program.cs

@@ -14,7 +14,7 @@ static class Program
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
-        static void Main ()
+        static void Main (string[] args)
         {
             Application.ThreadException += AppThreadFailureHandler;
             Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);

NBTExplorer/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("NBTExplorer")]
-[assembly: AssemblyCopyright("Copyright © Justin Aquadro 2011-2012")]
+[assembly: AssemblyCopyright("Copyright © Justin Aquadro 2011-2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.6.2.0")]
-[assembly: AssemblyFileVersion("2.6.2.0")]
+[assembly: AssemblyVersion("2.7.0.0")]
+[assembly: AssemblyFileVersion("2.7.0.0")]

NBTExplorer/Windows/FormHandlers.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Forms;
+using NBTModel.Interop;
 
 namespace NBTExplorer.Windows
 {

NBTExplorer/Windows/MainForm.cs

@@ -13,6 +13,7 @@
 namespace NBTExplorer.Windows
 {
     using Predicates = NodeTreeController.Predicates;
+    using NBTModel.Interop;
 
     public partial class MainForm : Form
     {

NBTExplorer/Windows/NbtClipboardControllerWin.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Forms;
+using NBTModel.Interop;
 using Substrate.Nbt;
 
 namespace NBTExplorer.Windows

NBTExplorer/Model/CubicRegionDataNode.cs → NBTModel/CubicRegionDataNode.cs

@@ -1,6 +1,7 @@
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Collections.Generic;
+using NBTModel.Interop;
 
 namespace NBTExplorer.Model
 {

NBTExplorer/Model/DataNodeCollection.cs → NBTModel/DataNodeCollection.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using NBTExplorer.Utility;
 
 namespace NBTExplorer.Model
 {

NBTExplorer/FormRegistry.cs → NBTModel/Interop/FormRegistry.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Substrate.Nbt;
 
-namespace NBTExplorer
+namespace NBTModel.Interop
 {
     public static class FormRegistry
     {

NBTExplorer/NbtClipboardController.cs → NBTModel/Interop/NbtClipboardController.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NBTExplorer
+namespace NBTModel.Interop
 {
     public static class NbtClipboardController
     {

NBTExplorer/NbtClipboardData.cs → NBTModel/Interop/NbtClipboardData.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using Substrate.Nbt;
 
-namespace NBTExplorer
+namespace NBTModel.Interop
 {
     public class NbtClipboardData
     {