Merge branch 'master' of https://github.com/ScalarVector1/StructureHelper

Author: ScalarVector1

ChestHelper/ChestEntity.cs

@@ -79,7 +79,7 @@ public override void LoadData(TagCompound tag)
 		public override bool IsTileValidForEntity(int i, int j)
 		{
             var tile = Framing.GetTileSafely(i, j);
-            return tile.TileType == TileID.Containers;
+            return tile.TileType == TileID.Containers || TileID.Sets.BasicChest[tile.TileType];
 		}
 	}
 }

Generator.cs

@@ -226,7 +226,7 @@ internal static unsafe bool Generate(TagCompound tag, Point16 pos, bool ignoreNu
                                 }
                             }
                         }
-                        else if (type == TileID.Containers && d.FrameX % 36 == 0 && d.FrameY % 36 == 0) //generate an empty chest if there is no chest data
+                        else if ((type == TileID.Containers || TileID.Sets.BasicChest[tile.TileType]) && d.FrameX % 36 == 0 && d.FrameY % 36 == 0) //generate an empty chest if there is no chest data
                             Chest.CreateChest(pos.X + x, pos.Y + y);
                     }
 

Items/ChestWand.cs

@@ -33,7 +33,7 @@ public override void SetDefaults()
         {
             Tile tile = Framing.GetTileSafely(Player.tileTargetX, Player.tileTargetY);
 
-            if (tile.TileType == TileID.Containers)
+            if (tile.TileType == TileID.Containers || TileID.Sets.BasicChest[tile.TileType])
             {
                 int xOff = tile.TileFrameX % 36 / 18;
                 int yOff = tile.TileFrameY % 36 / 18;