diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 5c7df7f5..a6efdb71 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -128,7 +128,9 @@ public class ItemFacade extends ItemBuildCraft { if (base != null) { List stackList = new ArrayList (); - base.getSubItems(base, null, stackList); + if ( FMLCommonHandler.instance().getSide() == Side.CLIENT ) { + base.getSubItems(base, null, stackList); + } for (ItemStack s : stackList) { ItemFacade.addFacade(s); diff --git a/common/buildcraft/transport/gates/GateDefinition.java b/common/buildcraft/transport/gates/GateDefinition.java index 5fa11ca4..20ea7a41 100644 --- a/common/buildcraft/transport/gates/GateDefinition.java +++ b/common/buildcraft/transport/gates/GateDefinition.java @@ -38,13 +38,17 @@ public final class GateDefinition { public final int guiHeight; public final int numSlots; public final boolean hasParameterSlot; + @SideOnly(Side.CLIENT) private IIcon iconBlock; + @SideOnly(Side.CLIENT) private IIcon iconItem; + @SideOnly(Side.CLIENT) public IIcon getIconBlock() { return iconBlock; } + @SideOnly(Side.CLIENT) public IIcon getIconItem() { return iconItem; } @@ -53,11 +57,13 @@ public final class GateDefinition { return name().toLowerCase(Locale.ENGLISH); } + @SideOnly(Side.CLIENT) public void registerBlockIcon(IIconRegister iconRegister) { if (this != REDSTONE) iconBlock = iconRegister.registerIcon("buildcraft:gates/gate_material_" + getTag()); } + @SideOnly(Side.CLIENT) public void registerItemIcon(IIconRegister iconRegister) { if (this != REDSTONE) iconItem = iconRegister.registerIcon("buildcraft:gates/gate_material_" + getTag());