From b3c41cf81b11d020c6b9ff99ea893cb667f3a4fe Mon Sep 17 00:00:00 2001 From: David Vierra Date: Sun, 19 Mar 2017 13:54:49 -1000 Subject: [PATCH] Use 1.11 block defs --- src/mcedit2/rendering/blockmodels.pyx | 2 +- src/mceditlib/blocktypes/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mcedit2/rendering/blockmodels.pyx b/src/mcedit2/rendering/blockmodels.pyx index 13a334e..411c58d 100644 --- a/src/mcedit2/rendering/blockmodels.pyx +++ b/src/mcedit2/rendering/blockmodels.pyx @@ -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): diff --git a/src/mceditlib/blocktypes/__init__.py b/src/mceditlib/blocktypes/__init__.py index 2de8cd2..431a588 100644 --- a/src/mceditlib/blocktypes/__init__.py +++ b/src/mceditlib/blocktypes/__init__.py @@ -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()