From 2ac32527029f6c0eb7cf17ea70938bbe577ef10d Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Wed, 6 Apr 2011 21:20:35 +0000 Subject: [PATCH] Removed unnecessary nested namespace. --- Substrate/SubstrateCS/Source/Block.cs | 2 +- Substrate/SubstrateCS/Source/BlockInfo.cs | 2 +- Substrate/SubstrateCS/Source/BlockInterface.cs | 2 +- Substrate/SubstrateCS/Source/BlockKey.cs | 2 +- Substrate/SubstrateCS/Source/BlockManager.cs | 2 +- Substrate/SubstrateCS/Source/BlockRef.cs | 2 +- Substrate/SubstrateCS/Source/Chunk.cs | 2 +- Substrate/SubstrateCS/Source/ChunkEnumerator.cs | 2 +- Substrate/SubstrateCS/Source/ChunkFile.cs | 2 +- Substrate/SubstrateCS/Source/ChunkFileManager.cs | 2 +- Substrate/SubstrateCS/Source/ChunkInterface.cs | 2 +- Substrate/SubstrateCS/Source/ChunkKey.cs | 2 +- Substrate/SubstrateCS/Source/ChunkManager.cs | 2 +- Substrate/SubstrateCS/Source/ChunkRef.cs | 2 +- Substrate/SubstrateCS/Source/Entities/EntityArrow.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntityChicken.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntityCow.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntityCreeper.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntityEgg.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntityGhast.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntityGiant.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntityMonster.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntityPainting.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntityPig.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntityPigZombie.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntitySheep.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntitySkeleton.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntitySlime.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntitySnowball.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntitySpider.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntityWolf.cs | 4 ++-- Substrate/SubstrateCS/Source/Entities/EntityZombie.cs | 4 ++-- Substrate/SubstrateCS/Source/NBT/JSONSerializer.cs | 2 +- Substrate/SubstrateCS/Source/NBT/NBT.cs | 2 +- Substrate/SubstrateCS/Source/NBT/NBTValues.cs | 2 +- Substrate/SubstrateCS/Source/NBT/NBTVerifier.cs | 2 +- Substrate/SubstrateCS/Source/Region.cs | 2 +- Substrate/SubstrateCS/Source/RegionEnumerator.cs | 2 +- Substrate/SubstrateCS/Source/RegionFile.cs | 2 +- Substrate/SubstrateCS/Source/RegionKey.cs | 2 +- Substrate/SubstrateCS/Source/RegionManager.cs | 2 +- Substrate/SubstrateCS/Source/TileEntities/TileEntityChest.cs | 4 ++-- .../SubstrateCS/Source/TileEntities/TileEntityFurnace.cs | 4 ++-- .../SubstrateCS/Source/TileEntities/TileEntityMobSpawner.cs | 4 ++-- Substrate/SubstrateCS/Source/TileEntities/TileEntityMusic.cs | 4 ++-- Substrate/SubstrateCS/Source/TileEntities/TileEntitySign.cs | 4 ++-- Substrate/SubstrateCS/Source/TileEntities/TileEntityTrap.cs | 4 ++-- Substrate/SubstrateCS/Source/Utility/Interface.cs | 2 +- Substrate/SubstrateCS/Source/Utility/NibbleArray.cs | 2 +- Substrate/SubstrateCS/Source/World.cs | 2 +- 50 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Substrate/SubstrateCS/Source/Block.cs b/Substrate/SubstrateCS/Source/Block.cs index 49f28c3..635c927 100644 --- a/Substrate/SubstrateCS/Source/Block.cs +++ b/Substrate/SubstrateCS/Source/Block.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map +namespace Substrate { using NBT; using Utility; diff --git a/Substrate/SubstrateCS/Source/BlockInfo.cs b/Substrate/SubstrateCS/Source/BlockInfo.cs index c865052..aaacc32 100644 --- a/Substrate/SubstrateCS/Source/BlockInfo.cs +++ b/Substrate/SubstrateCS/Source/BlockInfo.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map +namespace Substrate { using NBT; diff --git a/Substrate/SubstrateCS/Source/BlockInterface.cs b/Substrate/SubstrateCS/Source/BlockInterface.cs index 42e0e4e..0c34c39 100644 --- a/Substrate/SubstrateCS/Source/BlockInterface.cs +++ b/Substrate/SubstrateCS/Source/BlockInterface.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map +namespace Substrate { public interface IBlock diff --git a/Substrate/SubstrateCS/Source/BlockKey.cs b/Substrate/SubstrateCS/Source/BlockKey.cs index a4ab3d7..fb414f8 100644 --- a/Substrate/SubstrateCS/Source/BlockKey.cs +++ b/Substrate/SubstrateCS/Source/BlockKey.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map +namespace Substrate { public struct BlockKey : IEquatable { diff --git a/Substrate/SubstrateCS/Source/BlockManager.cs b/Substrate/SubstrateCS/Source/BlockManager.cs index 8a0ea53..19c8154 100644 --- a/Substrate/SubstrateCS/Source/BlockManager.cs +++ b/Substrate/SubstrateCS/Source/BlockManager.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map +namespace Substrate { /*public interface IBlockManager : IBlockContainer { diff --git a/Substrate/SubstrateCS/Source/BlockRef.cs b/Substrate/SubstrateCS/Source/BlockRef.cs index c38de94..747a313 100644 --- a/Substrate/SubstrateCS/Source/BlockRef.cs +++ b/Substrate/SubstrateCS/Source/BlockRef.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map +namespace Substrate { public class BlockRef : IBlock { diff --git a/Substrate/SubstrateCS/Source/Chunk.cs b/Substrate/SubstrateCS/Source/Chunk.cs index ed8685b..69aad6e 100644 --- a/Substrate/SubstrateCS/Source/Chunk.cs +++ b/Substrate/SubstrateCS/Source/Chunk.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace Substrate.Map +namespace Substrate { using NBT; using Utility; diff --git a/Substrate/SubstrateCS/Source/ChunkEnumerator.cs b/Substrate/SubstrateCS/Source/ChunkEnumerator.cs index ffaa043..82e1d01 100644 --- a/Substrate/SubstrateCS/Source/ChunkEnumerator.cs +++ b/Substrate/SubstrateCS/Source/ChunkEnumerator.cs @@ -5,7 +5,7 @@ using System.Text; using System.Text.RegularExpressions; using System.IO; -namespace Substrate.Map +namespace Substrate { public class ChunkList : IEnumerable { diff --git a/Substrate/SubstrateCS/Source/ChunkFile.cs b/Substrate/SubstrateCS/Source/ChunkFile.cs index 5c76278..d91a5e8 100644 --- a/Substrate/SubstrateCS/Source/ChunkFile.cs +++ b/Substrate/SubstrateCS/Source/ChunkFile.cs @@ -4,7 +4,7 @@ using System.Text; using System.IO; using Ionic.Zlib; -namespace Substrate.Map +namespace Substrate { class ChunkFile { diff --git a/Substrate/SubstrateCS/Source/ChunkFileManager.cs b/Substrate/SubstrateCS/Source/ChunkFileManager.cs index 0301290..8b28689 100644 --- a/Substrate/SubstrateCS/Source/ChunkFileManager.cs +++ b/Substrate/SubstrateCS/Source/ChunkFileManager.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.IO; -namespace Substrate.Map +namespace Substrate { using NBT; diff --git a/Substrate/SubstrateCS/Source/ChunkInterface.cs b/Substrate/SubstrateCS/Source/ChunkInterface.cs index 6771bdd..738ac8a 100644 --- a/Substrate/SubstrateCS/Source/ChunkInterface.cs +++ b/Substrate/SubstrateCS/Source/ChunkInterface.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.IO; -namespace Substrate.Map +namespace Substrate { public interface IChunk : IBlockContainer diff --git a/Substrate/SubstrateCS/Source/ChunkKey.cs b/Substrate/SubstrateCS/Source/ChunkKey.cs index 716a180..267f483 100644 --- a/Substrate/SubstrateCS/Source/ChunkKey.cs +++ b/Substrate/SubstrateCS/Source/ChunkKey.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map +namespace Substrate { public struct ChunkKey : IEquatable { diff --git a/Substrate/SubstrateCS/Source/ChunkManager.cs b/Substrate/SubstrateCS/Source/ChunkManager.cs index 7674690..d36e64a 100644 --- a/Substrate/SubstrateCS/Source/ChunkManager.cs +++ b/Substrate/SubstrateCS/Source/ChunkManager.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map +namespace Substrate { public class ChunkManager : IChunkContainer, IChunkCache, IEnumerable diff --git a/Substrate/SubstrateCS/Source/ChunkRef.cs b/Substrate/SubstrateCS/Source/ChunkRef.cs index 18a01b9..031c91c 100644 --- a/Substrate/SubstrateCS/Source/ChunkRef.cs +++ b/Substrate/SubstrateCS/Source/ChunkRef.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.IO; -namespace Substrate.Map +namespace Substrate { using NBT; diff --git a/Substrate/SubstrateCS/Source/Entities/EntityArrow.cs b/Substrate/SubstrateCS/Source/Entities/EntityArrow.cs index 0f67c1f..4340c85 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntityArrow.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntityArrow.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntityArrow : EntityThrowable { diff --git a/Substrate/SubstrateCS/Source/Entities/EntityChicken.cs b/Substrate/SubstrateCS/Source/Entities/EntityChicken.cs index 13c7f65..a32798d 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntityChicken.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntityChicken.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntityChicken : EntityMob { diff --git a/Substrate/SubstrateCS/Source/Entities/EntityCow.cs b/Substrate/SubstrateCS/Source/Entities/EntityCow.cs index de09529..255a216 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntityCow.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntityCow.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntityCow : EntityMob { diff --git a/Substrate/SubstrateCS/Source/Entities/EntityCreeper.cs b/Substrate/SubstrateCS/Source/Entities/EntityCreeper.cs index 3022046..80b179f 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntityCreeper.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntityCreeper.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntityCreeper : EntityMob { diff --git a/Substrate/SubstrateCS/Source/Entities/EntityEgg.cs b/Substrate/SubstrateCS/Source/Entities/EntityEgg.cs index 63baffc..eabcd29 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntityEgg.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntityEgg.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntityEgg : EntityThrowable { diff --git a/Substrate/SubstrateCS/Source/Entities/EntityGhast.cs b/Substrate/SubstrateCS/Source/Entities/EntityGhast.cs index 61375ed..6b6704e 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntityGhast.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntityGhast.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntityGhast : EntityMob { diff --git a/Substrate/SubstrateCS/Source/Entities/EntityGiant.cs b/Substrate/SubstrateCS/Source/Entities/EntityGiant.cs index b2c9aa2..81e658e 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntityGiant.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntityGiant.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntityGiant : EntityMob { diff --git a/Substrate/SubstrateCS/Source/Entities/EntityMonster.cs b/Substrate/SubstrateCS/Source/Entities/EntityMonster.cs index 6193c97..05c7d20 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntityMonster.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntityMonster.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntityMonster : EntityMob { diff --git a/Substrate/SubstrateCS/Source/Entities/EntityPainting.cs b/Substrate/SubstrateCS/Source/Entities/EntityPainting.cs index 1de086f..aae69da 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntityPainting.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntityPainting.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntityPainting : Entity { diff --git a/Substrate/SubstrateCS/Source/Entities/EntityPig.cs b/Substrate/SubstrateCS/Source/Entities/EntityPig.cs index 9443f2b..bf7491c 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntityPig.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntityPig.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntityPig : EntityMob { diff --git a/Substrate/SubstrateCS/Source/Entities/EntityPigZombie.cs b/Substrate/SubstrateCS/Source/Entities/EntityPigZombie.cs index 9f5f737..4d563fc 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntityPigZombie.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntityPigZombie.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntityPigZombie : EntityMob { diff --git a/Substrate/SubstrateCS/Source/Entities/EntitySheep.cs b/Substrate/SubstrateCS/Source/Entities/EntitySheep.cs index 1da9cfa..3c0e139 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntitySheep.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntitySheep.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntitySheep : EntityMob { diff --git a/Substrate/SubstrateCS/Source/Entities/EntitySkeleton.cs b/Substrate/SubstrateCS/Source/Entities/EntitySkeleton.cs index 9b6078b..b507a9f 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntitySkeleton.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntitySkeleton.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntitySkeleton : EntityMob { diff --git a/Substrate/SubstrateCS/Source/Entities/EntitySlime.cs b/Substrate/SubstrateCS/Source/Entities/EntitySlime.cs index 4b10d3d..6815c52 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntitySlime.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntitySlime.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntitySlime : EntityMob { diff --git a/Substrate/SubstrateCS/Source/Entities/EntitySnowball.cs b/Substrate/SubstrateCS/Source/Entities/EntitySnowball.cs index 1e78136..ec014c5 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntitySnowball.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntitySnowball.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntitySnowball : EntityThrowable { diff --git a/Substrate/SubstrateCS/Source/Entities/EntitySpider.cs b/Substrate/SubstrateCS/Source/Entities/EntitySpider.cs index 20e04ad..f53fdbb 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntitySpider.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntitySpider.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntitySpider : EntityMob { diff --git a/Substrate/SubstrateCS/Source/Entities/EntityWolf.cs b/Substrate/SubstrateCS/Source/Entities/EntityWolf.cs index 780773b..91f265b 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntityWolf.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntityWolf.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntityWolf : EntityMob { diff --git a/Substrate/SubstrateCS/Source/Entities/EntityZombie.cs b/Substrate/SubstrateCS/Source/Entities/EntityZombie.cs index 8884a80..f96ca46 100644 --- a/Substrate/SubstrateCS/Source/Entities/EntityZombie.cs +++ b/Substrate/SubstrateCS/Source/Entities/EntityZombie.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Entities +namespace Substrate.Entities { - using Substrate.Map.NBT; + using Substrate.NBT; public class EntityZombie : EntityMob { diff --git a/Substrate/SubstrateCS/Source/NBT/JSONSerializer.cs b/Substrate/SubstrateCS/Source/NBT/JSONSerializer.cs index 13b3db0..ce3e1de 100644 --- a/Substrate/SubstrateCS/Source/NBT/JSONSerializer.cs +++ b/Substrate/SubstrateCS/Source/NBT/JSONSerializer.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.NBT +namespace Substrate.NBT { class JSONSerializer { diff --git a/Substrate/SubstrateCS/Source/NBT/NBT.cs b/Substrate/SubstrateCS/Source/NBT/NBT.cs index 1e22857..be98862 100644 --- a/Substrate/SubstrateCS/Source/NBT/NBT.cs +++ b/Substrate/SubstrateCS/Source/NBT/NBT.cs @@ -4,7 +4,7 @@ using System.Text; using System.IO; using System.IO.Compression; -namespace Substrate.Map.NBT +namespace Substrate.NBT { using Map.Utility; diff --git a/Substrate/SubstrateCS/Source/NBT/NBTValues.cs b/Substrate/SubstrateCS/Source/NBT/NBTValues.cs index fb5b57b..33b33cf 100644 --- a/Substrate/SubstrateCS/Source/NBT/NBTValues.cs +++ b/Substrate/SubstrateCS/Source/NBT/NBTValues.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.NBT { +namespace Substrate.NBT { using Map.Utility; diff --git a/Substrate/SubstrateCS/Source/NBT/NBTVerifier.cs b/Substrate/SubstrateCS/Source/NBT/NBTVerifier.cs index 6dcd6c8..e34f8dc 100644 --- a/Substrate/SubstrateCS/Source/NBT/NBTVerifier.cs +++ b/Substrate/SubstrateCS/Source/NBT/NBTVerifier.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.NBT +namespace Substrate.NBT { public delegate void MissingTagHandler (Object o, TagEventArgs e); public delegate void InvalidTagTypeHandler (Object o, TagEventArgs e); diff --git a/Substrate/SubstrateCS/Source/Region.cs b/Substrate/SubstrateCS/Source/Region.cs index 14367d0..f3e6a8b 100644 --- a/Substrate/SubstrateCS/Source/Region.cs +++ b/Substrate/SubstrateCS/Source/Region.cs @@ -4,7 +4,7 @@ using System.Text; using System.Text.RegularExpressions; using System.IO; -namespace Substrate.Map +namespace Substrate { using NBT; diff --git a/Substrate/SubstrateCS/Source/RegionEnumerator.cs b/Substrate/SubstrateCS/Source/RegionEnumerator.cs index 9498cd2..cf11872 100644 --- a/Substrate/SubstrateCS/Source/RegionEnumerator.cs +++ b/Substrate/SubstrateCS/Source/RegionEnumerator.cs @@ -5,7 +5,7 @@ using System.Text; using System.Text.RegularExpressions; using System.IO; -namespace Substrate.Map +namespace Substrate { public class RegionList : IEnumerable { diff --git a/Substrate/SubstrateCS/Source/RegionFile.cs b/Substrate/SubstrateCS/Source/RegionFile.cs index 81762a8..4b81735 100644 --- a/Substrate/SubstrateCS/Source/RegionFile.cs +++ b/Substrate/SubstrateCS/Source/RegionFile.cs @@ -5,7 +5,7 @@ using System.IO; using Ionic.Zlib; using System.Collections; -namespace Substrate.Map +namespace Substrate { public class RegionFile : IDisposable { diff --git a/Substrate/SubstrateCS/Source/RegionKey.cs b/Substrate/SubstrateCS/Source/RegionKey.cs index c346172..cf1e6d4 100644 --- a/Substrate/SubstrateCS/Source/RegionKey.cs +++ b/Substrate/SubstrateCS/Source/RegionKey.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map +namespace Substrate { public struct RegionKey : IEquatable { diff --git a/Substrate/SubstrateCS/Source/RegionManager.cs b/Substrate/SubstrateCS/Source/RegionManager.cs index cb7eb98..d0ffa2b 100644 --- a/Substrate/SubstrateCS/Source/RegionManager.cs +++ b/Substrate/SubstrateCS/Source/RegionManager.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.IO; -namespace Substrate.Map +namespace Substrate { public class RegionManager { diff --git a/Substrate/SubstrateCS/Source/TileEntities/TileEntityChest.cs b/Substrate/SubstrateCS/Source/TileEntities/TileEntityChest.cs index f4a450f..f73aa22 100644 --- a/Substrate/SubstrateCS/Source/TileEntities/TileEntityChest.cs +++ b/Substrate/SubstrateCS/Source/TileEntities/TileEntityChest.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.TileEntities +namespace Substrate.TileEntities { - using Substrate.Map.NBT; + using Substrate.NBT; public class TileEntityChest : TileEntity, IItemContainer { diff --git a/Substrate/SubstrateCS/Source/TileEntities/TileEntityFurnace.cs b/Substrate/SubstrateCS/Source/TileEntities/TileEntityFurnace.cs index f55c14a..3012a1e 100644 --- a/Substrate/SubstrateCS/Source/TileEntities/TileEntityFurnace.cs +++ b/Substrate/SubstrateCS/Source/TileEntities/TileEntityFurnace.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.TileEntities +namespace Substrate.TileEntities { - using Substrate.Map.NBT; + using Substrate.NBT; public class TileEntityFurnace : TileEntity, IItemContainer { diff --git a/Substrate/SubstrateCS/Source/TileEntities/TileEntityMobSpawner.cs b/Substrate/SubstrateCS/Source/TileEntities/TileEntityMobSpawner.cs index 18ccb4f..e911bb0 100644 --- a/Substrate/SubstrateCS/Source/TileEntities/TileEntityMobSpawner.cs +++ b/Substrate/SubstrateCS/Source/TileEntities/TileEntityMobSpawner.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.TileEntities +namespace Substrate.TileEntities { - using Substrate.Map.NBT; + using Substrate.NBT; public class TileEntityMobSpawner : TileEntity { diff --git a/Substrate/SubstrateCS/Source/TileEntities/TileEntityMusic.cs b/Substrate/SubstrateCS/Source/TileEntities/TileEntityMusic.cs index f6c5b6a..d526104 100644 --- a/Substrate/SubstrateCS/Source/TileEntities/TileEntityMusic.cs +++ b/Substrate/SubstrateCS/Source/TileEntities/TileEntityMusic.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.TileEntities +namespace Substrate.TileEntities { - using Substrate.Map.NBT; + using Substrate.NBT; public class TileEntityMusic : TileEntity { diff --git a/Substrate/SubstrateCS/Source/TileEntities/TileEntitySign.cs b/Substrate/SubstrateCS/Source/TileEntities/TileEntitySign.cs index 0ad892c..19a63f9 100644 --- a/Substrate/SubstrateCS/Source/TileEntities/TileEntitySign.cs +++ b/Substrate/SubstrateCS/Source/TileEntities/TileEntitySign.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.TileEntities +namespace Substrate.TileEntities { - using Substrate.Map.NBT; + using Substrate.NBT; public class TileEntitySign : TileEntity { diff --git a/Substrate/SubstrateCS/Source/TileEntities/TileEntityTrap.cs b/Substrate/SubstrateCS/Source/TileEntities/TileEntityTrap.cs index c19de16..3655281 100644 --- a/Substrate/SubstrateCS/Source/TileEntities/TileEntityTrap.cs +++ b/Substrate/SubstrateCS/Source/TileEntities/TileEntityTrap.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.TileEntities +namespace Substrate.TileEntities { - using Substrate.Map.NBT; + using Substrate.NBT; public class TileEntityTrap : TileEntity, IItemContainer { diff --git a/Substrate/SubstrateCS/Source/Utility/Interface.cs b/Substrate/SubstrateCS/Source/Utility/Interface.cs index c2eae2a..8ee171c 100644 --- a/Substrate/SubstrateCS/Source/Utility/Interface.cs +++ b/Substrate/SubstrateCS/Source/Utility/Interface.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Utility +namespace Substrate.Utility { public interface ICopyable { diff --git a/Substrate/SubstrateCS/Source/Utility/NibbleArray.cs b/Substrate/SubstrateCS/Source/Utility/NibbleArray.cs index 7360324..a21a558 100644 --- a/Substrate/SubstrateCS/Source/Utility/NibbleArray.cs +++ b/Substrate/SubstrateCS/Source/Utility/NibbleArray.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Text; -namespace Substrate.Map.Utility +namespace Substrate.Utility { public class NibbleArray : ICopyable { diff --git a/Substrate/SubstrateCS/Source/World.cs b/Substrate/SubstrateCS/Source/World.cs index ad73081..79c21f7 100644 --- a/Substrate/SubstrateCS/Source/World.cs +++ b/Substrate/SubstrateCS/Source/World.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.IO; -namespace Substrate.Map +namespace Substrate { public class World {