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

finally rename materials to alphaMaterials

Browse Source
This commit is contained in:
David Vierra 2011-08-21 07:27:03 -10:00
parent 7c000cf3b7
commit d2f6092b47
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
materials.py
View File

@ -1,6 +1,4 @@
'''
from materials import classicMaterials, materials
'''
from numpy import * from numpy import *
NOTEX = (0xB0, 0x80) NOTEX = (0xB0, 0x80)
@ -223,9 +221,9 @@ class MCMaterials(object):
### MATERIALS for the latest version of the game ### ### MATERIALS for the latest version of the game ###
### ###
materials = MCMaterials(defaultName="Future Block!"); alphaMaterials = MCMaterials(defaultName="Future Block!");
materials.name = "Alpha" alphaMaterials.name = "Alpha"
am = materials am = alphaMaterials
am.Air = am.Block(0, am.Air = am.Block(0,
name="Air", name="Air",
texture=(0x80, 0xB0), texture=(0x80, 0xB0),
@ -982,12 +980,12 @@ del am
from classicmaterials import classicMaterials from classicmaterials import classicMaterials
classicMaterials.lightAbsorption = materials.lightAbsorption classicMaterials.lightAbsorption = alphaMaterials.lightAbsorption
classicMaterials.lightEmission = materials.lightEmission classicMaterials.lightEmission = alphaMaterials.lightEmission
namedMaterials = dict((i.name, i) for i in (materials, classicMaterials)) namedMaterials = dict((i.name, i) for i in (alphaMaterials, classicMaterials))
#filters certain block types in old maps to types available in /game/ #filters certain block types in old maps to types available in /game/
blockFilterClassicToAlpha = arange(256, dtype=uint8) blockFilterClassicToAlpha = arange(256, dtype=uint8)
@ -1012,18 +1010,16 @@ blockFilterAlphaToClassic[50:255] = 36 # change all blocks from torch (50) on up
nullConversionTable = arange(256, dtype=uint8) nullConversionTable = arange(256, dtype=uint8)
materials.conversionTables = { alphaMaterials.conversionTables = {
materials: nullConversionTable, alphaMaterials: nullConversionTable,
classicMaterials: blockFilterAlphaToClassic, classicMaterials: blockFilterAlphaToClassic,
} }
classicMaterials.conversionTables = { classicMaterials.conversionTables = {
materials: blockFilterClassicToAlpha, alphaMaterials: blockFilterClassicToAlpha,
classicMaterials: nullConversionTable, classicMaterials: nullConversionTable,
}; };
alphaMaterials = materials;
__all__ = "alphaMaterials, classicMaterials, namedMaterials, MCMaterials".split(", ") __all__ = "alphaMaterials, classicMaterials, namedMaterials, MCMaterials".split(", ")