From 9fd69058d35a7971a8e3522898ba0887ca0c6308 Mon Sep 17 00:00:00 2001 From: David Vierra Date: Mon, 3 Jul 2017 13:59:55 -1000 Subject: [PATCH] Actually use 1.12 blocks --- src/mcedit2/rendering/blockmodels.pyx | 2 +- src/mcedit2/util/minecraftinstall.py | 4 ++-- src/mceditlib/blocktypes/__init__.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mcedit2/rendering/blockmodels.pyx b/src/mcedit2/rendering/blockmodels.pyx index 7df904b..73fefdd 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_11.json"), "rb")) + hiddenModels = json.load(file(resources.resourcePath("mcedit2/rendering/hiddenstates_1_12.json"), "rb")) log.info("Loading %s hidden blockState models...", len(hiddenModels)) hiddensLoaded = 0 for i, hidden in enumerate(hiddenModels): diff --git a/src/mcedit2/util/minecraftinstall.py b/src/mcedit2/util/minecraftinstall.py index 915a7eb..74f9c5b 100644 --- a/src/mcedit2/util/minecraftinstall.py +++ b/src/mcedit2/util/minecraftinstall.py @@ -88,8 +88,8 @@ def md5hash(filename): class MCInstallGroup(QtCore.QObject): - _requiredVersion = '1.10.2' - _requiredMajorMinor = (1, 10) + _requiredVersion = '1.12' + _requiredMajorMinor = (1, 12) def __init__(self): """ diff --git a/src/mceditlib/blocktypes/__init__.py b/src/mceditlib/blocktypes/__init__.py index d20b173..f37a290 100644 --- a/src/mceditlib/blocktypes/__init__.py +++ b/src/mceditlib/blocktypes/__init__.py @@ -428,9 +428,9 @@ class PCBlockTypeSet(BlockTypeSet): super(PCBlockTypeSet, self).__init__() self.itemStackVersion = itemStackVersion or VERSION_1_7 self.name = "Alpha" - self.addIDMappingFromJSON(getJsonFile("idmapping_raw_1_11.json")) + self.addIDMappingFromJSON(getJsonFile("idmapping_raw_1_12.json")) self.addIDMappingFromJSON(getJsonFile("idmapping.json")) - self.addBlocksFromJSON(getJsonFile("minecraft_raw_1_11.json")) + self.addBlocksFromJSON(getJsonFile("minecraft_raw_1_12.json")) self.addBlocksFromJSON(getJsonFile("minecraft.json")) self.itemTypes = itemtypes.PCItemTypeSet()