AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actually use 1.12 blocks

Browse Source
This commit is contained in:
David Vierra 2017-07-03 13:59:55 -10:00
parent b7d86a941e
commit 9fd69058d3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mcedit2/rendering/blockmodels.pyx
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_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):

4
src/mcedit2/util/minecraftinstall.py
View File

@ -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):
"""

4
src/mceditlib/blocktypes/__init__.py
View File

@ -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()