Fixes #2533 and #2531: Slight overhaul to how Facades store the associated item and retrieve the sprite.

src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java

@@ -23,7 +23,6 @@ import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.block.model.IBakedModel;
@@ -108,11 +107,7 @@ public class FacadeDispatcherBakedModel implements IBakedModel
 
 				ItemFacade itemFacade = (ItemFacade) stack.getItem();
 
-				Block block = itemFacade.getBlock( stack );
-				int meta = itemFacade.getMeta( stack );
-
-				// This is kinda fascinating, how do we get the meta from the itemblock
-				IBlockState state = block.getStateFromMeta( meta );
+				IBlockState state = itemFacade.getTextureBlockState( stack );
 
 				return new FacadeWithBlockBakedModel( baseModel, state, format );
 			}

src/main/java/appeng/client/render/cablebus/FacadeBuilder.java

@@ -42,6 +42,8 @@ import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraftforge.client.ForgeHooksClient;
+import net.minecraftforge.client.MinecraftForgeClient;
 
 import appeng.api.AEApi;
 import appeng.api.util.AEAxisAlignedBB;
@@ -100,23 +102,41 @@ public class FacadeBuilder
 
 	public static TextureAtlasSprite getSprite( IBakedModel blockModel, IBlockState state, EnumFacing facing, long rand)
 	{
-		for( BakedQuad bakedQuad : blockModel.getQuads( state, facing, rand ) )
-		{
-			return bakedQuad.getSprite();
-		}
 
 		TextureAtlasSprite firstFound = null;
-		for( BakedQuad bakedQuad : blockModel.getQuads( state, null, rand ) )
+		BlockRenderLayer orgLayer = MinecraftForgeClient.getRenderLayer();
+
+		try
 		{
-			if( firstFound == null )
+			// Some other mods also distinguish between layers, so we're doing this in a loop from most likely to least likely
+			for( BlockRenderLayer layer : BlockRenderLayer.values() )
 			{
-				firstFound = bakedQuad.getSprite();
-			}
-			if( bakedQuad.getFace() == facing )
-			{
-				return bakedQuad.getSprite();
+
+				ForgeHooksClient.setRenderLayer( layer );
+
+				for( BakedQuad bakedQuad : blockModel.getQuads( state, facing, rand ) )
+				{
+					return bakedQuad.getSprite();
+				}
+
+				for( BakedQuad bakedQuad : blockModel.getQuads( state, null, rand ) )
+				{
+					if( firstFound == null )
+					{
+						firstFound = bakedQuad.getSprite();
+					}
+					if( bakedQuad.getFace() == facing )
+					{
+						return bakedQuad.getSprite();
+					}
+				}
 			}
 		}
+		finally
+		{
+			ForgeHooksClient.setRenderLayer( orgLayer );
+		}
+
 		return firstFound;
 	}