Updated for MC 1.6, added proxies and added holder for resources