From ac82c122dc96c39c5b5ced109b534c75cdc51eec Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Tue, 13 Mar 2012 21:05:48 -0400 Subject: [PATCH] Staged for Anvil branch release. --- SubstrateCS/Properties/AssemblyInfo.cs | 4 +-- SubstrateCS/Source/AnvilChunk.cs | 6 +++++ SubstrateCS/Source/BiomeInfo.cs | 35 ++++++++++++++++++++++++++ SubstrateCS/Source/BlockManager.cs | 2 +- SubstrateCS/Source/Level.cs | 3 ++- SubstrateCS/Substrate (NET2).csproj | 3 ++- SubstrateCS/Substrate (NET4).csproj | 4 ++- 7 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 SubstrateCS/Source/BiomeInfo.cs diff --git a/SubstrateCS/Properties/AssemblyInfo.cs b/SubstrateCS/Properties/AssemblyInfo.cs index e1e0f6e..f296881 100644 --- a/SubstrateCS/Properties/AssemblyInfo.cs +++ b/SubstrateCS/Properties/AssemblyInfo.cs @@ -30,8 +30,8 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.1.1.0")] -[assembly: AssemblyFileVersion("1.1.1.0")] +[assembly: AssemblyVersion("1.2.0.0")] +[assembly: AssemblyFileVersion("1.2.0.0")] // This library is compatible with all CLS-compliant .NET programming languages. [assembly: CLSCompliant(true)] \ No newline at end of file diff --git a/SubstrateCS/Source/AnvilChunk.cs b/SubstrateCS/Source/AnvilChunk.cs index 35b9159..b54ee29 100644 --- a/SubstrateCS/Source/AnvilChunk.cs +++ b/SubstrateCS/Source/AnvilChunk.cs @@ -713,6 +713,9 @@ namespace Substrate levelCopy["Sections"] = sections; + if (_tileTicks.Count == 0) + levelCopy.Remove("TileTicks"); + return levelCopy; } @@ -776,6 +779,9 @@ namespace Substrate TagNodeByteArray biomes = new TagNodeByteArray(new byte[elements2]); _biomes = new ZXByteArray(XDIM, ZDIM, biomes); + for (int x = 0; x < XDIM; x++) + for (int z = 0; z < ZDIM; z++) + _biomes[x, z] = BiomeType.Default; _entities = new TagNodeList(TagType.TAG_COMPOUND); _tileEntities = new TagNodeList(TagType.TAG_COMPOUND); diff --git a/SubstrateCS/Source/BiomeInfo.cs b/SubstrateCS/Source/BiomeInfo.cs new file mode 100644 index 0000000..2545f61 --- /dev/null +++ b/SubstrateCS/Source/BiomeInfo.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Substrate +{ + public class BiomeType + { + public const int Ocean = 0; + public const int Plains = 1; + public const int Desert = 2; + public const int ExtremeHills = 3; + public const int Forest = 4; + public const int Taiga = 5; + public const int Swampland = 6; + public const int River = 7; + public const int Hell = 8; + public const int Sky = 9; + public const int FrozenOcean = 10; + public const int FrozenRiver = 11; + public const int IcePlains = 12; + public const int IceMountains = 13; + public const int MushroomIsland = 14; + public const int MushroomIslandShore = 15; + public const int Beach = 16; + public const int DesertHills = 17; + public const int ForestHills = 18; + public const int TaigaHills = 19; + public const int ExtremeHillsEdge = 20; + public const int Jungle = 21; + public const int JungleHills = 22; + + public const int Default = 255; + } +} diff --git a/SubstrateCS/Source/BlockManager.cs b/SubstrateCS/Source/BlockManager.cs index 581eb57..595ca2a 100644 --- a/SubstrateCS/Source/BlockManager.cs +++ b/SubstrateCS/Source/BlockManager.cs @@ -11,7 +11,7 @@ namespace Substrate public const int MIN_X = -32000000; public const int MAX_X = 32000000; public const int MIN_Y = 0; - public const int MAX_Y = 128; + public const int MAX_Y = 256; public const int MIN_Z = -32000000; public const int MAX_Z = 32000000; diff --git a/SubstrateCS/Source/Level.cs b/SubstrateCS/Source/Level.cs index 1613904..1e5704d 100644 --- a/SubstrateCS/Source/Level.cs +++ b/SubstrateCS/Source/Level.cs @@ -262,7 +262,8 @@ namespace Substrate _spawnZ = 0; _sizeOnDisk = 0; _randomSeed = new Random().Next(); - _version = 19132; + //_version = 19132; + _version = 19133; _name = "Untitled"; _hardcore = 0; diff --git a/SubstrateCS/Substrate (NET2).csproj b/SubstrateCS/Substrate (NET2).csproj index d307014..36eb6f9 100644 --- a/SubstrateCS/Substrate (NET2).csproj +++ b/SubstrateCS/Substrate (NET2).csproj @@ -63,6 +63,7 @@ + @@ -152,7 +153,7 @@ - + diff --git a/SubstrateCS/Substrate (NET4).csproj b/SubstrateCS/Substrate (NET4).csproj index 11775c5..9f5fa88 100644 --- a/SubstrateCS/Substrate (NET4).csproj +++ b/SubstrateCS/Substrate (NET4).csproj @@ -60,8 +60,10 @@ + + @@ -151,7 +153,7 @@ - +