From f49b04da37bcc46bc48c54365e6504fa1c84fd8c Mon Sep 17 00:00:00 2001 From: asiekierka Date: Wed, 15 Oct 2014 15:51:57 +0200 Subject: [PATCH] Fix facade recipe desynchronization on client and server. Closes #2042 This bug was caused by tterrag's pull request having a hasNoNullIcons function, which returned false on the server side, not letting any facade recipe through. The new approach relies on replacing non-existant textures with a transparent oeeN --- common/buildcraft/transport/ItemFacade.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 3bfd9db1..3bd60274 100755 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -254,8 +254,7 @@ public class ItemFacade extends ItemBuildCraft { ItemStack stack = new ItemStack(item, 1, i); if (!Strings.isNullOrEmpty(stack.getUnlocalizedName()) - && names.add(stack.getUnlocalizedName()) - && hasNoNullIcons(block, i)) { + && names.add(stack.getUnlocalizedName())) { ItemFacade.addFacade( "buildcraft:facade{" + Block.blockRegistry.getNameForObject(block) + "#" + stack.getItemDamage() + "}", stack); @@ -273,20 +272,6 @@ public class ItemFacade extends ItemBuildCraft { } } - private static boolean hasNoNullIcons(Block block, int meta) { - try { - for (int i = 0; i < 6; i++) { - if (block.getIcon(i, meta) == null) { - return false; - } - } - } catch (Throwable t) { - return false; - } - - return true; - } - private static boolean isBlockBlacklisted(Block block) { String blockName = Block.blockRegistry.getNameForObject(block);