LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

overviewer now pulls fire/lava/water textures from the right place

Browse Source 
fixes issue #910
This commit is contained in:
Aaron Griffith
2013-03-21 14:30:44 -04:00
parent 525e278a23
commit 84f919ac6a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
overviewer_core/textures.py
View File

@@ -261,7 +261,7 @@ class Textures(object):
watertexture = self.load_image("custom_water_still.png") watertexture = self.load_image("custom_water_still.png")
watertexture = watertexture.crop((0, 0, watertexture.size[0], watertexture.size[0])) watertexture = watertexture.crop((0, 0, watertexture.size[0], watertexture.size[0]))
except TextureException: except TextureException:
watertexture = self.load_image("water.png") watertexture = self.load_image_texture("textures/blocks/water.png")
self.watertexture = watertexture self.watertexture = watertexture
return watertexture return watertexture
@@ -276,7 +276,7 @@ class Textures(object):
lavatexture = self.load_image("custom_lava_still.png") lavatexture = self.load_image("custom_lava_still.png")
lavatexture = lavatexture.crop((0, 0, lavatexture.size[0], lavatexture.size[0])) lavatexture = lavatexture.crop((0, 0, lavatexture.size[0], lavatexture.size[0]))
except TextureException: except TextureException:
lavatexture = self.load_image("lava.png") lavatexture = self.load_image_texture("textures/blocks/lava.png")
self.lavatexture = lavatexture self.lavatexture = lavatexture
return lavatexture return lavatexture
@@ -294,8 +294,9 @@ class Textures(object):
firetextureEW = firetextureEW.crop((0, 0, firetextureEW.size[0], firetextureEW.size[0])) firetextureEW = firetextureEW.crop((0, 0, firetextureEW.size[0], firetextureEW.size[0]))
firetexture = (firetextureNS,firetextureEW) firetexture = (firetextureNS,firetextureEW)
except TextureException: except TextureException:
fire = self.load_image("fire.png") fireNS = self.load_image_texture("textures/blocks/fire_0.png")
firetexture = (fire, fire) fireEW = self.load_image_texture("textures/blocks/fire_1.png")
firetexture = (fireNS, fireEW)
self.firetexture = firetexture self.firetexture = firetexture
return firetexture return firetexture
@@ -310,7 +311,7 @@ class Textures(object):
portaltexture = self.load_image("custom_portal.png") portaltexture = self.load_image("custom_portal.png")
portaltexture = portaltexture.crop((0, 0, portaltexture.size[0], portaltexture.size[1])) portaltexture = portaltexture.crop((0, 0, portaltexture.size[0], portaltexture.size[1]))
except TextureException: except TextureException:
portaltexture = self.load_image("portal.png") portaltexture = self.load_image_texture("textures/blocks/portal.png")
self.portaltexture = portaltexture self.portaltexture = portaltexture
return portaltexture return portaltexture