Use 1.11 block defs

This commit is contained in:
David Vierra 2017-03-19 13:54:49 -10:00
parent 68168e2292
commit b3c41cf81b
2 changed files with 3 additions and 3 deletions

View File

@ -235,7 +235,7 @@ cdef class BlockModels(object):
self.loadModelParts(block, resourcePath, resourceVariant, parts)
hiddenModels = json.load(file(resources.resourcePath("mcedit2/rendering/hiddenstates_1_10.json"), "rb"))
hiddenModels = json.load(file(resources.resourcePath("mcedit2/rendering/hiddenstates_1_11.json"), "rb"))
log.info("Loading %s hidden blockState models...", len(hiddenModels))
hiddensLoaded = 0
for i, hidden in enumerate(hiddenModels):

View File

@ -426,9 +426,9 @@ class PCBlockTypeSet(BlockTypeSet):
super(PCBlockTypeSet, self).__init__()
self.itemStackVersion = itemStackVersion or VERSION_1_7
self.name = "Alpha"
self.addIDMappingFromJSON(getJsonFile("idmapping_raw_1_10.json"))
self.addIDMappingFromJSON(getJsonFile("idmapping_raw_1_11.json"))
self.addIDMappingFromJSON(getJsonFile("idmapping.json"))
self.addBlocksFromJSON(getJsonFile("minecraft_raw_1_10.json"))
self.addBlocksFromJSON(getJsonFile("minecraft_raw_1_11.json"))
self.addBlocksFromJSON(getJsonFile("minecraft.json"))
self.itemTypes = itemtypes.PCItemTypeSet()