From a9bc982595e228a826866267efa2f1956cb205e7 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 23 May 2016 23:25:33 -0700 Subject: [PATCH] Fix broken greenhouse textures from earlier commit --- .../greenhouse/blocks/BlockGreenhouseType.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java index 7498fa15c..acc087eea 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java @@ -82,11 +82,7 @@ public enum BlockGreenhouseType { TextureMap map = Proxies.common.getClientInstance().getTextureMapBlocks(); for (BlockGreenhouseSprites sprite : BlockGreenhouseSprites.VALUES) { - if (sprite == BlockGreenhouseSprites.PLAIN) { - sprites.put(sprite, map.getAtlasSprite("minecraft:blocks/brick")); - } else if (sprite == BlockGreenhouseSprites.GLASS) { - sprites.put(sprite, map.getAtlasSprite("minecraft:blocks/glass_green")); - } else { + if (sprite != BlockGreenhouseSprites.PLAIN && sprite != BlockGreenhouseSprites.GLASS) { ResourceLocation location = new ResourceLocation(Constants.RESOURCE_ID, "blocks/greenhouse/" + sprite.spriteName); TextureAtlasSprite textureAtlasSprite = map.registerSprite(location); sprites.put(sprite, textureAtlasSprite); @@ -103,11 +99,12 @@ public enum BlockGreenhouseType { if (world != null && pos != null) { tile = world.getTileEntity(pos); } + TextureMap map = Proxies.common.getClientInstance().getTextureMapBlocks(); switch (type) { case PLAIN: - return sprites.get(BlockGreenhouseSprites.PLAIN); + return map.getAtlasSprite("minecraft:blocks/brick"); case GLASS: - return sprites.get(BlockGreenhouseSprites.GLASS); + return map.getAtlasSprite("minecraft:blocks/glass_green"); case GEARBOX: return sprites.get(BlockGreenhouseSprites.GEARS); case VALVE: